Skip to content

Commit 4458eb0

Browse files
eshankvaisheshankvaish
committed
Merge branch 'develop' of github.com:devtron-labs/dashboard into revert-2402-feat/approval-policy-discovery
2 parents 06b8b3a + 0671ebc commit 4458eb0

File tree

963 files changed

+26853
-34440
lines changed

Some content is hidden

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

963 files changed

+26853
-34440
lines changed

‎.env

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ SENTRY_PERFORMANCE_ENABLED=false
44
SENTRY_DSN=
55
SENTRY_RELEASE_VERSION=
66
SENTRY_TRACES_SAMPLE_RATE=0.2
7-
HOTJAR_ENABLED=false
87
GA_ENABLED=false
98
GA_TRACKING_ID=
109
GTM_ENABLED=false
@@ -22,7 +21,6 @@ EA_APP_DETAILS_POLLING_INTERVAL=30000
2221
CENTRAL_API_ENDPOINT=https://api.devtron.ai
2322
HIDE_GITOPS_OR_HELM_OPTION=true
2423
CONFIGURABLE_TIMEOUT=
25-
HIDE_APPLICATION_GROUPS=true
2624
K8S_CLIENT=false
2725
CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL=7000
2826
CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
@@ -31,7 +29,7 @@ HIDE_EXCLUDE_INCLUDE_GIT_COMMITS=true
3129
ENABLE_BUILD_CONTEXT=false
3230
CLAIR_TOOL_VERSION=
3331
ENABLE_RESTART_WORKLOAD=false
34-
ENABLE_SCOPED_VARIABLES=false
32+
ENABLE_SCOPED_VARIABLES=true
3533
DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
3634
ANNOUNCEMENT_BANNER_MSG=
3735
LOGIN_PAGE_IMAGE=
@@ -60,9 +58,12 @@ FEATURE_PROMO_EMBEDDED_BUTTON_TEXT=
6058
FEATURE_PROMO_EMBEDDED_MODAL_TITLE=
6159
FEATURE_PROMO_EMBEDDED_IFRAME_URL=
6260
FEATURE_SWAP_TRAFFIC_ENABLE=false
63-
FEATURE_RB_SYNC_CLUSTER_ENABLE=false
61+
FEATURE_RB_SYNC_CLUSTER_ENABLE=true
6462
FEATURE_BULK_RESTART_WORKLOADS_FROM_RB=deployment,rollout,daemonset,statefulset
6563
FEATURE_DEFAULT_MERGE_STRATEGY=
6664
FEATURE_CLUSTER_MAP_ENABLE=true
6765
FEATURE_DEFAULT_LANDING_RB_ENABLE=false
6866
FEATURE_ACTION_AUDIOS_ENABLE=true
67+
FEATURE_CODE_MIRROR_ENABLE=false
68+
FEATURE_EXPERIMENTAL_THEMING_ENABLE=true
69+
FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false

