From 3ab5ff0b798addba2ea88e06aa5baa7a50f11b9b Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 21 Jul 2022 15:14:15 +0530
Subject: [PATCH] refactor(gui-v2): validation message update and code cleanup

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/pages/index/index.vue      | 23 +++++++++++++++----
 .../nc-gui-v2/pages/project/index/[id].vue    |  4 ++--
 .../pages/project/index/create-external.vue   |  2 +-
 .../nc-gui-v2/pages/project/index/create.vue  |  7 +++---
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue
index 2300cef20a..f8f11a4645 100644
--- a/packages/nc-gui-v2/pages/index/index.vue
+++ b/packages/nc-gui-v2/pages/index/index.vue
@@ -13,7 +13,7 @@ import MdiMenuDown from '~icons/mdi/menu-down'
 import MdiPlus from '~icons/mdi/plus'
 import MdiDatabaseOutline from '~icons/mdi/database-outline'
 
-const { $api, $state } = useNuxtApp()
+const { $api, $state, $e } = useNuxtApp()
 const toast = useToast()
 
 const filterQuery = ref('')
@@ -34,6 +34,7 @@ const filteredProjects = computed(() => {
 })
 
 const deleteProject = (project: ProjectType) => {
+  $e('c:project:delete')
   Modal.confirm({
     title: `Do you want to delete '${project.title}' project?`,
     okText: 'Yes',
@@ -41,6 +42,7 @@ const deleteProject = (project: ProjectType) => {
     cancelText: 'No',
     async onOk() {
       try {
+        $e('c:project:delete')
         await $api.project.delete(project.id as string)
         projects.value.splice(projects.value.indexOf(project), 1)
       } catch (e) {
@@ -65,7 +67,11 @@ $state.sidebarOpen.value = false
         <!-- My Projects -->
         <b>{{ $t('title.myProject') }}</b>
 
-        <MdiRefresh class="text-sm text-gray-500 hover:text-primary mt-1 cursor-pointer" @click="loadProjects"></MdiRefresh>
+        <MdiRefresh
+          v-t="['a:project:refresh']"
+          class="text-sm text-gray-500 hover:text-primary mt-1 cursor-pointer"
+          @click="loadProjects"
+        ></MdiRefresh>
       </h1>
 
       <div class="flex mb-6">
@@ -87,6 +93,7 @@ $state.sidebarOpen.value = false
           <template #overlay>
             <a-menu>
               <div
+                v-t="['c:project:create:xcdb']"
                 class="grid grid-cols-12 cursor-pointer hover:bg-gray-200 flex items-center p-2"
                 @click="navigateTo('/project/create')"
               >
@@ -94,6 +101,7 @@ $state.sidebarOpen.value = false
                 <div class="col-span-10 text-sm xl:text-md">{{ $t('activity.createProject') }}</div>
               </div>
               <div
+                v-t="['c:project:create:extdb']"
                 class="grid grid-cols-12 cursor-pointer hover:bg-gray-200 flex items-center p-2"
                 @click="navigateTo('/project/create-external')"
               >
@@ -113,7 +121,10 @@ $state.sidebarOpen.value = false
         v-else
         :custom-row="
           (record) => ({
-            onClick: () => navigateTo(`/nc/${record.id}`),
+            onClick: () => {
+              $e('a:project:open');
+              navigateTo(`/nc/${record.id}`),
+            }
           })
         "
         :data-source="filteredProjects"
@@ -129,7 +140,11 @@ $state.sidebarOpen.value = false
         <a-table-column key="id" :title="$t('labels.actions')" data-index="id">
           <template #default="{ text, record }">
             <div class="flex align-center">
-              <MdiEditOutline class="nc-action-btn" @click.stop="navigateTo(`/project/${text}`)" />
+              <MdiEditOutline
+                v-t="['c:project:edit:rename']"
+                class="nc-action-btn"
+                @click.stop="navigateTo(`/project/${text}`)"
+              />
               <MdiDeleteOutline class="nc-action-btn" @click.stop="deleteProject(record)" />
             </div>
           </template>
diff --git a/packages/nc-gui-v2/pages/project/index/[id].vue b/packages/nc-gui-v2/pages/project/index/[id].vue
index fca09dec64..275063de66 100644
--- a/packages/nc-gui-v2/pages/project/index/[id].vue
+++ b/packages/nc-gui-v2/pages/project/index/[id].vue
@@ -18,7 +18,7 @@ const route = useRoute()
 const nameValidationRules = [
   {
     required: true,
-    message: 'Title is required',
+    message: 'Project name is required',
   },
   projectTitleValidator,
 ]
@@ -76,7 +76,7 @@ onMounted(async () => {
       </a-form-item>
 
       <a-form-item style="text-align: center" class="mt-2">
-        <a-button type="primary" html-type="submit" class="mx-auto flex justify-self-center">
+        <a-button v-t="['a:project:edit:rename']" type="primary" html-type="submit" class="mx-auto flex justify-self-center">
           <MaterialSymbolsRocketLaunchOutline class="mr-1" />
           <span> {{ $t('general.edit') }} </span></a-button
         >
diff --git a/packages/nc-gui-v2/pages/project/index/create-external.vue b/packages/nc-gui-v2/pages/project/index/create-external.vue
index c1c6c45061..3b9c553356 100644
--- a/packages/nc-gui-v2/pages/project/index/create-external.vue
+++ b/packages/nc-gui-v2/pages/project/index/create-external.vue
@@ -41,7 +41,7 @@ const validators = computed(() => {
     'title': [
       {
         required: true,
-        message: 'Please input project title',
+        message: 'Project name is required',
       },
       projectTitleValidator,
     ],
diff --git a/packages/nc-gui-v2/pages/project/index/create.vue b/packages/nc-gui-v2/pages/project/index/create.vue
index 564b2aeb91..57c2086851 100644
--- a/packages/nc-gui-v2/pages/project/index/create.vue
+++ b/packages/nc-gui-v2/pages/project/index/create.vue
@@ -12,13 +12,13 @@ const name = ref('')
 const loading = ref(false)
 const valid = ref(false)
 
-const { $api, $state } = useNuxtApp()
+const { $api, $state, $e } = useNuxtApp()
 const toast = useToast()
 
 const nameValidationRules = [
   {
     required: true,
-    message: 'Title is required',
+    message: 'Project name is required',
   },
   projectTitleValidator,
 ]
@@ -28,16 +28,15 @@ const formState = reactive({
 })
 
 const createProject = async () => {
+  $e('a:project:create:xcdb')
   loading.value = true
   try {
     const result = await $api.project.create({
       title: formState.title,
     })
 
-    debugger
     await navigateTo(`/nc/${result.id}`)
   } catch (e: any) {
-    debugger
     toast.error(await extractSdkResponseErrorMsg(e))
   }
   loading.value = false