Skip to content

Commit 4aa01ab

Browse files
vivek-devtronvivek-devtron
committed
eslint fix
1 parent 81bed33 commit 4aa01ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+512
-382
lines changed

‎.eslintignore

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,33 @@
44
.eslintrc.js
55
vite.config.ts
66

7-
# The following files have eslint errors/warnings
7+
# The following files have eslint errors/warningssrc/App.tsx
88
src/App.tsx
9+
src/Pages/GlobalConfigurations/Authorization/APITokens/GroupPermission.tsx
10+
src/Pages/GlobalConfigurations/Authorization/APITokens/index.ts
11+
src/Pages/GlobalConfigurations/Authorization/APITokens/validationRules.ts
12+
src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/index.ts
13+
src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/index.ts
14+
src/Pages/GlobalConfigurations/Authorization/PermissionGroups/index.ts
15+
src/Pages/GlobalConfigurations/Authorization/SSOLoginServices/SSOLogin.component.tsx
16+
src/Pages/GlobalConfigurations/Authorization/SSOLoginServices/index.ts
17+
src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx
18+
src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/index.ts
19+
src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionRow.tsx
20+
src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/index.ts
21+
src/Pages/GlobalConfigurations/Authorization/UserPermissions/SSONotConfiguredState.tsx
22+
src/Pages/GlobalConfigurations/Authorization/UserPermissions/index.ts
23+
src/Pages/GlobalConfigurations/Authorization/index.ts
24+
src/Pages/GlobalConfigurations/Authorization/shared/components/AppPermissions.tsx
25+
src/Pages/GlobalConfigurations/Authorization/shared/components/FilterEmptyState/index.ts
26+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sListItemCard.tsx
27+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermission.component.tsx
28+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissionModal.tsx
29+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissions.utils.ts
30+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissons.tsx
31+
src/Pages/GlobalConfigurations/Authorization/shared/components/SuperAdminInfoBar/index.ts
32+
src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/UserGroup.tsx
33+
src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/userGroups.types.ts
934
src/components/AppSelector/AppSelector.tsx
1035
src/components/AppSelector/AppSelectorUtil.tsx
1136
src/components/AppSelector/ChartSelector.tsx
@@ -221,6 +246,7 @@ src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx
221246
src/components/app/grepSSEworker.ts
222247
src/components/app/list-new/AppList.tsx
223248
src/components/app/list-new/AppListService.ts
249+
src/components/app/list-new/ExternalArgoList.tsx
224250
src/components/app/list-new/HelmAppList.tsx
225251
src/components/app/list/AppListView.tsx
226252
src/components/app/list/DevtronAppListContainer.tsx
@@ -231,9 +257,6 @@ src/components/app/list/appStatus/AppStatus.tsx
231257
src/components/app/list/emptyView/Empty.tsx
232258
src/components/app/list/expandedRow/ExpandedRow.tsx
233259
src/components/app/list/types.tsx
234-
src/components/app/list-new/ExternalArgoList.tsx
235-
src/components/externalArgoApps/ExternalArgoApp.tsx
236-
src/components/externalArgoApps/ExternalArgoAppDetail.tsx
237260
src/components/app/service.ts
238261
src/components/app/types.ts
239262
src/components/bulkEdits/BulkEdits.tsx
@@ -439,6 +462,8 @@ src/components/dockerRegistry/ManageRegistry.tsx
439462
src/components/dockerRegistry/service.tsx
440463
src/components/external-apps/ExternalAppService.ts
441464
src/components/external-apps/ExternalApps.tsx
465+
src/components/externalArgoApps/ExternalArgoApp.tsx
466+
src/components/externalArgoApps/ExternalArgoAppDetail.tsx
442467
src/components/externalLinks/ExternalLinks.component.tsx
443468
src/components/externalLinks/ExternalLinks.service.ts
444469
src/components/externalLinks/ExternalLinks.tsx
@@ -517,15 +542,6 @@ src/components/security/security.service.ts
517542
src/components/security/security.types.ts
518543
src/components/security/security.util.tsx
519544
src/components/terminal/TerminalWrapper.tsx
520-
src/Pages/GlobalConfigurations/Authorization/shared/components/AppPermissions.tsx
521-
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sListItemCard.tsx
522-
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermission.component.tsx
523-
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissionModal.tsx
524-
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissions.utils.ts
525-
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissons.tsx
526-
src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/UserGroup.tsx
527-
src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/userGroups.types.ts
528-
src/Pages/GlobalConfigurations/Authorization/SSOLoginServices/SSOLogin.component.tsx
529545
src/components/util/KeyValueFileInput.tsx
530546
src/components/v2/HelmAppOverview/HelpAppOverview.tsx
531547
src/components/v2/appDetails/AppDetails.component.tsx
@@ -543,6 +559,7 @@ src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
543559
src/components/v2/appDetails/k8Resource/StatusFilterButton.component.tsx
544560
src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
545561
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
562+
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/CustomLogsModal/CustomLogsModal.tsx
546563
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Events.component.tsx
547564
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/EventsTable.tsx
548565
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/LogViewer.component.tsx
@@ -637,27 +654,7 @@ src/index.tsx
637654
src/services/fetchWithFullRoute.ts
638655
src/services/service.ts
639656
src/services/service.types.ts
640-
src/setupProxy.js
641657
src/util/DeleteComponent.tsx
642658
src/util/MurmurHash3.ts
643659
src/util/Subject.ts
644660
src/util/Util.ts
645-
646-
647-
src/Pages/GlobalConfigurations/Authorization/APITokens/GroupPermission.tsx
648-
src/Pages/GlobalConfigurations/Authorization/APITokens/index.ts
649-
src/Pages/GlobalConfigurations/Authorization/APITokens/validationRules.ts
650-
src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/index.ts
651-
src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/index.ts
652-
src/Pages/GlobalConfigurations/Authorization/PermissionGroups/index.ts
653-
src/Pages/GlobalConfigurations/Authorization/SSOLoginServices/index.ts
654-
src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx
655-
src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/index.ts
656-
src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionRow.tsx
657-
src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/index.ts
658-
src/Pages/GlobalConfigurations/Authorization/UserPermissions/SSONotConfiguredState.tsx
659-
src/Pages/GlobalConfigurations/Authorization/UserPermissions/index.ts
660-
src/Pages/GlobalConfigurations/Authorization/index.ts
661-
src/Pages/GlobalConfigurations/Authorization/shared/components/FilterEmptyState/index.ts
662-
src/Pages/GlobalConfigurations/Authorization/shared/components/SuperAdminInfoBar/index.ts
663-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/CustomLogsModal/CustomLogsModal.tsx