‎.eslintignore

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ src/components/ApplicationGroup/Details/EnvironmentOverview/HibernateStatusRow.t
3333
src/components/ApplicationGroup/Details/EnvironmentOverview/__test__/EnvironmentOverview.test.tsx
3434
src/components/ApplicationGroup/Details/TriggerView/BulkCDTrigger.tsx
3535
src/components/ApplicationGroup/Details/TriggerView/BulkCITrigger.tsx
36-
src/components/ApplicationGroup/Details/TriggerView/BulkSourceChange.tsx
3736
src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx
38-
src/components/ApplicationGroup/Details/TriggerView/SourceUpdateResponseModal.tsx
39-
src/components/ApplicationGroup/Details/TriggerView/TriggerModalTableRow.tsx
40-
src/components/ApplicationGroup/Details/TriggerView/TriggerResponseModal.tsx
4137
src/components/ApplicationGroup/SearchBar.tsx
4238
src/components/CIPipelineN/AdvancedConfigOptions.tsx
4339
src/components/CIPipelineN/Build.tsx
@@ -61,9 +57,6 @@ src/components/ClusterNodes/ClusterEvents.tsx
6157
src/components/ClusterNodes/ClusterManifest.tsx
6258
src/components/ClusterNodes/ClusterNodeEmptyStates.tsx
6359
src/components/ClusterNodes/ClusterOverview.tsx
64-
src/components/ClusterNodes/NodeActions/CordonNodeModal.tsx
65-
src/components/ClusterNodes/NodeActions/DeleteNodeModal.tsx
66-
src/components/ClusterNodes/NodeActions/DrainNodeModal.tsx
6760
src/components/ClusterNodes/NodeActions/EditTaintsModal.tsx
6861
src/components/ClusterNodes/NodeActions/NodeActionsMenu.tsx
6962
src/components/ClusterNodes/NodeActions/validationRules.ts
@@ -80,9 +73,7 @@ src/components/Jobs/JobsEmptyState.tsx
8073
src/components/Jobs/Service.ts
8174
src/components/Jobs/Utils.ts
8275
src/components/LogViewer/LogViewer.tsx
83-
src/components/ResourceBrowser/ResourceList/ResourceList.component.tsx
8476
src/components/ResourceBrowser/ResourceList/__tests__/Sidebar.test.tsx
85-
src/components/__mocks__/monaco-editor.js
8677
src/components/__mocks__/xterm-webfont.js
8778
src/components/app/LogFilter.test.ts
8879
src/components/app/LogFilter.ts
@@ -98,7 +89,6 @@ src/components/app/create/validationRules.ts
9889
src/components/app/details/AboutAppInfoModal.tsx
9990
src/components/app/details/AboutTagEditModal.tsx
10091
src/components/app/details/AppHeader.tsx
101-
src/components/app/details/appDetails/AppDetails.tsx
10292
src/components/app/details/appDetails/AppMetrics.tsx
10393
src/components/app/details/appDetails/AppStatusCard.tsx
10494
src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx
@@ -175,7 +165,6 @@ src/components/charts/charts.util.tsx
175165
src/components/charts/dialogs/ValuesYamlConfirmDialog.tsx
176166
src/components/charts/discoverChartDetail/About.tsx
177167
src/components/charts/discoverChartDetail/ChartDeploymentList.tsx
178-
src/components/charts/discoverChartDetail/ChartVersionSelectorModal.tsx
179168
src/components/charts/discoverChartDetail/DiscoverChartDetails.tsx
180169
src/components/charts/list/ChartGroup.tsx
181170
src/components/charts/list/ChartListPopUp.tsx
@@ -223,7 +212,6 @@ src/components/ciPipeline/WebhookSelectorCondition.tsx
223212
src/components/ciPipeline/ciPipeline.service.ts
224213
src/components/ciPipeline/validationRules.ts
225214
src/components/cluster/Cluster.tsx
226-
src/components/cluster/ClusterCodeEditor.tsx
227215
src/components/cluster/ClusterComponentModal.tsx
228216
src/components/cluster/ClusterForm.tsx
229217
src/components/cluster/ClusterInfoStepsModal.tsx
@@ -237,21 +225,13 @@ src/components/command/command.util.ts
237225
src/components/common/Accordian/Accordian.tsx
238226
src/components/common/AppDetailsEmptyState.tsx
239227
src/components/common/Carousel/Carousel.tsx
240-
src/components/common/ClusterNotReachableDailog/ClusterNotReachableDialog.tsx
241228
src/components/common/ContentCard/ContentCard.tsx
242229
src/components/common/Contexts/AppContext.ts
243230
src/components/common/DatePickers/Calender.tsx
244231
src/components/common/DatePickers/DayPickerRangeController.tsx
245232
src/components/common/DeprecatedUpdateWarn.tsx
246233
src/components/common/Description/GenericDescription.tsx
247234
src/components/common/DynamicTabs/__tests__/DynamicTabs.test.tsx
248-
src/components/common/FloatingVariablesSuggestions/FloatingVariablesSuggestions.tsx
249-
src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx
250-
src/components/common/FloatingVariablesSuggestions/Suggestions.tsx
251-
src/components/common/FloatingVariablesSuggestions/__tests__/FloatingVariablesSuggestions.test.tsx
252-
src/components/common/FloatingVariablesSuggestions/__tests__/Suggestions.test.tsx
253-
src/components/common/FloatingVariablesSuggestions/__tests__/SuggestionsInfo.test.tsx
254-
src/components/common/FloatingVariablesSuggestions/__tests__/SuggestionsItem.test.tsx
255235
src/components/common/HiddenInput/HiddenInput.tsx
256236
src/components/common/List/List.tsx
257237
src/components/common/MultiSelect/MultiSelect.tsx
@@ -262,7 +242,6 @@ src/components/common/edge/rectangularEdge.tsx
262242
src/components/common/edge/straightEdge.tsx
263243
src/components/common/errorBoundary.tsx
264244
src/components/common/formFields/CopyButton.tsx
265-
src/components/common/formFields/CustomPassword.tsx
266245
src/components/common/formFields/DevtronSwitch.tsx
267246
src/components/common/formFields/Typeahead.tsx
268247
src/components/common/helpers/Helpers.tsx
@@ -285,9 +264,6 @@ src/components/external-apps/ExternalApps.tsx
285264
src/components/externalArgoApps/ExternalArgoApp.tsx
286265
src/components/externalArgoApps/ExternalArgoAppDetail.tsx
287266
src/components/externalLinks/ExternalLinks.component.tsx
288-
src/components/externalLinks/ExternalLinks.service.ts
289-
src/components/externalLinks/ExternalLinks.tsx
290-
src/components/externalLinks/ExternalLinks.utils.ts
291267
src/components/externalLinks/ExternalLinksCRUD/AddExternalLink.tsx
292268
src/components/externalLinks/ExternalLinksCRUD/ConfigureLinkAction.tsx
293269
src/components/externalLinks/ExternalLinksCRUD/DeleteExternalLinkDialog.tsx
@@ -307,22 +283,14 @@ src/components/globalConfigurations/GlobalConfiguration.tsx
307283
src/components/globalConfigurations/GlobalConfigurationProvider.tsx
308284
src/components/hostURL/HostURL.tsx
309285
src/components/hyperion/EnvironmentSelect.tsx
310-
src/components/login/Login.tsx
311-
src/components/login/login.service.ts
312286
src/components/material/CreateMaterial.tsx
313287
src/components/material/MaterialList.tsx
314288
src/components/material/MaterialView.tsx
315289
src/components/material/UpdateMaterial.tsx
316290
src/components/notifications/AddNotification.tsx
317-
src/components/notifications/ConfigurationTab.tsx
318-
src/components/notifications/CreateHeaderDetails.tsx
319291
src/components/notifications/ModifyRecipientsModal.tsx
320292
src/components/notifications/NotificationTab.tsx
321293
src/components/notifications/Notifications.tsx
322-
src/components/notifications/SESConfigModal.tsx
323-
src/components/notifications/SMTPConfigModal.tsx
324-
src/components/notifications/SlackConfigModal.tsx
325-
src/components/notifications/WebhookConfigModal.tsx
326294
src/components/notifications/notifications.service.ts
327295
src/components/notifications/notifications.util.tsx
328296
src/components/onboardingGuide/GuideCommonHeader.tsx
@@ -362,37 +330,23 @@ src/components/security/security.service.ts
362330
src/components/security/security.util.tsx
363331
src/components/terminal/TerminalWrapper.tsx
364332
src/components/util/KeyValueFileInput.tsx
365-
src/components/v2/appDetails/AppDetails.component.tsx
366-
src/components/v2/appDetails/NodeTreeDetailTab.tsx
367333
src/components/v2/appDetails/ReleaseStatusEmptyState.tsx
368334
src/components/v2/appDetails/SyncError.component.tsx
369335
src/components/v2/appDetails/__tests__/index.store.test.ts
370336
src/components/v2/appDetails/appDetails.api.ts
371-
src/components/v2/appDetails/appDetails.store.ts
372337
src/components/v2/appDetails/appDetails.type.ts
373338
src/components/v2/appDetails/ea/EAAppDetail.component.tsx
374339
src/components/v2/appDetails/k8Resource/FilterResource.tsx
375-
src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
376340
src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
377-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
378341
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/CustomLogsModal/CustomLogsModal.tsx
379-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Events.component.tsx
380-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/EventsTable.tsx
381-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/LogViewer.component.tsx
382-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Logs.component.tsx
383-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Manifest.component.tsx
384-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Summary.component.tsx
385342
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Terminal.component.tsx
386-
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx
387343
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/TerminalWrapper.component.tsx
388344
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/__tests__/Terminal.component.test.tsx
389345
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/__tests__/TerminalWrapper.test.tsx
390346
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/constants.ts
391347
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/terminal.type.ts
392348
src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.api.ts
393349
src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.tsx
394-
src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
395-
src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
396350
src/components/v2/appDetails/k8Resource/nodeType/NodeTree.component.tsx
397351
src/components/v2/appDetails/k8Resource/nodeType/PodTabSection.tsx
398352
src/components/v2/appDetails/k8Resource/nodeType/__tests__/NodeTree.component.test.ts
@@ -411,7 +365,6 @@ src/components/v2/chartDeploymentHistory/DockerListModal.tsx
411365
src/components/v2/chartDeploymentHistory/chartDeploymentHistory.service.ts
412366
src/components/v2/common/ReactSelect.utils.tsx
413367
src/components/v2/common/ReactSelectCustomization.tsx
414-
src/components/v2/common/message.ui.tsx
415368
src/components/v2/devtronStackManager/AboutDevtronView.tsx
416369
src/components/v2/devtronStackManager/DevtronStackManager.component.tsx
417370
src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
@@ -423,7 +376,6 @@ src/components/v2/headers/ChartHeader.component.tsx
423376
src/components/v2/headers/EAHeader.component.tsx
424377
src/components/v2/index.tsx
425378
src/components/v2/utils/tabUtils/useTab.ts
426-
src/components/v2/utils/tableUtils/Table.util.tsx
427379
src/components/v2/utils/useSharedState.ts
428380
src/components/v2/values/ChartValues.component.tsx
429381
src/components/v2/values/chartValuesDiff/ChartRepoSelector.tsx
@@ -441,7 +393,6 @@ src/components/workflowEditor/EmptyWorkflow.tsx
441393
src/components/workflowEditor/NoGitOpsConfiguredWarning.tsx
442394
src/components/workflowEditor/NoGitOpsRepoConfiguredWarning.tsx
443395
src/components/workflowEditor/PipelineSelect.tsx
444-
src/components/workflowEditor/ToggleCDSelectButton.tsx
445396
src/components/workflowEditor/Workflow.tsx
446397
src/components/workflowEditor/nodes/CDNode.tsx
447398
src/components/workflowEditor/nodes/CINode.tsx

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* vivek@devtron.ai @vikramdevtron
1+
* @vivek-devtron @vikramdevtron

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cache: 'yarn'
2626

