Skip to content

Commit 4dc45fe

Browse files
shivani170shivani170
committed
chore: removed unused code && code refactoring
1 parent fdb7d9b commit 4dc45fe

File tree

6 files changed

+50
-40
lines changed

6 files changed

+50
-40
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ const CreateAPIToken = ({
312312

313313
<GenerateModal
314314
close={handleGenerateTokenActionButton}
315-
token={tokenResponse?.token}
315+
token={tokenResponse.token}
316316
reload={reload}
317317
redirectToTokenList={redirectToTokenList}
318318
open={showGenerateModal}

‎src/Pages/GlobalConfigurations/Authorization/APITokens/RegenerateModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const RegeneratedModal = ({
112112
return showGenerateModal ? (
113113
<GenerateModal
114114
close={handleGenerateTokenActionButton}
115-
token={tokenResponse?.token}
115+
token={tokenResponse.token}
116116
reload={reload}
117117
redirectToTokenList={redirectToTokenList}
118118
isRegenerationModal

‎src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,12 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
102102
const [showTryoutAPITokenError, setTryoutAPITokenError] = useState(false)
103103
const [webhookDetails, setWebhookDetails] = useState<WebhookDetailsType>(null)
104104
const [selectedToken, setSelectedToken] = useState<TokenListOptionsType>(null)
105-
const [tokenList, setTokenList] = useState<TokenListType[]>(undefined)
105+
const [tokenList, setTokenList] = useState<TokenListType[]>(null)
106106
const [selectedSchema, setSelectedSchema] = useState<string>('')
107107
const [errorInGetData, setErrorInGetData] = useState(false)
108108
const [copyToClipboardPromise, setCopyToClipboardPromise] = useState<ReturnType<typeof copyToClipboard>>(null)
109109
const schemaRef = useRef<Array<HTMLDivElement | null>>([])
110110

111-
112111
const clipboardContent = window.location.href
113112

114113
const handleCopyButtonClick = async () => {
@@ -203,9 +202,11 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
203202
const sortedResult =
204203
result
205204
?.sort((a, b) => a['name'].localeCompare(b['name']))
206-
.map((tokenData) => {
207-
return { label: tokenData.name, value: tokenData.id, ...tokenData }
208-
}) || []
205+
.map((tokenData) => ({
206+
...tokenData,
207+
label: tokenData.name,
208+
value: tokenData.id,
209+
})) || []
209210
setTokenList(sortedResult)
210211
}
211212
setLoader(false)
@@ -217,6 +218,7 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
217218
}
218219

219220
const hideApiToken = !tokenList?.[0]?.token
221+
console.log(hideApiToken)
220222

221223
const generateToken = async (): Promise<void> => {
222224
if (!tokenName) {
@@ -452,31 +454,29 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
452454
)
453455
}
454456

455-
const renderSelectTokenSection = (): JSX.Element => {
456-
const handleSelectedTokenChange = (selectedToken): void => {
457-
setSelectedToken(selectedToken)
458-
}
459-
460-
return (
461-
<>
462-
<div className="w-400 h-32 mt-16">
463-
<SelectPicker
464-
inputId="select-token"
465-
name="select-token"
466-
classNamePrefix="select-token"
467-
placeholder="Select API token"
468-
isClearable={false}
469-
options={getWebhookTokenListOptions(tokenList)}
470-
value={selectedToken}
471-
onChange={handleSelectedTokenChange}
472-
isSearchable={false}
473-
/>
474-
</div>
475-
{selectedToken?.name && renderSelectedToken(selectedToken.token)}
476-
</>
477-
)
457+
const handleSelectedTokenChange = (selectedToken): void => {
458+
setSelectedToken(selectedToken)
478459
}
479460

461+
const renderSelectTokenSection = (): JSX.Element => (
462+
<>
463+
<div className="w-400 h-32 mt-16">
464+
<SelectPicker
465+
inputId="select-token"
466+
name="select-token"
467+
classNamePrefix="select-token"
468+
placeholder="Select API token"
469+
isClearable={false}
470+
options={getWebhookTokenListOptions(tokenList)}
471+
value={selectedToken}
472+
onChange={handleSelectedTokenChange}
473+
isSearchable={false}
474+
/>
475+
</div>
476+
{selectedToken?.name && renderSelectedToken(selectedToken.token)}
477+
</>
478+
)
479+
480480
const renderGeneratedTokenDetails = () => {
481481
if (hideApiToken) {
482482
return (
@@ -511,7 +511,11 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
511511
dataTestId="select-or-generate-token"
512512
variant={ButtonVariantType.text}
513513
onClick={toggleTokenSection}
514-
text={hideApiToken ? GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS : SELECT_AUTO_GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS }
514+
text={
515+
hideApiToken
516+
? GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS
517+
: SELECT_AUTO_GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS
518+
}
515519
/>
516520
) : (
517521
renderGeneratedTokenDetails()

‎src/components/ciPipeline/Webhook/types.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,4 @@ export interface WebhookListResponse extends ResponseType {
9292
result?: WebhookDetailsType[]
9393
}
9494

95-
export interface WebhookApiTokenResponse extends ResponseType {
96-
result?: TokenListType[]
97-
}
95+
export type WebhookApiTokenResponse = ResponseType<TokenListType[]>

‎src/components/ciPipeline/Webhook/webhook.service.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { AppConfigProps, get, GetTemplateAPIRouteType, getTemplateAPIRoute } from '@devtron-labs/devtron-fe-common-lib'
17+
import {
18+
AppConfigProps,
19+
get,
20+
GetTemplateAPIRouteType,
21+
getTemplateAPIRoute,
22+
getUrlWithSearchParams,
23+
} from '@devtron-labs/devtron-fe-common-lib'
1824
import { Routes } from '../../../config'
1925
import { WebhookApiTokenResponse, WebhookDetailsResponse, WebhookListResponse } from './types'
2026

@@ -58,7 +64,11 @@ export function getWebhookAPITokenList(
5864
appName: string,
5965
): Promise<WebhookApiTokenResponse> {
6066
return get(
61-
`${Routes.API_TOKEN_WEBHOOK}?projectName=${projectName}&environmentName=${environmentName}&appName=${appName}`,
67+
getUrlWithSearchParams(Routes.API_TOKEN_WEBHOOK, {
68+
projectName: projectName,
69+
environmentName: environmentName,
70+
appName: appName,
71+
}),
6272
)
6373
}
6474

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { SelectPickerOptionType } from '.yalc/@devtron-labs/devtron-fe-common-lib/dist'
1817
import { TabDetailsType, TokenListOptionsType } from './types'
1918
import { TokenListType } from '@Pages/GlobalConfigurations/Authorization/APITokens/apiToken.type'
2019

@@ -47,13 +46,12 @@ export const GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS = 'Generate token with req
4746
export const SELECT_AUTO_GENERATE_TOKEN_WITH_REQUIRED_PERMISSIONS =
4847
'Select or auto-generate token with required permissions'
4948

50-
export const getWebhookTokenListOptions = (tokenList: TokenListType[]): TokenListOptionsType[] => {
51-
return tokenList.map((token) => {
49+
export const getWebhookTokenListOptions = (tokenList: TokenListType[]): TokenListOptionsType[] =>
50+
tokenList.map((token) => {
5251
return {
5352
...token,
5453
label: token.name,
5554
value: token.id.toString(),
5655
description: 'Has access',
5756
}
5857
})
59-
}

0 commit comments

Comments
 (0)