Scope switch cases into blocks for secrets v3

frontend/src/hooks/api/auditLogs/constants.tsx

@@ -16,6 +16,9 @@ export const eventToNameMap: { [K in EventType]: string } = {
     [EventType.DELETE_TRUSTED_IP]: "Delete trusted IP",
     [EventType.CREATE_SERVICE_TOKEN]: "Create service token",
     [EventType.DELETE_SERVICE_TOKEN]: "Delete service token",
+    [EventType.CREATE_SERVICE_TOKEN_V3]: "Create (new) service token",
+    [EventType.UPDATE_SERVICE_TOKEN_V3]: "Update (new) service token",
+    [EventType.DELETE_SERVICE_TOKEN_V3]: "Delete (new) service token",
     [EventType.CREATE_ENVIRONMENT]: "Create environment",
     [EventType.UPDATE_ENVIRONMENT]: "Update environment",
     [EventType.DELETE_ENVIRONMENT]: "Delete environment",

frontend/src/hooks/api/auditLogs/enums.tsx

@@ -24,8 +24,11 @@ export enum EventType {
   ADD_TRUSTED_IP = "add-trusted-ip",
   UPDATE_TRUSTED_IP = "update-trusted-ip",
   DELETE_TRUSTED_IP = "delete-trusted-ip",
-  CREATE_SERVICE_TOKEN = "create-service-token",
-  DELETE_SERVICE_TOKEN = "delete-service-token",
+  CREATE_SERVICE_TOKEN = "create-service-token", // v2
+  DELETE_SERVICE_TOKEN = "delete-service-token", // v2
+  CREATE_SERVICE_TOKEN_V3 = "create-service-token-v3", // v3
+  UPDATE_SERVICE_TOKEN_V3 = "update-service-token-v3", // v3
+  DELETE_SERVICE_TOKEN_V3 = "delete-service-token-v3", // v3
   CREATE_ENVIRONMENT = "create-environment",
   UPDATE_ENVIRONMENT = "update-environment",
   DELETE_ENVIRONMENT = "delete-environment",

frontend/src/hooks/api/auditLogs/types.tsx

@@ -4,6 +4,17 @@ import {
     UserAgentType
 } from "./enums";
 
+enum Permission {
+    READ = "read",
+    READ_WRITE = "readWrite"
+}
+
+interface Scope {
+    environment: string;
+    secretPath: string;
+    permission: Permission;
+}
+
 interface UserActorMetadata {
   userId: string;
   email: string;
@@ -14,7 +25,6 @@ interface ServiceActorMetadata {
   name: string;
 }
 
-
 interface UserActor {
   type: ActorType.USER;
   metadata: UserActorMetadata;
@@ -190,6 +200,36 @@ interface DeleteServiceTokenEvent {
     }
 }
 
+interface CreateServiceTokenV3Event {
+    type: EventType.CREATE_SERVICE_TOKEN_V3;
+    metadata: {
+        name: string;
+        isActive: boolean;
+        scopes: Array<Scope>;
+        expiresAt?: Date;
+    }
+}
+
+interface UpdateServiceTokenV3Event {
+    type: EventType.UPDATE_SERVICE_TOKEN_V3;
+    metadata: {
+        name?: string;
+        isActive?: boolean;
+        scopes?: Array<Scope>;
+        expiresAt?: Date;
+    }
+}
+
+interface DeleteServiceTokenV3Event {
+    type: EventType.DELETE_SERVICE_TOKEN_V3;
+    metadata: {
+        name: string;
+        isActive: boolean;
+        scopes: Array<Scope>;
+        expiresAt?: Date;
+    }
+}
+
 interface CreateEnvironmentEvent {
     type: EventType.CREATE_ENVIRONMENT;
     metadata: {
@@ -387,6 +427,9 @@ export type Event =
     | DeleteTrustedIPEvent
     | CreateServiceTokenEvent
     | DeleteServiceTokenEvent
+    | CreateServiceTokenV3Event
+    | UpdateServiceTokenV3Event
+    | DeleteServiceTokenV3Event
     | CreateEnvironmentEvent
     | UpdateEnvironmentEvent
     | DeleteEnvironmentEvent

frontend/src/views/Project/AuditLogsPage/components/LogsTable.tsx

@@ -93,6 +93,4 @@ export const LogsTable = ({
             )}
         </TableContainer>
     );
-}
-
-// TODO: retrieve count
+}

frontend/src/views/Project/AuditLogsPage/components/LogsTableRow.tsx

@@ -160,6 +160,24 @@ export const LogsTableRow = ({
                         <p>{`Name: ${event.metadata.name}`}</p>
                     </Td>
                 );
+                case EventType.CREATE_SERVICE_TOKEN_V3:
+                    return (
+                        <Td>
+                            <p>{`Name: ${event.metadata.name}`}</p>
+                        </Td>
+                    );
+                case EventType.UPDATE_SERVICE_TOKEN_V3:
+                    return (
+                        <Td>
+                            <p>{`Name: ${event.metadata.name}`}</p>
+                        </Td>
+                    );
+                case EventType.DELETE_SERVICE_TOKEN_V3:
+                    return (
+                        <Td>
+                            <p>{`Name: ${event.metadata.name}`}</p>
+                        </Td>
+                    );
             case EventType.CREATE_ENVIRONMENT:
                 return (
                     <Td>

frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/AddServiceTokenV3Modal.tsx

@@ -420,7 +420,7 @@ export const AddServiceTokenV3Modal = ({
                             isLoading={isSubmitting}
                             isDisabled={isSubmitting}
                         >
-                            Create
+                            {popUp?.serviceTokenV3?.data ? "Update" : "Create"}
                         </Button>
                         <Button colorSchema="secondary" variant="plain">
                             Cancel

frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenV3Section/ServiceTokenV3Section.tsx

@@ -64,7 +64,7 @@ export const ServiceTokenV3Section = withProjectPermission(
                   onClick={() => handlePopUpOpen("serviceTokenV3")}
                   isDisabled={!isAllowed}
                 >
-                  Create ST V3
+                  Create token
                 </Button>
               )}
             </ProjectPermissionCan>