2727
- name: Install dependencies
28-
run: yarn install
28+
run: yarn install --frozen-lockfile
2929

3030
- name: Check linting issues
3131
run: yarn lint

‎.github/workflows/pr-issue-validator.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
issues: write
2222
contents: read
2323
pull-requests: write
24+
repository-projects: read
2425
steps:
2526
- name: Checkout repository
2627
uses: actions/checkout@v2
@@ -140,4 +141,4 @@ jobs:
140141
gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
141142
gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
142143
exit 1
143-
fi
144+
fi

‎.github/workflows/sentry-source-map-upload.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Set SENTRY_RELEASE_VERSION
3232
id: vars
33-
run: echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
33+
run: echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT
3434

3535
- name: Create Sentry release
3636
uses: getsentry/action-release@v1

‎.storybook/preview.tsx

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,29 @@ import React from 'react'
22
import type { Preview } from '@storybook/react'
33
import '../src/css/application.scss'
44
import { BrowserRouter } from 'react-router-dom'
5-
import { ToastManagerContainer } from '@devtron-labs/devtron-fe-common-lib'
5+
import {
6+
ThemeProvider,
7+
ToastManagerContainer,
8+
ThemeSwitcher,
9+
noop,
10+
customEnv,
11+
DEVTRON_BASE_MAIN_ID,
12+
ConfirmationModalProvider,
13+
BaseConfirmationModal,
14+
useTheme,
15+
} from '@devtron-labs/devtron-fe-common-lib'
16+
import { SwitchThemeDialog } from '../src/Pages/Shared'
17+
18+
const SwitchThemeDialogWrapper = () => {
19+
const { showThemeSwitcherDialog, themePreference, handleThemeSwitcherDialogVisibilityChange } = useTheme()
20+
const handleClose = () => {
21+
handleThemeSwitcherDialogVisibilityChange(false)
22+
}
23+
24+
return (
25+
showThemeSwitcherDialog ? <SwitchThemeDialog initialThemePreference={themePreference} handleClose={handleClose} disableAPICalls /> : null
26+
)
27+
}
628

