Skip to content

Commit b11ddf8

Browse files
eshankvaisheshankvaish
committed
refactor: add the Pages folder
1 parent a57da18 commit b11ddf8

File tree

97 files changed

+305
-302
lines changed

Some content is hidden

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

97 files changed

+305
-302
lines changed

‎.eslintignore

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -584,15 +584,15 @@ src/components/security/security.service.ts
584584
src/components/security/security.types.ts
585585
src/components/security/security.util.tsx
586586
src/components/terminal/TerminalWrapper.tsx
587-
src/GlobalConfigurations/Authorization/shared/components/AppPermissions.tsx
588-
src/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sListItemCard.tsx
589-
src/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermission.component.tsx
590-
src/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissionModal.tsx
591-
src/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissions.utils.ts
592-
src/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissons.tsx
593-
src/GlobalConfigurations/Authorization/shared/components/userGroups/UserGroup.tsx
594-
src/GlobalConfigurations/Authorization/shared/components/userGroups/userGroups.types.ts
595-
src/GlobalConfigurations/Authorization/SSOLoginServices/SSOLogin.component.tsx
587+
src/Pages/GlobalConfigurations/Authorization/shared/components/AppPermissions.tsx
588+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sListItemCard.tsx
589+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermission.component.tsx
590+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissionModal.tsx
591+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissions.utils.ts
592+
src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissons.tsx
593+
src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/UserGroup.tsx
594+
src/Pages/GlobalConfigurations/Authorization/shared/components/userGroups/userGroups.types.ts
595+
src/Pages/GlobalConfigurations/Authorization/SSOLoginServices/SSOLogin.component.tsx
596596
src/components/util/KeyValueFileInput.tsx
597597
src/components/util/URLUtil.ts
598598
src/components/v2/HelmAppOverview/HelpAppOverview.tsx

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.0.56",
7+
"@devtron-labs/devtron-fe-common-lib": "0.0.58",
88
"@rjsf/core": "^5.13.3",
99
"@rjsf/utils": "^5.13.3",
1010
"@rjsf/validator-ajv8": "^5.13.3",

‎src/GlobalConfigurations/Authorization/APITokens/APITokenList.tsx renamed to ‎src/Pages/GlobalConfigurations/Authorization/APITokens/APITokenList.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ import moment from 'moment'
22
import React, { useState } from 'react'
33
import { useHistory } from 'react-router-dom'
44
import { TippyCustomized, TippyTheme, GenericEmptyState } from '@devtron-labs/devtron-fe-common-lib'
5-
import { DOCUMENTATION, MomentDateFormat } from '../../../config'
6-
import { ReactComponent as Key } from '../../../assets/icons/ic-key-bulb.svg'
7-
import { ReactComponent as Edit } from '../../../assets/icons/ic-pencil.svg'
8-
import { ReactComponent as Trash } from '../../../assets/icons/ic-delete-interactive.svg'
5+
import { DOCUMENTATION, MomentDateFormat } from '../../../../config'
6+
import { ReactComponent as Key } from '../../../../assets/icons/ic-key-bulb.svg'
7+
import { ReactComponent as Edit } from '../../../../assets/icons/ic-pencil.svg'
8+
import { ReactComponent as Trash } from '../../../../assets/icons/ic-delete-interactive.svg'
99
import { APITokenListType, TokenListType } from './authorization.type'
1010
import { isTokenExpired } from './authorization.utils'
1111
import DeleteAPITokenModal from './DeleteAPITokenModal'
12-
import NoResults from '../../../assets/img/[email protected]'
12+
import NoResults from '../../../../assets/img/[email protected]'
1313
import './apiToken.scss'
14-
import { ReactComponent as Question } from '../../../assets/icons/ic-help-outline.svg'
15-
import { ReactComponent as QuestionFilled } from '../../../assets/icons/ic-help.svg'
16-
import { EMPTY_STATE_STATUS } from '../../../config/constantMessaging'
14+
import { ReactComponent as Question } from '../../../../assets/icons/ic-help-outline.svg'
15+
import { ReactComponent as QuestionFilled } from '../../../../assets/icons/ic-help.svg'
16+
import { EMPTY_STATE_STATUS } from '../../../../config/constantMessaging'
1717

