From 6c99ad1c9d06d7d420db47bc81970733035d254e Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 27 Dec 2022 12:17:46 +0530
Subject: [PATCH 1/3] refactor(gui): remove dropdown for create project from
 project list page

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui/pages/index/index/index.vue | 72 ++++++++++-----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/nc-gui/pages/index/index/index.vue b/packages/nc-gui/pages/index/index/index.vue
index 262a57f1fd..7ebd0ded07 100644
--- a/packages/nc-gui/pages/index/index/index.vue
+++ b/packages/nc-gui/pages/index/index/index.vue
@@ -174,42 +174,42 @@ const copyProjectMeta = async () => {
 
       <div class="flex-1" />
 
-      <a-dropdown v-if="isUIAllowed('projectCreate', true)" :trigger="['click']" overlay-class-name="nc-dropdown-create-project">
-        <button class="nc-new-project-menu mt-4 md:mt-0">
-          <span class="flex items-center w-full">
-            {{ $t('title.newProj') }}
-            <MdiMenuDown class="menu-icon" />
-          </span>
-        </button>
-
-        <template #overlay>
-          <a-menu class="!py-0 rounded">
-            <a-menu-item>
-              <div
-                v-e="['c:project:create:xcdb']"
-                class="nc-project-menu-item group nc-create-xc-db-project"
-                @click="navigateTo('/create')"
-              >
-                <MdiPlusOutline class="group-hover:text-accent" />
-
-                <div>{{ $t('activity.createProject') }}</div>
-              </div>
-            </a-menu-item>
-
-            <a-menu-item v-if="appInfo.connectToExternalDB">
-              <div
-                v-e="['c:project:create:extdb']"
-                class="nc-project-menu-item group nc-create-external-db-project"
-                @click="navigateTo('/create-external')"
-              >
-                <MdiDatabaseOutline class="group-hover:text-accent" />
-
-                <div v-html="$t('activity.createProjectExtended.extDB')" />
-              </div>
-            </a-menu-item>
-          </a-menu>
-        </template>
-      </a-dropdown>
+      <!--      <a-dropdown v-if="isUIAllowed('projectCreate', true)" :trigger="['click']" overlay-class-name="nc-dropdown-create-project"> -->
+      <button v-if="isUIAllowed('projectCreate', true)" class="nc-new-project-menu mt-4 md:mt-0" @click="navigateTo('/create')">
+        <span class="flex items-center w-full">
+          {{ $t('title.newProj') }}
+          <!--          <MdiMenuDown class="menu-icon" /> -->
+        </span>
+      </button>
+
+      <!--        <template #overlay> -->
+      <!--          <a-menu class="!py-0 rounded"> -->
+      <!--            <a-menu-item> -->
+      <!--              <div -->
+      <!--                v-e="['c:project:create:xcdb']" -->
+      <!--                class="nc-project-menu-item group nc-create-xc-db-project" -->
+      <!--                @click="navigateTo('/create')" -->
+      <!--              > -->
+      <!--                <MdiPlusOutline class="group-hover:text-accent" /> -->
+
+      <!--                <div>{{ $t('activity.createProject') }}</div> -->
+      <!--              </div> -->
+      <!--            </a-menu-item> -->
+
+      <!--            <a-menu-item v-if="appInfo.connectToExternalDB"> -->
+      <!--              <div -->
+      <!--                v-e="['c:project:create:extdb']" -->
+      <!--                class="nc-project-menu-item group nc-create-external-db-project" -->
+      <!--                @click="navigateTo('/create-external')" -->
+      <!--              > -->
+      <!--                <MdiDatabaseOutline class="group-hover:text-accent" /> -->
+
+      <!--                <div v-html="$t('activity.createProjectExtended.extDB')" /> -->
+      <!--              </div> -->
+      <!--            </a-menu-item> -->
+      <!--          </a-menu> -->
+      <!--        </template> -->
+      <!--      </a-dropdown> -->
     </div>
 
     <!--

From 277fd4f968b33fb839b19cd5b3455100f33d17f6 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 27 Dec 2022 12:52:09 +0530
Subject: [PATCH 2/3] test: project rename modal handling

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/pages/ProjectsPage/index.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/playwright/pages/ProjectsPage/index.ts b/tests/playwright/pages/ProjectsPage/index.ts
index 7c5d24383d..4ecf0b37ea 100644
--- a/tests/playwright/pages/ProjectsPage/index.ts
+++ b/tests/playwright/pages/ProjectsPage/index.ts
@@ -28,15 +28,16 @@ export class ProjectsPage extends BasePage {
   }) {
     if (!withoutPrefix) name = this.prefixTitle(name);
 
+    // Click "New Project" button
     await this.get().locator('.nc-new-project-menu').click();
 
-    const createProjectMenu = await this.rootPage.locator('.nc-dropdown-create-project');
-
-    if (type === 'xcdb') {
-      await createProjectMenu.locator(`.ant-dropdown-menu-title-content`).nth(0).click();
-    } else {
-      await createProjectMenu.locator(`.ant-dropdown-menu-title-content`).nth(1).click();
-    }
+    // const createProjectMenu = await this.rootPage.locator('.nc-dropdown-create-project');
+    //
+    // if (type === 'xcdb') {
+    //   await createProjectMenu.locator(`.ant-dropdown-menu-title-content`).nth(0).click();
+    // } else {
+    //   await createProjectMenu.locator(`.ant-dropdown-menu-title-content`).nth(1).click();
+    // }
 
     await this.rootPage.locator(`.nc-metadb-project-name`).waitFor();
     await this.rootPage.locator(`input.nc-metadb-project-name`).fill(name);

From e1a73195a8c773bcaa66cf9dfe36e8544176b30a Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 27 Dec 2022 13:37:06 +0530
Subject: [PATCH 3/3] refactor: clean-up comments

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui/pages/index/index/index.vue   | 31 -------------------
 tests/playwright/pages/ProjectsPage/index.ts  | 18 +----------
 .../tests/projectOperations.spec.ts           |  2 +-
 3 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/packages/nc-gui/pages/index/index/index.vue b/packages/nc-gui/pages/index/index/index.vue
index 7ebd0ded07..2d6ee1ca93 100644
--- a/packages/nc-gui/pages/index/index/index.vue
+++ b/packages/nc-gui/pages/index/index/index.vue
@@ -174,42 +174,11 @@ const copyProjectMeta = async () => {
 
       <div class="flex-1" />
 
-      <!--      <a-dropdown v-if="isUIAllowed('projectCreate', true)" :trigger="['click']" overlay-class-name="nc-dropdown-create-project"> -->
       <button v-if="isUIAllowed('projectCreate', true)" class="nc-new-project-menu mt-4 md:mt-0" @click="navigateTo('/create')">
         <span class="flex items-center w-full">
           {{ $t('title.newProj') }}
-          <!--          <MdiMenuDown class="menu-icon" /> -->
         </span>
       </button>
-
-      <!--        <template #overlay> -->
-      <!--          <a-menu class="!py-0 rounded"> -->
-      <!--            <a-menu-item> -->
-      <!--              <div -->
-      <!--                v-e="['c:project:create:xcdb']" -->
-      <!--                class="nc-project-menu-item group nc-create-xc-db-project" -->
-      <!--                @click="navigateTo('/create')" -->
-      <!--              > -->
-      <!--                <MdiPlusOutline class="group-hover:text-accent" /> -->
-
-      <!--                <div>{{ $t('activity.createProject') }}</div> -->
-      <!--              </div> -->
-      <!--            </a-menu-item> -->
-
-      <!--            <a-menu-item v-if="appInfo.connectToExternalDB"> -->
-      <!--              <div -->
-      <!--                v-e="['c:project:create:extdb']" -->
-      <!--                class="nc-project-menu-item group nc-create-external-db-project" -->
-      <!--                @click="navigateTo('/create-external')" -->
-      <!--              > -->
-      <!--                <MdiDatabaseOutline class="group-hover:text-accent" /> -->
-
-      <!--                <div v-html="$t('activity.createProjectExtended.extDB')" /> -->
-      <!--              </div> -->
-      <!--            </a-menu-item> -->
-      <!--          </a-menu> -->
-      <!--        </template> -->
-      <!--      </a-dropdown> -->
     </div>
 
     <!--
diff --git a/tests/playwright/pages/ProjectsPage/index.ts b/tests/playwright/pages/ProjectsPage/index.ts
index 4ecf0b37ea..0edbb06fa7 100644
--- a/tests/playwright/pages/ProjectsPage/index.ts
+++ b/tests/playwright/pages/ProjectsPage/index.ts
@@ -17,28 +17,12 @@ export class ProjectsPage extends BasePage {
   }
 
   // create project
-  async createProject({
-    name = 'sample',
-    type = 'xcdb',
-    withoutPrefix,
-  }: {
-    name?: string;
-    type?: string;
-    withoutPrefix?: boolean;
-  }) {
+  async createProject({ name = 'sample', withoutPrefix }: { name?: string; type?: string; withoutPrefix?: boolean }) {
     if (!withoutPrefix) name = this.prefixTitle(name);
 
     // Click "New Project" button
     await this.get().locator('.nc-new-project-menu').click();
 
-    // const createProjectMenu = await this.rootPage.locator('.nc-dropdown-create-project');
-    //
-    // if (type === 'xcdb') {
-    //   await createProjectMenu.locator(`.ant-dropdown-menu-title-content`).nth(0).click();
-    // } else {
-    //   await createProjectMenu.locator(`.ant-dropdown-menu-title-content`).nth(1).click();
-    // }
-
     await this.rootPage.locator(`.nc-metadb-project-name`).waitFor();
     await this.rootPage.locator(`input.nc-metadb-project-name`).fill(name);
 
diff --git a/tests/playwright/tests/projectOperations.spec.ts b/tests/playwright/tests/projectOperations.spec.ts
index 3389aab170..832daad183 100644
--- a/tests/playwright/tests/projectOperations.spec.ts
+++ b/tests/playwright/tests/projectOperations.spec.ts
@@ -19,7 +19,7 @@ test.describe('Project operations', () => {
 
   test('rename, delete', async () => {
     await dashboard.clickHome();
-    await projectPage.createProject({ name: 'project-1', type: 'xcdb' });
+    await projectPage.createProject({ name: 'project-1' });
     await dashboard.clickHome();
     await projectPage.renameProject({
       title: 'project-1',