729
const preview: Preview = {
830
parameters: {
@@ -12,29 +34,36 @@ const preview: Preview = {
1234
date: /Date$/i,
1335
},
1436
},
15-
backgrounds: {
16-
values: [
17-
{
18-
name: 'Light',
19-
value: 'var(--N0)',
20-
},
21-
{
22-
name: 'Dark',
23-
value: 'var(--N700)',
24-
},
25-
],
26-
default: 'Light',
27-
},
2837
},
29-
tags: ['autodocs'],
30-
decorators: (Story) => (
31-
<>
32-
<BrowserRouter>
33-
<Story />
34-
</BrowserRouter>
35-
<ToastManagerContainer />
36-
</>
37-
),
38+
decorators: (Story) => {
39+
if (!window._env_) {
40+
window._env_ = {
41+
FEATURE_EXPERIMENTAL_THEMING_ENABLE: true,
42+
} as customEnv
43+
}
44+
45+
return (
46+
<ThemeProvider>
47+
<ConfirmationModalProvider>
48+
<div id={DEVTRON_BASE_MAIN_ID}>
49+
<div className="dc__border-bottom mb-10">
50+
<ThemeSwitcher onChange={noop} />
51+
</div>
52+
<BrowserRouter>
53+
<Story />
54+
</BrowserRouter>
55+
<ToastManagerContainer />
56+
</div>
57+
58+
<SwitchThemeDialogWrapper />
59+
60+
<div id="animated-dialog-backdrop" />
61+
62+
<BaseConfirmationModal />
63+
</ConfirmationModalProvider>
64+
</ThemeProvider>
65+
)
66+
},
3867
}
3968

4069
export default preview

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ WORKDIR /app
66
COPY package.json .
77
COPY yarn.lock .
88

9-
RUN yarn install --network-timeout 600000
9+
RUN yarn install --frozen-lockfile --network-timeout 600000
1010

1111
COPY src/ src
1212
COPY nginx.conf .
1313
COPY tsconfig.json .
1414
COPY vite.config.mts .
1515
COPY . .
1616

17-
RUN echo `git rev-parse --short HEAD` > health.html
17+
RUN echo `git rev-parse --short=9 HEAD` > health.html
1818

19-
RUN echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env
19+
RUN echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)\n" >> .env
2020

2121
RUN yarn build
2222

0 commit comments

Comments
 (0)