From 98b999af1fce27ecd22c57b3596206f1617d4fcd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 10 Dec 2021 20:49:05 +0530
Subject: [PATCH] refactor: add loader in project load

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/package.json             |  4 +-
 packages/nc-gui/pages/projects/index.vue | 86 +++++++++++++-----------
 2 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 43818df056..605b59ad3a 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -3,12 +3,12 @@
   "version": "0.11.35",
   "scripts": {
     "dev": "EE=true nuxt",
-    "build": "nuxt build",
+    "build": "EE=true nuxt build",
     "lint": "eslint . --ext .js,.vue --fix --quiet",
     "start": "EE=true nuxt start",
     "generate": "nuxt generate",
     "build:copy": "EE=true npm run build; rm -rf ../nc-lib-gui/lib/dist/; rsync -rvzh ./dist/ ../nc-lib-gui/lib/dist/",
-    "build:copy:jsdeliver": "EE=true npm run build; rm -rf ../nc-lib-gui/lib/dist/; rsync -rvzh  ./dist/ ../nc-lib-gui/lib/dist/ ; npm publish ../nc-lib-gui"
+    "build:copy:jsdeliver": "npm run build; rm -rf ../nc-lib-gui/lib/dist/; rsync -rvzh  ./dist/ ../nc-lib-gui/lib/dist/ ; npm publish ../nc-lib-gui"
   },
   "dependencies": {
     "@mdi/font": "^5.9.55",
diff --git a/packages/nc-gui/pages/projects/index.vue b/packages/nc-gui/pages/projects/index.vue
index 5bb3c74fe3..5448b07ba9 100644
--- a/packages/nc-gui/pages/projects/index.vue
+++ b/packages/nc-gui/pages/projects/index.vue
@@ -286,43 +286,50 @@
                   >
                     <td data-v-step="2">
                       <div class="d-flex align-center">
-                        <v-icon
-                          x-small
+                        <v-progress-circular
+                          v-if="props.item.loading"
                           class="mr-2"
-                          :color="
-                            !props.item.allowed ? 'blue' :(
-                              props.item.status === 'started'
-                                ? 'green'
-                                : props.item.status === 'stopped'
-                                  ? 'orange'
-                                  : 'orange'
-                            )
-                          "
-                        >
-                          mdi-moon-full
-                        </v-icon>
-                        <!-- Accessible via GraphQL APIs / Accessible via REST APIs -->
-                        <x-icon
-                          small
-                          :tooltip="
-                            props.item.projectType === 'graphql'
-                              ? $t('projects.project_api_type_tooltip_graphql')
-                              : $t('projects.project_api_type_tooltip_rest')
-                          "
-                          icon.class="mr-2"
-                          :color="
-                            props.item.projectType === 'graphql'
-                              ? 'pink'
-                              : 'green'
-                          "
-                        >
-                          {{
-                            props.item.projectType === 'graphql'
-                              ? 'mdi-graphql'
-                              : 'mdi-code-json'
-                          }}
-                        </x-icon>
-
+                          size="15"
+                          indeterminate
+                        />
+                        <template v-else>
+                          <v-icon
+                            x-small
+                            class="mr-2"
+                            :color="
+                              !props.item.allowed ? 'blue' :(
+                                props.item.status === 'started'
+                                  ? 'green'
+                                  : props.item.status === 'stopped'
+                                    ? 'orange'
+                                    : 'orange'
+                              )
+                            "
+                          >
+                            mdi-moon-full
+                          </v-icon>
+                          <!-- Accessible via GraphQL APIs / Accessible via REST APIs -->
+                          <x-icon
+                            small
+                            :tooltip="
+                              props.item.projectType === 'graphql'
+                                ? $t('projects.project_api_type_tooltip_graphql')
+                                : $t('projects.project_api_type_tooltip_rest')
+                            "
+                            icon.class="mr-2"
+                            :color="
+                              props.item.projectType === 'graphql'
+                                ? 'pink'
+                                : 'green'
+                            "
+                          >
+                            {{
+                              props.item.projectType === 'graphql'
+                                ? 'mdi-graphql'
+                                : 'mdi-code-json'
+                            }}
+                          </x-icon>
+                        </template>
                         <v-tooltip bottom>
                           <template #activator="{on}">
                             <div
@@ -1091,7 +1098,7 @@ export default {
       }
       this.loaded = true
     },
-    projectRouteHandler(project) {
+    async projectRouteHandler(project) {
       if (!project.allowed) {
         this.$toast.info(`Contact following owner email to get project access : ${project.owner}`).goAway(5000)
         return
@@ -1105,11 +1112,12 @@ export default {
           .goAway(5000)
         return
       }
-
+      this.$set(project, 'loading', true)
       if (!this.deleteBtnClicked) {
-        this.$router.push({
+        await this.$router.push({
           path: `/nc/${project.id}`
         })
+        // this.$set(project, 'loading', false)
       }
     },
     async projectEdit(project) {