From 4a0ad304c8943e15b788ac7d86fe4501de9f5f33 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 23 Oct 2022 00:29:33 +0530
Subject: [PATCH] refactor: ui updates

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/admin/License.vue  |  6 ++---
 .../nc-gui/components/admin/ResetPassword.vue | 11 +---------
 .../components/admin/UserManagement.vue       |  6 ++---
 packages/nocodb/src/lib/meta/api/ee/index.ts  | 18 ---------------
 .../src/lib/meta/api/ee/orgTokenApis.ts       | 22 +++++++++++++++++++
 .../nocodb/src/lib/meta/api/orgTokenApis.ts   |  9 +++-----
 .../nocodb/src/lib/meta/helpers/getHandler.ts | 16 ++++++++++++++
 7 files changed, 48 insertions(+), 40 deletions(-)
 delete mode 100644 packages/nocodb/src/lib/meta/api/ee/index.ts
 create mode 100644 packages/nocodb/src/lib/meta/api/ee/orgTokenApis.ts
 create mode 100644 packages/nocodb/src/lib/meta/helpers/getHandler.ts

diff --git a/packages/nc-gui/components/admin/License.vue b/packages/nc-gui/components/admin/License.vue
index a2e0b49319..ed536f6b8b 100644
--- a/packages/nc-gui/components/admin/License.vue
+++ b/packages/nc-gui/components/admin/License.vue
@@ -29,12 +29,12 @@ loadLicense()
 </script>
 
 <template>
-  <div class="h-full overflow-y-scroll scrollbar-thin-dull pt-2">
+  <div class="h-full overflow-y-scroll scrollbar-thin-dull">
     <div class="text-xl mt-4">License</div>
     <a-divider class="!my-3" />
     <div class="">
-    <a-textarea v-model:value="key" placeholder="License key" class="!mt-4 !max-w-[600px]"></a-textarea>
-      </div>
+      <a-textarea v-model:value="key" placeholder="License key" class="!mt-2 !max-w-[600px]"></a-textarea>
+    </div>
     <a-button class="mt-4" @click="setLicense" type="primary">Save license key</a-button>
   </div>
 </template>
