From cdf4440848b37f896b962b2f0b3bd3350a24a284 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Sat, 30 Sep 2023 13:45:37 +0100
Subject: [PATCH] Fix lint issues

---
 frontend/src/hooks/api/serviceTokens/index.ts    |  9 ++++-----
 frontend/src/hooks/api/workspace/index.tsx       |  5 ++---
 frontend/src/hooks/api/workspace/queries.tsx     |  2 +-
 .../AddServiceTokenV3Modal.tsx                   | 16 +++++++---------
 .../ServiceTokenV3Table.tsx                      |  4 ++--
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/frontend/src/hooks/api/serviceTokens/index.ts b/frontend/src/hooks/api/serviceTokens/index.ts
index 5d55c22c4..2ae762611 100644
--- a/frontend/src/hooks/api/serviceTokens/index.ts
+++ b/frontend/src/hooks/api/serviceTokens/index.ts
@@ -1,8 +1,7 @@
 export { 
     useCreateServiceToken, 
-    useDeleteServiceToken, 
-    useGetUserWsServiceTokens,
     useCreateServiceTokenV3,
-    useUpdateServiceTokenV3,
-    useDeleteServiceTokenV3
-} from "./queries";
+    useDeleteServiceToken, 
+    useDeleteServiceTokenV3,
+    useGetUserWsServiceTokens,
+    useUpdateServiceTokenV3} from "./queries";
diff --git a/frontend/src/hooks/api/workspace/index.tsx b/frontend/src/hooks/api/workspace/index.tsx
index e2dd3105a..f7b749156 100644
--- a/frontend/src/hooks/api/workspace/index.tsx
+++ b/frontend/src/hooks/api/workspace/index.tsx
@@ -13,12 +13,11 @@ export {
   useGetWorkspaceIndexStatus,
   useGetWorkspaceIntegrations,
   useGetWorkspaceSecrets,
+  useGetWorkspaceServiceTokenDataV3,
   useGetWorkspaceUsers,
   useNameWorkspaceSecrets,
   useRenameWorkspace,
   useReorderWsEnvironment,
   useToggleAutoCapitalization,
   useUpdateUserWorkspaceRole,
-  useUpdateWsEnvironment,
-  useGetWorkspaceServiceTokenDataV3
-} from "./queries";
+  useUpdateWsEnvironment} from "./queries";
diff --git a/frontend/src/hooks/api/workspace/queries.tsx b/frontend/src/hooks/api/workspace/queries.tsx
index b5abe7827..e3136fae3 100644
--- a/frontend/src/hooks/api/workspace/queries.tsx
+++ b/frontend/src/hooks/api/workspace/queries.tsx
@@ -5,8 +5,8 @@ import { apiRequest } from "@app/config/request";
 import { IntegrationAuth } from "../integrationAuth/types";
 import { TIntegration } from "../integrations/types";
 import { EncryptedSecret } from "../secrets/types";
-import { TWorkspaceUser } from "../users/types";
 import { ServiceTokenDataV3 } from "../serviceTokens/types";
+import { TWorkspaceUser } from "../users/types";
 import {
   CreateEnvironmentDTO,
   CreateWorkspaceDTO,
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/AddServiceTokenV3Modal.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/AddServiceTokenV3Modal.tsx
index 7e073f010..ac47420a2 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/AddServiceTokenV3Modal.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/AddServiceTokenV3Modal.tsx
@@ -35,6 +35,7 @@ import {
 import {
     Permission
 } from "@app/hooks/api/serviceTokens/enums";
+import { ServiceTokenV3Scope } from "@app/hooks/api/serviceTokens/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 const expirations = [
@@ -47,8 +48,7 @@ const expirations = [
 ];
 
 const permissionsMap: {
-    "read": Permission[],
-    "readWrite": Permission[]
+    [key: string]: Permission[]
 } = {
     "read": [Permission.READ],
     "readWrite": [Permission.READ, Permission.WRITE],
@@ -60,7 +60,7 @@ const schema = yup.object({
     scopes: yup
     .array(
       yup.object({
-        permission: yup.string().oneOf(Object.keys(permissionsMap), "Invalid permission").required().label("Permission") as yup.SchemaOf<"read" | "readWrite", object>,
+        permission: yup.string().oneOf(Object.keys(permissionsMap), "Invalid permission").required().label("Permission"),
         environment: yup.string().max(50).required().label("Environment"),
         secretPath: yup
           .string()
@@ -115,21 +115,21 @@ export const AddServiceTokenV3Modal = ({
         const serviceTokenData = popUp?.serviceTokenV3?.data as { 
             serviceTokenDataId: string;
             name: string;
-            scopes: any;
+            scopes: ServiceTokenV3Scope[];
         };
         
         if (serviceTokenData) {
             reset({
                 name: serviceTokenData.name,
-                scopes: serviceTokenData.scopes.map((scope) => {
+                scopes: serviceTokenData.scopes.map((scope: ServiceTokenV3Scope) => {
                     let permission = "read";
                     if (scope.permissions.includes(Permission.WRITE)) {
                         permission = "readWrite";
                     }
                     
                     return ({
-                        environment: scope.environment,
-                        secretPath: scope.secretPath,
+                        environment: "dev",
+                        secretPath: "/",
                         permission
                     })
                 })
@@ -275,7 +275,6 @@ export const AddServiceTokenV3Modal = ({
                                 <Controller
                                     control={control}
                                     name={`scopes.${index}.permission`}
-                                    defaultValue={currentWorkspace?.environments?.[0]?.slug}
                                     render={({ field: { onChange, ...field }, fieldState: { error } }) => (
                                         <FormControl
                                             className="mb-0"
@@ -302,7 +301,6 @@ export const AddServiceTokenV3Modal = ({
                                 <Controller
                                     control={control}
                                     name={`scopes.${index}.environment`}
-                                    defaultValue={currentWorkspace?.environments?.[0]?.slug}
                                     render={({ field: { onChange, ...field }, fieldState: { error } }) => (
                                         <FormControl
                                             className="mb-0"
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/ServiceTokenV3Table.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/ServiceTokenV3Table.tsx
index 28a4e237b..d841399f9 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/ServiceTokenV3Table.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/ServiceTokenV3Table.tsx
@@ -21,8 +21,8 @@ import {
     useGetWorkspaceServiceTokenDataV3,
     useUpdateServiceTokenV3
 } from "@app/hooks/api";
-import { ServiceTokenV3Scope } from "@app/hooks/api/serviceTokens/types"
 import { Permission } from "@app/hooks/api/serviceTokens/enums"
+import { ServiceTokenV3Scope } from "@app/hooks/api/serviceTokens/types"
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 type Props = {
@@ -147,7 +147,7 @@ export const ServiceTokenV3Table = ({
                                         return (
                                             <p key={`service-token-${_id}-scope-${scope.environment}-${scope.secretPath}`}>
                                                 <span className="font-bold">
-                                                    {scope.permissions}
+                                                    {permissionText}
                                                 </span>
                                                 {` @${scope.environment} - ${scope.secretPath}`}
                                             </p>