‎src/App.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ export default function App() {
165165

166166
useEffect(() => {
167167
if (window.isSecureContext && navigator.serviceWorker) {
168-
// check for sw updates on page change
169-
navigator.serviceWorker.getRegistrations().then((regs) => regs.forEach((reg) => reg.update()))
170-
if (!needRefresh) {
171-
return
168+
// check for sw updates on page change
169+
navigator.serviceWorker.getRegistrations().then((regs) => regs.forEach((reg) => reg.update()))
170+
if (!needRefresh) {
171+
return
172+
}
173+
update()
172174
}
173-
update()
174-
}
175175
}, [location])
176176

177177
function onUpdate() {

‎src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/UserGroup.tsx

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ export const DirectPermission: React.FC<DirectPermissionRow> = ({
140140
{value === '*'
141141
? 'Admin'
142142
: permission.accessType === ACCESS_TYPE_MAP.HELM_APPS
143-
? customRoles.possibleRolesMetaForHelm[value].value
144-
: permission.entity === EntityTypes.JOB
145-
? customRoles.possibleRolesMetaForJob[value].value
146-
: customRoles.possibleRolesMeta[value].value}
143+
? customRoles.possibleRolesMetaForHelm[value].value
144+
: permission.entity === EntityTypes.JOB
145+
? customRoles.possibleRolesMetaForJob[value].value
146+
: customRoles.possibleRolesMeta[value].value}
147147
{ApproverPermission && (permission.approver || primaryActionRole.configApprover) && ', Approver'}
148148
{React.cloneElement(children[1])}
149149
</components.ValueContainer>
@@ -247,8 +247,8 @@ export const DirectPermission: React.FC<DirectPermissionRow> = ({
247247
(permission.accessType === ACCESS_TYPE_MAP.DEVTRON_APPS
248248
? appsList
249249
: isJobs
250-
? jobsList
251-
: appsListHelmApps
250+
? jobsList
251+
: appsListHelmApps
252252
).get(projectId)?.result) ||
253253
[]
254254
)?.map((app) => ({
@@ -318,17 +318,17 @@ export const DirectPermission: React.FC<DirectPermissionRow> = ({
318318
(permission.accessType === ACCESS_TYPE_MAP.HELM_APPS
319319
? customRoles.possibleRolesMetaForHelm
320320
: permission.accessType === ACCESS_TYPE_MAP.JOBS
321-
? customRoles.possibleRolesMetaForJob
322-
: customRoles.possibleRolesMeta)[value]?.value
321+
? customRoles.possibleRolesMetaForJob
322+
: customRoles.possibleRolesMeta)[value]?.value
323323
}
324324
</span>
325325
<small className="light-color">
326326
{
327327
(permission.accessType === ACCESS_TYPE_MAP.HELM_APPS
328328
? customRoles.possibleRolesMetaForHelm
329329
: permission.accessType === ACCESS_TYPE_MAP.JOBS
330-
? customRoles.possibleRolesMetaForJob
331-
: customRoles.possibleRolesMeta)[value]?.description
330+
? customRoles.possibleRolesMetaForJob
331+
: customRoles.possibleRolesMeta)[value]?.description
332332
}
333333
</small>
334334
</div>
@@ -384,12 +384,13 @@ export const DirectPermission: React.FC<DirectPermissionRow> = ({
384384
return (
385385
<div className="flex left column">
386386
<span>{option.label}</span>
387-
{permission.accessType === ACCESS_TYPE_MAP.HELM_APPS && option.value === HELM_APP_UNASSIGNED_PROJECT && (
388-
<>
389-
<small className="light-color">Apps without an assigned project</small>
390-
<div className="unassigned-project-border" />
391-
</>
392-
)}
387+
{permission.accessType === ACCESS_TYPE_MAP.HELM_APPS &&
388+
option.value === HELM_APP_UNASSIGNED_PROJECT && (
389+
<>
390+
<small className="light-color">Apps without an assigned project</small>
391+
<div className="unassigned-project-border" />
392+
</>
393+
)}
393394
</div>
394395
)
395396
}
@@ -558,8 +559,8 @@ export const DirectPermission: React.FC<DirectPermissionRow> = ({
558559
? (permission.accessType === ACCESS_TYPE_MAP.DEVTRON_APPS
559560
? appsList
560561
: permission.entity === EntityTypes.JOB
561-
? jobsList
562-
: appsListHelmApps
562+
? jobsList
563+
: appsListHelmApps
563564
).get(projectId)?.loading
564565
: false
565566
}
@@ -659,8 +660,8 @@ export const DirectPermission: React.FC<DirectPermissionRow> = ({
659660
backgroundColor: state.isSelected
660661
? 'var(--B100)'
661662
: state.isFocused
662-
? 'var(--N100)'
663-
: 'white',
663+
? 'var(--N100)'
664+
: 'white',
664665
fontWeight: state.isSelected ? 600 : 'normal',
665666
cursor: state.isDisabled ? 'not-allowed' : 'pointer',
666667
marginRight: '8px',
@@ -717,8 +718,6 @@ const AppOption = ({ props, permission }) => {
717718
)
718719
}
719720

720-
721-
722721
export const ChartPermission: React.FC<ChartPermissionRow> = React.memo(
723722
({ chartPermission, setChartPermission, hideInfoLegend }) => {
724723
const { chartGroupsList } = useAuthorizationContext()
@@ -793,8 +792,8 @@ export const ChartPermission: React.FC<ChartPermissionRow> = React.memo(
793792
chartPermission.action === ActionTypes.ADMIN
794793
? chartGroupEditOptions[0]
795794
: chartPermission.action === ActionTypes.VIEW
796-
? { label: 'Deny', value: 'Deny' }
797-
: { label: 'Specific Chart Groups', value: 'Specific Charts' }
795+
? { label: 'Deny', value: 'Deny' }
796+
: { label: 'Specific Chart Groups', value: 'Specific Charts' }
798797
}
799798
isDisabled={chartPermission.action === ActionTypes.ADMIN}
800799
options={chartGroupEditOptions}

‎src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/userGroups.types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// TODO (v3): Remove this file
22

33
import React from 'react'
4+
import { OptionType } from '@devtron-labs/devtron-fe-common-lib'
45
import { ACCESS_TYPE_MAP } from '../../../../../../config'
56
import { PermissionGroup, User } from '../../../types'
67
import { Nodes } from '../../../../../../components/app/types'
78
import { ChartGroup } from '../../../../../../components/charts/charts.types'
8-
import { OptionType } from '@devtron-labs/devtron-fe-common-lib'
99

1010
export enum EntityTypes {
1111
CHART_GROUP = 'chart-group',

‎src/components/ClusterNodes/ClusterSelectionList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { useState, useEffect } from 'react'
22
import { useHistory, useLocation } from 'react-router-dom'
3-
import { handleUTCTime } from '../common'
43
import { Progressing, SearchBar } from '@devtron-labs/devtron-fe-common-lib'
54
import Tippy from '@tippyjs/react'
5+
import { handleUTCTime } from '../common'
66
import { ClusterDetail } from './types'
77
import { ReactComponent as Error } from '../../assets/icons/ic-error-exclamation.svg'
88
import { ReactComponent as Success } from '../../assets/icons/appstatus/healthy.svg'
@@ -72,8 +72,8 @@ export default function ClusterSelectionList({
7272
}
7373

7474
const handleFilterKeyPress = (value): void => {
75-
handleFilterChanges(value)
76-
setSearchApplied(true)
75+
handleFilterChanges(value)
76+
setSearchApplied(true)
7777
}
7878

7979
const handleSearchChange = (value): void => {

‎src/components/EnvironmentOverride/DeploymentTemplateOverrideForm.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { useParams } from 'react-router-dom'
33
import { toast } from 'react-toastify'
44
import YAML from 'yaml'
55
import { Progressing, getLockedJSON, getUnlockedJSON } from '@devtron-labs/devtron-fe-common-lib'
6+
import * as jsonpatch from 'fast-json-patch'
67
import { FloatingVariablesSuggestions, importComponentFromFELibrary, useJsonYaml } from '../common'
78
import { ConfigKeysWithLockType, DeploymentConfigStateActionTypes } from '../deploymentConfig/types'
89
import { EDITOR_VIEW } from '../deploymentConfig/constants'
@@ -27,7 +28,6 @@ import {
2728
validateBasicView,
2829
} from '../deploymentConfig/DeploymentConfig.utils'
2930
import CodeEditor from '../CodeEditor/CodeEditor'
30-
import * as jsonpatch from 'fast-json-patch'
3131

3232
const ConfigToolbar = importComponentFromFELibrary('ConfigToolbar', DeploymentConfigToolbar)
3333
const SaveChangesModal = importComponentFromFELibrary('SaveChangesModal')
@@ -392,7 +392,7 @@ export default function DeploymentTemplateOverrideForm({
392392
return
393393
}
394394

395-
//setting true to update codeditor values with current locked keys checkbox value
395+
// setting true to update codeditor values with current locked keys checkbox value
396396
hideLockKeysToggled.current = true
397397

398398
dispatch({
@@ -604,7 +604,7 @@ export default function DeploymentTemplateOverrideForm({
604604
return (
605605
<DeploymentTemplateReadOnlyEditorView
606606
value={isValuesOverride ? getCodeEditorValue(true) : manifestDataRHS}
607-
isEnvOverride={true}
607+
isEnvOverride
608608
lockedConfigKeysWithLockType={lockedConfigKeysWithLockType}
609609
hideLockedKeys={hideLockedKeys}
610610
removedPatches={removedPatches}
@@ -620,7 +620,7 @@ export default function DeploymentTemplateOverrideForm({
620620
}
621621
return (
622622
<DeploymentTemplateEditorView
623-
isEnvOverride={true}
623+
isEnvOverride
624624
value={isValuesOverride ? getCodeEditorValue(false) : manifestDataRHS}
625625
defaultValue={
626626
state.data && state.openComparison

‎src/components/Jobs/JobList/JobListView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import { AppStatus, ErrorScreenManager, Progressing, DEFAULT_BASE_PAGE_SIZE } from '@devtron-labs/devtron-fe-common-lib'
3-
import { Pagination } from '../../common'
43
import { Link, useHistory, useLocation } from 'react-router-dom'
4+
import { Pagination } from '../../common'
55
import { ReactComponent as Edit } from '../../../assets/icons/ic-settings.svg'
66
import { ReactComponent as JobIcon } from '../../../assets/icons/ic-job-node.svg'
77
import { ReactComponent as Arrow } from '../../../assets/icons/ic-dropdown-filled.svg'

‎src/components/app/details/appDetails/AppDetails.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,9 +1158,9 @@ export const NodeSelectors: React.FC<NodeSelectorsType> = ({
11581158
</Tippy>
11591159

11601160
<Tippy className="default-tt" arrow={false} placement="bottom" content="Clear">
1161-
<div className="flex">
1162-
<Abort className="icon-dim-20 mr-16 ml-8" onClick={onLogsCleared} />
1163-
</div>
1161+
<div className="flex">
1162+
<Abort className="icon-dim-20 mr-16 ml-8" onClick={onLogsCleared} />
1163+
</div>
11641164
</Tippy>
11651165
<span style={{ width: '1px', height: '16px', background: '#0b0f22' }} />
11661166
</>

‎src/components/app/details/appDetails/AppMetrics.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -405,14 +405,14 @@ export const AppMetrics: React.FC<{
405405
</h3>
406406
</div>
407407
<Tippy className="default-tt" arrow={false} placement="bottom" content="Fullscreen">
408-
<div className="flex">
409-
<Fullscreen
410-
className="icon-dim-16 cursor fcn-5"
411-
onClick={(e) => {
412-
setChartName(ChartType.Latency)
413-
}}
414-
/>
415-
</div>
408+
<div className="flex">
409+
<Fullscreen
410+
className="icon-dim-16 cursor fcn-5"
411+
onClick={(e) => {
412+
setChartName(ChartType.Latency)
413+
}}
414+
/>
415+
</div>
416416
</Tippy>
417417
</div>
418418
<iframe

0 commit comments

Comments
 (0)