1818
const APITokenList = ({ tokenList, renderSearchToken, reload }: APITokenListType) => {
1919
const history = useHistory()

‎src/GlobalConfigurations/Authorization/APITokens/ApiTokens.component.tsx renamed to ‎src/Pages/GlobalConfigurations/Authorization/APITokens/ApiTokens.component.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import React, { Fragment, useEffect, useState } from 'react'
22
import './apiToken.scss'
33
import { showError, Progressing, ErrorScreenManager, GenericEmptyState } from '@devtron-labs/devtron-fe-common-lib'
44
import { Redirect, Route, Switch, useHistory, useLocation, useRouteMatch } from 'react-router-dom'
5-
import { ReactComponent as Search } from '../../../assets/icons/ic-search.svg'
6-
import { ReactComponent as Clear } from '../../../assets/icons/ic-error.svg'
5+
import { ReactComponent as Search } from '../../../../assets/icons/ic-search.svg'
6+
import { ReactComponent as Clear } from '../../../../assets/icons/ic-error.svg'
77
import { getGeneratedAPITokenList } from './service'
8-
import emptyGeneratToken from '../../../assets/img/ic-empty-generate-token.png'
8+
import emptyGeneratToken from '../../../../assets/img/ic-empty-generate-token.png'
99
import APITokenList from './APITokenList'
1010
import CreateAPIToken from './CreateAPIToken'
1111
import EditAPIToken from './EditAPIToken'
1212
import { TokenListType, TokenResponseType } from './authorization.type'
13-
import { EMPTY_STATE_STATUS } from '../../../config/constantMessaging'
13+
import { EMPTY_STATE_STATUS } from '../../../../config/constantMessaging'
1414

1515
const ApiTokens = () => {
1616
const { path } = useRouteMatch()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import GenerateModal from './GenerateModal'
2020
import { createUserPermissionPayload, getDateInMilliseconds, isFormComplete } from './authorization.utils'
2121
import GenerateActionButton from './GenerateActionButton'
2222
import { ValidationRules } from './validationRules'
23-
import { ReactComponent as Error } from '../../../assets/icons/ic-warning.svg'
24-
import { ReactComponent as QuestionFilled } from '../../../assets/icons/ic-help.svg'
25-
import { ReactComponent as Question } from '../../../assets/icons/ic-help-outline.svg'
23+
import { ReactComponent as Error } from '../../../../assets/icons/ic-warning.svg'
24+
import { ReactComponent as QuestionFilled } from '../../../../assets/icons/ic-help.svg'
25+
import { ReactComponent as Question } from '../../../../assets/icons/ic-help-outline.svg'
2626
import {
2727
ActionTypes,
2828
ChartGroupPermissionsFilter,
@@ -31,10 +31,10 @@ import {
3131
OptionType,
3232
} from '../shared/components/userGroups/userGroups.types'
3333
import GroupPermission from './GroupPermission'
34-
import { mainContext } from '../../../components/common/navigation/NavigationRoutes'
34+
import { mainContext } from '../../../../components/common/navigation/NavigationRoutes'
3535
import ExpirationDate from './ExpirationDate'
36-
import { DOCUMENTATION } from '../../../config'
37-
import { API_COMPONENTS } from '../../../config/constantMessaging'
36+
import { DOCUMENTATION } from '../../../../config'
37+
import { API_COMPONENTS } from '../../../../config/constantMessaging'
3838
import SuperAdminInfoBar from '../shared/components/SuperAdminInfoBar'
3939
import { createOrUpdateUser } from '../authorization.service'
4040
import { PermissionType, PERMISSION_TYPE_LABEL_MAP } from '../constants'

‎src/GlobalConfigurations/Authorization/APITokens/DeleteAPITokenModal.tsx renamed to ‎src/Pages/GlobalConfigurations/Authorization/APITokens/DeleteAPITokenModal.tsx

File renamed without changes.

‎src/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx renamed to ‎src/Pages/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ import { useHistory, useRouteMatch, useParams } from 'react-router-dom'
1515
import moment from 'moment'
1616
import { toast } from 'react-toastify'
1717
import Tippy from '@tippyjs/react'
18-
import { ReactComponent as InfoIcon } from '../../../assets/icons/info-filled.svg'
18+
import { ReactComponent as InfoIcon } from '../../../../assets/icons/info-filled.svg'
1919
import RegeneratedModal from './RegenerateModal'
2020
import { EditDataType, EditTokenType } from './authorization.type'
2121
import { createUserPermissionPayload, isFormComplete, isTokenExpired } from './authorization.utils'
22-
import { ReactComponent as Clipboard } from '../../../assets/icons/ic-copy.svg'
23-
import { ReactComponent as Delete } from '../../../assets/icons/ic-delete-interactive.svg'
22+
import { ReactComponent as Clipboard } from '../../../../assets/icons/ic-copy.svg'
23+
import { ReactComponent as Delete } from '../../../../assets/icons/ic-delete-interactive.svg'
2424
import GenerateActionButton from './GenerateActionButton'
25-
import { MomentDateFormat } from '../../../config'
26-
import { ButtonWithLoader } from '../../../components/common'
25+
import { MomentDateFormat } from '../../../../config'
26+
import { ButtonWithLoader } from '../../../../components/common'
2727
import { updateGeneratedAPIToken } from './service'
2828
import GroupPermission from './GroupPermission'
2929
import {
@@ -33,10 +33,10 @@ import {
3333
EntityTypes,
3434
OptionType,
3535
} from '../shared/components/userGroups/userGroups.types'
36-
import { mainContext } from '../../../components/common/navigation/NavigationRoutes'
36+
import { mainContext } from '../../../../components/common/navigation/NavigationRoutes'
3737
import DeleteAPITokenModal from './DeleteAPITokenModal'
38-
import { ReactComponent as Warn } from '../../../assets/icons/ic-warning.svg'
39-
import { API_COMPONENTS } from '../../../config/constantMessaging'
38+
import { ReactComponent as Warn } from '../../../../assets/icons/ic-warning.svg'
39+
import { API_COMPONENTS } from '../../../../config/constantMessaging'
4040
import { renderQuestionwithTippy } from './CreateAPIToken'
4141
import SuperAdminInfoBar from '../shared/components/SuperAdminInfoBar'
4242
import { createOrUpdateUser, getUserById } from '../authorization.service'

‎src/GlobalConfigurations/Authorization/APITokens/ExpirationDate.tsx renamed to ‎src/Pages/GlobalConfigurations/Authorization/APITokens/ExpirationDate.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import React from 'react'
33
import ReactSelect from 'react-select'
44
import moment from 'moment'
55
import { InfoColourBar, multiSelectStyles } from '@devtron-labs/devtron-fe-common-lib'
6-
import { MomentDateFormat } from '../../../config'
7-
import { SingleDatePickerComponent } from '../../../components/common'
8-
import { DropdownIndicator } from '../../../components/security/security.util'
6+
import { MomentDateFormat } from '../../../../config'
7+
import { SingleDatePickerComponent } from '../../../../components/common'
8+
import { DropdownIndicator } from '../../../../components/security/security.util'
99
import { getOptions, getDateInMilliseconds } from './authorization.utils'
10-
import { Option } from '../../../components/v2/common/ReactSelect.utils'
11-
import { ReactComponent as Warn } from '../../../assets/icons/ic-warning.svg'
10+
import { Option } from '../../../../components/v2/common/ReactSelect.utils'
11+
import { ReactComponent as Warn } from '../../../../assets/icons/ic-warning.svg'
1212

1313
const ExpirationDate = ({ selectedExpirationDate, onChangeSelectFormData, handleDatesChange, customDate }) => {
1414
return (

‎src/GlobalConfigurations/Authorization/APITokens/GenerateActionButton.tsx renamed to ‎src/Pages/GlobalConfigurations/Authorization/APITokens/GenerateActionButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { ButtonWithLoader } from '../../../components/common'
2+
import { ButtonWithLoader } from '../../../../components/common'
33
import { GenerateActionButtonType } from './authorization.type'
44

55
const GenerateActionButton = ({ loader, onCancel, onSave, buttonText, regenerateButton }: GenerateActionButtonType) => {

‎src/GlobalConfigurations/Authorization/APITokens/GenerateModal.tsx renamed to ‎src/Pages/GlobalConfigurations/Authorization/APITokens/GenerateModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React, { useState } from 'react'
22
import { VisibleModal, copyToClipboard } from '@devtron-labs/devtron-fe-common-lib'
33
import Tippy from '@tippyjs/react'
4-
import { ReactComponent as Success } from '../../../assets/icons/ic-success-outline.svg'
5-
import { ReactComponent as Clipboard } from '../../../assets/icons/ic-copy.svg'
6-
import { ReactComponent as Close } from '../../../assets/icons/ic-close.svg'
7-
import { ReactComponent as Key } from '../../../assets/icons/ic-key-bulb.svg'
4+
import { ReactComponent as Success } from '../../../../assets/icons/ic-success-outline.svg'
5+
import { ReactComponent as Clipboard } from '../../../../assets/icons/ic-copy.svg'
6+
import { ReactComponent as Close } from '../../../../assets/icons/ic-close.svg'
7+
import { ReactComponent as Key } from '../../../../assets/icons/ic-key-bulb.svg'
88
import { GenerateTokenModalType } from './authorization.type'
99

1010
const GenerateModal = ({ close, token, reload, redirectToTokenList, isRegenerationModal }: GenerateTokenModalType) => {

0 commit comments

Comments
 (0)