diff --git a/packages/nc-gui/components/admin/ResetPassword.vue b/packages/nc-gui/components/admin/ResetPassword.vue
index 3925422458..277f1c6900 100644
--- a/packages/nc-gui/components/admin/ResetPassword.vue
+++ b/packages/nc-gui/components/admin/ResetPassword.vue
@@ -67,18 +67,9 @@ const resetError = () => {
 </script>
 
 <template>
-  <div class="relative flex flex-col justify-center gap-2 w-full p-8 md:(bg-white rounded-lg border-1 border-gray-200 shadow)">
-    <LazyGeneralNocoIcon class="color-transition hover:(ring ring-accent)" :animate="isLoading" />
-
-    <div
-      class="color-transition transform group absolute top-5 left-5 text-4xl rounded-full cursor-pointer"
-      @click="() => router.back()"
-    >
-      <MdiChevronLeft class="text-black group-hover:(text-accent scale-110)" />
-    </div>
+  <div class="relative flex flex-col justify-center gap-2 w-full p-8 md:(bg-white) max-w-[900px]">
 
     <h1 class="prose-2xl font-bold self-center my-4">{{ $t('activity.changePwd') }}</h1>
-
     <a-form
       ref="formValidator"
       data-cy="nc-user-settings-form"
diff --git a/packages/nc-gui/components/admin/UserManagement.vue b/packages/nc-gui/components/admin/UserManagement.vue
index 2ac4027e55..9ceb218241 100644
--- a/packages/nc-gui/components/admin/UserManagement.vue
+++ b/packages/nc-gui/components/admin/UserManagement.vue
@@ -28,13 +28,13 @@ const selectedTabKey = ref(tabs[0].key)
       </a-tab-pane>
     </a-tabs>
     <template v-if="selectedTabKey === 'users'">
-      <LazyAdminUserList class="mt-10" />
+      <LazyAdminUserList />
     </template>
     <template v-else-if="selectedTabKey === 'settings'">
-      <LazyAdminSignupSettings class="mt-10" />
+      <LazyAdminSignupSettings />
     </template>
     <template v-else-if="selectedTabKey === 'password-reset'">
-      <LazyAdminResetPassword class="mt-10" />
+      <LazyAdminResetPassword />
     </template>
   </div>
 </template>
diff --git a/packages/nocodb/src/lib/meta/api/ee/index.ts b/packages/nocodb/src/lib/meta/api/ee/index.ts
deleted file mode 100644
index 9ceea1f3fd..0000000000
--- a/packages/nocodb/src/lib/meta/api/ee/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Router } from 'express';
-import { LICENSE_KEY } from '../../../constants';
-import Store from '../../../models/Store';
-
-export const validateEE = async (_req, res, next) => {
-  const key = await Store.get(LICENSE_KEY);
-  if (!key?.value) {
-    return res.status(403).json({ msg: 'Not available' });
-  }
-  next();
-};
-
-const router = Router({ mergeParams: true });
-
-// verify key
-// router.use((_req, _res, next) => {});
-
-export default router;
diff --git a/packages/nocodb/src/lib/meta/api/ee/orgTokenApis.ts b/packages/nocodb/src/lib/meta/api/ee/orgTokenApis.ts
new file mode 100644
index 0000000000..3a1526f563
--- /dev/null
+++ b/packages/nocodb/src/lib/meta/api/ee/orgTokenApis.ts
@@ -0,0 +1,22 @@
+import { OrgUserRoles } from '../../../../enums/OrgUserRoles';
+import ApiToken from '../../../models/ApiToken';
+import { PagedResponseImpl } from '../../helpers/PagedResponse';
+
+export async function apiTokenListEE(req, res) {
+  let fk_user_id = req.user.id;
+
+  // if super admin get all tokens
+  if (req.user.roles.includes(OrgUserRoles.SUPER)) {
+    fk_user_id = undefined;
+  }
+
+  res.json(
+    new PagedResponseImpl(
+      await ApiToken.listWithCreatedBy({ ...req.query, fk_user_id }),
+      {
+        ...req.query,
+        count: await ApiToken.count(),
+      }
+    )
+  );
+}
diff --git a/packages/nocodb/src/lib/meta/api/orgTokenApis.ts b/packages/nocodb/src/lib/meta/api/orgTokenApis.ts
index 99035eb1f5..c2f6c94e05 100644
--- a/packages/nocodb/src/lib/meta/api/orgTokenApis.ts
+++ b/packages/nocodb/src/lib/meta/api/orgTokenApis.ts
@@ -4,17 +4,14 @@ import ApiToken from '../../models/ApiToken';
 import { Tele } from '../../utils/Tele';
 import { metaApiMetrics } from '../helpers/apiMetrics';
 import { NcError } from '../helpers/catchError';
+import getHandler from '../helpers/getHandler';
 import ncMetaAclMw from '../helpers/ncMetaAclMw';
 import { PagedResponseImpl } from '../helpers/PagedResponse';
+import { apiTokenListEE } from './ee/orgTokenApis';
 
 async function apiTokenList(req, res) {
   let fk_user_id = req.user.id;
 
-  // if super admin get all tokens
-  if (req.user.roles.includes(OrgUserRoles.SUPER)) {
-    fk_user_id = undefined;
-  }
-
   res.json(
     new PagedResponseImpl(
       await ApiToken.listWithCreatedBy({ ...req.query, fk_user_id }),
@@ -49,7 +46,7 @@ const router = Router({ mergeParams: true });
 router.get(
   '/api/v1/tokens',
   metaApiMetrics,
-  ncMetaAclMw(apiTokenList, 'apiTokenList', {
+  ncMetaAclMw(getHandler(apiTokenList, apiTokenListEE), 'apiTokenList', {
     // allowedRoles: [OrgUserRoles.SUPER],
     blockApiTokenAccess: true,
   })
diff --git a/packages/nocodb/src/lib/meta/helpers/getHandler.ts b/packages/nocodb/src/lib/meta/helpers/getHandler.ts
new file mode 100644
index 0000000000..2d224de923
--- /dev/null
+++ b/packages/nocodb/src/lib/meta/helpers/getHandler.ts
@@ -0,0 +1,16 @@
+import express from 'express';
+import { LICENSE_KEY } from '../../constants';
+import Store from '../../models/Store';
+
+export default function getHandler(
+  defaultHandler: express.Handler,
+  eeHandler: express.Handler
+): express.Handler {
+  return async (...args) => {
+    const key = await Store.get(LICENSE_KEY);
+    if (!key?.value) {
+      return defaultHandler(...args);
+    }
+    return eeHandler(...args);
+  };
+}