From a778cb854466602d4ef3e1ac15617ca680e322c2 Mon Sep 17 00:00:00 2001
From: ARADDCC012 <110473008+ARADDCC012@users.noreply.github.com>
Date: Tue, 21 May 2024 09:23:14 +0000
Subject: [PATCH] Typed token action kind and improved getActionName logic

---
 frontend/pages/settings/personal-access-tokens/new.tsx | 9 +++++----
 frontend/types/types.ts                                | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/pages/settings/personal-access-tokens/new.tsx b/frontend/pages/settings/personal-access-tokens/new.tsx
index 6d8d6d8aa..6091122cd 100644
--- a/frontend/pages/settings/personal-access-tokens/new.tsx
+++ b/frontend/pages/settings/personal-access-tokens/new.tsx
@@ -24,7 +24,7 @@ import Title from 'src/common/Title'
 import Link from 'src/Link'
 import MessageAlert from 'src/MessageAlert'
 import TokenDialog from 'src/settings/authentication/TokenDialog'
-import { TokenAction, TokenActionKeys, TokenInterface, TokenScope } from 'types/types'
+import { TokenAction, TokenActionKeys, TokenActionKind, TokenInterface, TokenScope } from 'types/types'
 import { getErrorMessage } from 'utils/fetcher'
 import { plural } from 'utils/stringUtils'
 
@@ -33,10 +33,10 @@ const [TokenReadAction, TokenWriteAction] = Object.values(TokenAction).reduce<Re
     let groupedActions = [readActions, writeActions]
     const [name, kind] = action.split(':')
 
-    if (kind === 'read') {
+    if (kind === TokenActionKind.READ) {
       groupedActions = [{ ...readActions, [name]: action }, writeActions]
     }
-    if (kind === 'write') {
+    if (kind === TokenActionKind.WRITE) {
       groupedActions = [readActions, { ...writeActions, [name]: action }]
     }
 
@@ -54,7 +54,8 @@ const isReadAction = (action: TokenActionKeys) => {
 }
 
 const getActionName = (action: TokenActionKeys) => {
-  return action.split(':')[0]
+  const [name, _kind] = action.split(':')
+  return name
 }
 
 const actionOptions = Object.values(TokenAction)
diff --git a/frontend/types/types.ts b/frontend/types/types.ts
index 5ef6e6a0d..de8dbcbd2 100644
--- a/frontend/types/types.ts
+++ b/frontend/types/types.ts
@@ -175,6 +175,13 @@ export const TokenScope = {
 
 export type TokenScopeKeys = (typeof TokenScope)[keyof typeof TokenScope]
 
+export const TokenActionKind = {
+  READ: 'read',
+  WRITE: 'write',
+}
+
+export type TokenActionKindKeys = (typeof TokenActionKind)[keyof typeof TokenActionKind]
+
 export const TokenAction = {
   MODEL_READ: 'model:read',
   MODEL_WRITE: 'model:write',