From c6adedefb5eb4c9e432a7196e75c97c9505690cc Mon Sep 17 00:00:00 2001
From: Xiao Yijun <xiaoyijun@silverhand.io>
Date: Thu, 18 Apr 2024 16:15:05 +0800
Subject: [PATCH] fix(console): always display create org button (#5746)

---
 packages/console/src/pages/Organizations/index.tsx  |  2 +-
 .../src/tests/console/organizations.test.ts         | 13 ++++++-------
 .../src/ui-helpers/expect-organizations.ts          |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/console/src/pages/Organizations/index.tsx b/packages/console/src/pages/Organizations/index.tsx
index fe18342b0..8b9a002af 100644
--- a/packages/console/src/pages/Organizations/index.tsx
+++ b/packages/console/src/pages/Organizations/index.tsx
@@ -81,7 +81,7 @@ function Organizations({ tab }: Props) {
             targetBlank: 'noopener',
           }}
         />
-        {!isInitialSetup && (
+        {(!isInitialSetup || isDevFeaturesEnabled) && (
           <Button
             icon={<Plus />}
             type="primary"
diff --git a/packages/integration-tests/src/tests/console/organizations.test.ts b/packages/integration-tests/src/tests/console/organizations.test.ts
index f949bec2b..5beeef75a 100644
--- a/packages/integration-tests/src/tests/console/organizations.test.ts
+++ b/packages/integration-tests/src/tests/console/organizations.test.ts
@@ -3,12 +3,12 @@ import { cls, dcls, generateTestName } from '#src/utils.js';
 
 const expectOrg = new ExpectOrganizations(await browser.newPage());
 
-// Temporarily skipping organization tests, will add them back later with the "guide" feature
-describe.skip('organizations: create, edit, and delete organization', () => {
+// Start the test by signing in or starting the console
+await expectOrg.start();
+
+describe('organizations: create, edit, and delete organization', () => {
   it('navigates to organizations page', async () => {
-    await expectOrg.start();
     await expectOrg.gotoPage('/organizations', 'Organizations');
-    await expectOrg.toExpectTabs('Organizations', 'Settings');
   });
 
   it('should be able to see the table', async () => {
@@ -40,18 +40,17 @@ describe.skip('organizations: create, edit, and delete organization', () => {
       undefined,
       false
     );
-    await expectOrg.toClick(`${dcls('danger')}[role=menuitem]`, 'Delete organization', false);
+    await expectOrg.toClick(`${dcls('danger')}[role=menuitem]`, 'Delete', false);
     await expectOrg.toExpectModal('Reminder');
     await expectOrg.toClick(['.ReactModalPortal', `button${cls('danger')}`].join(' '), 'Delete');
     expectOrg.toMatchUrl(/\/organizations$/);
   });
 });
 
-describe.skip('organizations: search organization', () => {
+describe('organizations: search organization', () => {
   const [testName1, testName2] = [generateTestName(), generateTestName()];
 
   it('creates two organizations', async () => {
-    await expectOrg.start();
     await expectOrg.toCreateOrganization(testName1);
     await expectOrg.toCreateOrganization(testName2);
     await expectOrg.gotoPage('/organizations', 'Organizations');
diff --git a/packages/integration-tests/src/ui-helpers/expect-organizations.ts b/packages/integration-tests/src/ui-helpers/expect-organizations.ts
index 07b305704..742f8df0b 100644
--- a/packages/integration-tests/src/ui-helpers/expect-organizations.ts
+++ b/packages/integration-tests/src/ui-helpers/expect-organizations.ts
@@ -12,13 +12,13 @@ export default class ExpectOrganizations extends ExpectConsole {
    */
   async toCreateOrganization(name: string) {
     await this.gotoPage('/organizations', 'Organizations');
-    await this.toClickButton('Create organization');
+    await this.toClickButton('Create organization', false);
 
     await this.toExpectModal('Create organization');
     await this.toFillForm({
       name,
     });
-    await this.toClick(['.ReactModalPortal', `button${cls('primary')}`].join(' '), 'Create', false);
+    await this.toClick(['.ReactModalPortal', `button${cls('primary')}`].join(' '), 'Create');
     this.toMatchUrl(/\/organizations\/.+$/);
   }