chore: code refactoring

Author: shivani170

src/Pages/GlobalConfigurations/Authorization/APITokens/ApiTokens.component.tsx

@@ -28,7 +28,7 @@ import {
 import emptyGeneratToken from '@Images/ic-empty-generate-token.png'
 import { EMPTY_STATE_STATUS } from '@Config/constantMessaging'
 
-import { TokenListType, TokenResponseType } from './apiToken.type'
+import { TokenListType } from './apiToken.type'
 import APITokenList from './APITokenList'
 import CreateAPIToken from './CreateAPIToken'
 import EditAPIToken from './EditAPIToken'
@@ -80,10 +80,7 @@ const ApiTokens = () => {
 
     const handleFilterChanges = (_searchText: string): void => {
         const _searchTextTrimmed = _searchText.trim()
-        const _filteredData = tokenList.filter(
-            (_tokenData) =>
-                _tokenData.name.indexOf(_searchTextTrimmed) >= 0 || _tokenData?.token?.indexOf(_searchTextTrimmed) >= 0,
-        )
+        const _filteredData = tokenList.filter((_tokenData) => _tokenData.name.indexOf(_searchTextTrimmed) >= 0)
         setFilteredTokenList(_filteredData)
         setNoResults(_filteredData.length === 0)
     }
@@ -93,14 +90,6 @@ const ApiTokens = () => {
         handleFilterChanges(_searchText)
     }
 
-    const [tokenResponse, setTokenResponse] = useState<TokenResponseType>({
-        success: false,
-        token: '',
-        userId: 0,
-        userIdentifier: 'API-TOKEN:test',
-        hideApiToken: false,
-    })
-
     const renderSearchToken = () => (
         <SearchBar
             initialSearchText={searchText}
@@ -135,8 +124,6 @@ const ApiTokens = () => {
                         handleGenerateTokenActionButton={handleActionButton}
                         setSelectedExpirationDate={setSelectedExpirationDate}
                         selectedExpirationDate={selectedExpirationDate}
-                        tokenResponse={tokenResponse}
-                        setTokenResponse={setTokenResponse}
                         reload={getData}
                     />
                 </Route>

src/Pages/GlobalConfigurations/Authorization/APITokens/CreateAPIToken.tsx

@@ -43,7 +43,7 @@ import {
     usePermissionConfiguration,
 } from '../Shared/components/PermissionConfigurationForm'
 import { createUserPermissionPayload, validateDirectPermissionForm } from '../utils'
-import { FormType, GenerateTokenType } from './apiToken.type'
+import { FormType, GenerateTokenType, TokenResponseType } from './apiToken.type'
 import { getDateInMilliseconds } from './apiToken.utils'
 import ExpirationDate from './ExpirationDate'
 import GenerateActionButton from './GenerateActionButton'
@@ -69,8 +69,6 @@ const CreateAPIToken = ({
     handleGenerateTokenActionButton,
     setSelectedExpirationDate,
     selectedExpirationDate,
-    tokenResponse,
-    setTokenResponse,
     reload,
 }: GenerateTokenType) => {
     const history = useHistory()
@@ -106,6 +104,13 @@ const CreateAPIToken = ({
         allowManageAllAccess,
     } = usePermissionConfiguration()
     const [customDate, setCustomDate] = useState<Moment>(null)
+    const [tokenResponse, setTokenResponse] = useState<TokenResponseType>({
+        success: false,
+        token: '',
+        userId: 0,
+        userIdentifier: 'API-TOKEN:test',
+        hideApiToken: false,
+    })
     const validationRules = new ValidationRules()
 
     // Reset selected expiration date to 30 days on unmount

src/Pages/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx

@@ -125,7 +125,6 @@ const EditAPIToken = ({
                 const userPermissionPayload = createUserPermissionPayload({
                     id: editData.userId,
                     userIdentifier: editData.userIdentifier,
-                    hideApiToken: result.hideApiToken,
                     userRoleGroups,
                     serverMode,
                     directPermission,

src/Pages/GlobalConfigurations/Authorization/APITokens/apiToken.type.ts

@@ -38,8 +38,6 @@ export interface GenerateTokenType {
     handleGenerateTokenActionButton: () => void
     setSelectedExpirationDate
     selectedExpirationDate
-    tokenResponse: TokenResponseType
-    setTokenResponse: React.Dispatch<React.SetStateAction<TokenResponseType>>
     reload: () => void
 }
 

src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx

@@ -54,7 +54,6 @@ import { createGeneratedAPIToken } from '@Pages/GlobalConfigurations/Authorizati
 import {
     CURL_PREFIX,
     GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS,
-    getWebhookTokenListOptions,
     PLAYGROUND_TAB_LIST,
     REQUEST_BODY_TAB_LIST,
     RESPONSE_TAB_LIST,
@@ -72,7 +71,6 @@ import {
     getDefaultUserStatusAndTimeout,
 } from '@Pages/GlobalConfigurations/Authorization/libUtils'
 import { getApiTokenHeader } from '@Pages/GlobalConfigurations/Authorization/APITokens/apiToken.utils'
-import { TokenListType } from '@Pages/GlobalConfigurations/Authorization/APITokens/apiToken.type'
 
 export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType) => {
     const { appId, webhookId } = useParams<{
@@ -102,7 +100,7 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
     const [showTryoutAPITokenError, setTryoutAPITokenError] = useState(false)
     const [webhookDetails, setWebhookDetails] = useState<WebhookDetailsType>(null)
     const [selectedToken, setSelectedToken] = useState<TokenListOptionsType>(null)
-    const [tokenList, setTokenList] = useState<TokenListType[]>(null)
+    const [tokenList, setTokenList] = useState<TokenListOptionsType[]>(null)
     const [selectedSchema, setSelectedSchema] = useState<string>('')
     const [errorInGetData, setErrorInGetData] = useState(false)
     const [copyToClipboardPromise, setCopyToClipboardPromise] = useState<ReturnType<typeof copyToClipboard>>(null)
@@ -205,7 +203,8 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
                         .map((tokenData) => ({
                             ...tokenData,
                             label: tokenData.name,
-                            value: tokenData.id,
+                            value: tokenData.id.toString(),
+                            description: 'Has access',
                         })) || []
                 setTokenList(sortedResult)
             }
@@ -466,7 +465,7 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
                     classNamePrefix="select-token"
                     placeholder="Select API token"
                     isClearable={false}
-                    options={getWebhookTokenListOptions(tokenList)}
+                    options={tokenList}
                     value={selectedToken}
                     onChange={handleSelectedTokenChange}
                     isSearchable={false}

src/components/ciPipeline/Webhook/webhook.utils.ts

@@ -46,12 +46,3 @@ export const GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS = 'Generate token with req
 export const SELECT_AUTO_GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS =
     'Select or auto-generate token with required permissions'
 
-export const getWebhookTokenListOptions = (tokenList: TokenListType[]): TokenListOptionsType[] =>
-    tokenList.map((token) => {
-        return {
-            ...token,
-            label: token.name,
-            value: token.id.toString(),
-            description: 'Has access',
-        }
-    })