Skip to content

Commit

Permalink
Merge pull request #2422 from devtron-labs/release-candidate-v0.28.0
Browse files Browse the repository at this point in the history
release: Release candidate v0.28.0
  • Loading branch information
eshankvaish authored Jan 30, 2025
2 parents 0ce3a3e + d4ac536 commit 679dbba
Show file tree
Hide file tree
Showing 693 changed files with 8,421 additions and 13,562 deletions.
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ HIDE_EXCLUDE_INCLUDE_GIT_COMMITS=true
ENABLE_BUILD_CONTEXT=false
CLAIR_TOOL_VERSION=
ENABLE_RESTART_WORKLOAD=false
ENABLE_SCOPED_VARIABLES=false
ENABLE_SCOPED_VARIABLES=true
DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
ANNOUNCEMENT_BANNER_MSG=
LOGIN_PAGE_IMAGE=
Expand Down Expand Up @@ -66,3 +66,4 @@ FEATURE_DEFAULT_MERGE_STRATEGY=
FEATURE_CLUSTER_MAP_ENABLE=true
FEATURE_DEFAULT_LANDING_RB_ENABLE=false
FEATURE_ACTION_AUDIOS_ENABLE=true
FEATURE_EXPERIMENTAL_THEMING_ENABLE=false
16 changes: 0 additions & 16 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ src/components/ClusterNodes/ClusterEvents.tsx
src/components/ClusterNodes/ClusterManifest.tsx
src/components/ClusterNodes/ClusterNodeEmptyStates.tsx
src/components/ClusterNodes/ClusterOverview.tsx
src/components/ClusterNodes/NodeActions/CordonNodeModal.tsx
src/components/ClusterNodes/NodeActions/DeleteNodeModal.tsx
src/components/ClusterNodes/NodeActions/DrainNodeModal.tsx
src/components/ClusterNodes/NodeActions/EditTaintsModal.tsx
src/components/ClusterNodes/NodeActions/NodeActionsMenu.tsx
src/components/ClusterNodes/NodeActions/validationRules.ts
Expand Down Expand Up @@ -245,13 +243,6 @@ src/components/common/DatePickers/DayPickerRangeController.tsx
src/components/common/DeprecatedUpdateWarn.tsx
src/components/common/Description/GenericDescription.tsx
src/components/common/DynamicTabs/__tests__/DynamicTabs.test.tsx
src/components/common/FloatingVariablesSuggestions/FloatingVariablesSuggestions.tsx
src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx
src/components/common/FloatingVariablesSuggestions/Suggestions.tsx
src/components/common/FloatingVariablesSuggestions/__tests__/FloatingVariablesSuggestions.test.tsx
src/components/common/FloatingVariablesSuggestions/__tests__/Suggestions.test.tsx
src/components/common/FloatingVariablesSuggestions/__tests__/SuggestionsInfo.test.tsx
src/components/common/FloatingVariablesSuggestions/__tests__/SuggestionsItem.test.tsx
src/components/common/HiddenInput/HiddenInput.tsx
src/components/common/List/List.tsx
src/components/common/MultiSelect/MultiSelect.tsx
Expand Down Expand Up @@ -357,16 +348,13 @@ src/components/security/security.util.tsx
src/components/terminal/TerminalWrapper.tsx
src/components/util/KeyValueFileInput.tsx
src/components/v2/appDetails/AppDetails.component.tsx
src/components/v2/appDetails/NodeTreeDetailTab.tsx
src/components/v2/appDetails/ReleaseStatusEmptyState.tsx
src/components/v2/appDetails/SyncError.component.tsx
src/components/v2/appDetails/__tests__/index.store.test.ts
src/components/v2/appDetails/appDetails.api.ts
src/components/v2/appDetails/appDetails.store.ts
src/components/v2/appDetails/appDetails.type.ts
src/components/v2/appDetails/ea/EAAppDetail.component.tsx
src/components/v2/appDetails/k8Resource/FilterResource.tsx
src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/CustomLogsModal/CustomLogsModal.tsx
Expand All @@ -385,8 +373,6 @@ src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/const
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/terminal.type.ts
src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.api.ts
src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.tsx
src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
src/components/v2/appDetails/k8Resource/nodeType/NodeTree.component.tsx
src/components/v2/appDetails/k8Resource/nodeType/PodTabSection.tsx
src/components/v2/appDetails/k8Resource/nodeType/__tests__/NodeTree.component.test.ts
Expand All @@ -405,7 +391,6 @@ src/components/v2/chartDeploymentHistory/DockerListModal.tsx
src/components/v2/chartDeploymentHistory/chartDeploymentHistory.service.ts
src/components/v2/common/ReactSelect.utils.tsx
src/components/v2/common/ReactSelectCustomization.tsx
src/components/v2/common/message.ui.tsx
src/components/v2/devtronStackManager/AboutDevtronView.tsx
src/components/v2/devtronStackManager/DevtronStackManager.component.tsx
src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
Expand All @@ -417,7 +402,6 @@ src/components/v2/headers/ChartHeader.component.tsx
src/components/v2/headers/EAHeader.component.tsx
src/components/v2/index.tsx
src/components/v2/utils/tabUtils/useTab.ts
src/components/v2/utils/tableUtils/Table.util.tsx
src/components/v2/utils/useSharedState.ts
src/components/v2/values/ChartValues.component.tsx
src/components/v2/values/chartValuesDiff/ChartRepoSelector.tsx
Expand Down
1 change: 1 addition & 0 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@
| TRIGGER_API_TIMEOUT | 60000 | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD |
| FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS | "true" | Would hide the user direct permissions for non-super admin users in User Permissions |
| FEATURE_ACTION_AUDIOS_ENABLE | true | Would enable audios in dashboard |
| FEATURE_EXPERIMENTAL_THEMING_ENABLE | true | Would enable theming in dashboard |

# DASHBOARD CONFIG SECRET
23 changes: 23 additions & 0 deletions index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Although this is duplicated but this would help us with consistent loader in case
* the theme is same as the system theme.
*/
:root {
/* Using the same name as in color palette to ensure this is applied when styles are loading */
--bg-tertiary: #f2f4f7;
--bg-devtron-loader: #e5f2ff;
--fill-devtron-loader: #3989d9;


/* TODO: Comment when theming goes live on production */
/* @media (prefers-color-scheme: dark) {
--bg-tertiary: #15161F;
--bg-devtron-loader: #28364c;
--fill-devtron-loader: #6195d2;
} */
}

body {
margin: 0;
background: var(--bg-tertiary);
}
32 changes: 13 additions & 19 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@
href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap"
rel="stylesheet"
/>
<link rel="stylesheet" href="./index.css" />
<link rel="shortcut icon" href="/favicon.ico" />
<script src="/dashboard/env-config.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#0066cc" />
<meta name="theme-color" media="(prefers-color-scheme: light)" content="#0066cc" />
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#74B5FF" />
<meta name="robots" content="noindex, nofollow" />
<meta name="description" content="Easily containerize your application to move it to Kubernetes in the cloud or in your own data center. Build, test, secure, deploy, and manage your applications on Kubernetes using open-source software." />
<title>Devtron</title>
Expand All @@ -45,7 +47,6 @@
display: flex;
justify-content: center;
align-items: center;
background-color: #fff;
"
>
<svg width="80" height="80" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
Expand Down Expand Up @@ -73,19 +74,18 @@

@keyframes path-fill {
0% {
fill: #3989d9;
opacity: 1;
}
30% {
fill: #3989d9;
opacity: 1;
}
45% {
fill: #abcff3;
opacity: 0.4;
}
100% {
fill: #3989d9;
opacity: 1;
}
}

@keyframes top-shape {
0% {
transform: translateX(0px) translateY(0px) rotate(0deg);
Expand All @@ -105,7 +105,6 @@
transform-origin: center center;
}
}

@keyframes bottom-shape {
0% {
transform: translateX(0px) translateY(0px) rotate(0deg);
Expand All @@ -119,13 +118,11 @@
transform: translateX(6px) translateY(6px) rotate(15deg);
transform-origin: center center;
}

100% {
transform: translateX(0px) translateY(0px) rotate(0deg);
transform-origin: center center;
}
}

@keyframes rotate-group {
0% {
transform: rotate(0deg);
Expand All @@ -139,21 +136,18 @@
}
}
</style>
<rect width="100" height="100" rx="20" fill="#E5F2FF" />
<!-- Using variables for consistent theming -->
<rect width="100" height="100" rx="20" fill="var(--bg-devtron-loader)" />
<g class="svg__loader_rotating-group">
<g class="svg__loader_group-top">
<path
class="svg__loader_shapepath-top"
<path class="svg__loader_shapepath-top"
d="M59.8584 21.95L38.6084 21.875C36.8042 21.8667 35.1292 22.8125 34.1792 24.3667L19.4625 48.5167C18.9899 49.293 18.7427 50.1855 18.7486 51.0943C18.7545 52.0031 19.0132 52.8924 19.4958 53.6625L30.9125 71.8792C31.2183 72.533 31.7308 73.0679 32.3709 73.4015C33.011 73.7351 33.7431 73.8488 34.4542 73.725C35.141 73.5973 35.7703 73.2572 36.2533 72.7525C36.7362 72.2478 37.0485 71.6042 37.1459 70.9125C37.2338 70.2725 37.143 69.6207 36.8834 69.0292L36.8334 68.9458C36.7375 68.7458 36.6167 68.5583 36.4875 68.3833L35.1958 66.3083L28.3458 55.3583C27.9912 54.8612 27.7883 54.2719 27.7617 53.6618C27.735 53.0517 27.8858 52.447 28.1958 51.9208C30.175 48.5958 34.5125 41.5042 35.4875 40.3458C35.854 40.0077 36.2862 39.7489 36.7572 39.5854C37.2282 39.4219 37.7279 39.3574 38.225 39.3958L43.6208 39.8125C43.8939 39.8472 44.1535 39.951 44.3752 40.1142C44.5969 40.2773 44.7733 40.4943 44.8876 40.7447C45.0019 40.9951 45.0504 41.2705 45.0286 41.5448C45.0067 41.8192 44.9151 42.0834 44.7625 42.3125L42.5125 45.7917C42.3947 45.9427 42.2915 46.1045 42.2042 46.275V46.2792C41.8913 46.8936 41.8029 47.5981 41.9542 48.2708C42.0838 48.8505 42.391 49.3753 42.833 49.7721C43.275 50.1689 43.8298 50.4179 44.4201 50.4844C45.0103 50.5509 45.6066 50.4316 46.1259 50.1431C46.6451 49.8546 47.0614 49.4113 47.3167 48.875L62.0625 26.225C63.2084 24.4667 62.0709 22.0625 60 21.9542C59.9528 21.9515 59.9056 21.9501 59.8584 21.95Z"
fill="#3989D9"
/>
fill="var(--fill-devtron-loader)" />
</g>
<g class="svg__loader_group-bottom">
<path
class="svg__loader_shapepath-bottom"
<path class="svg__loader_shapepath-bottom"
d="M65.4458 26.2375C66.1567 26.1108 66.8896 26.2217 67.5313 26.553C68.1729 26.8844 68.6876 27.4178 68.9958 28.0709L80.4875 46.2334C81.4833 47.7959 81.5041 49.7959 80.55 51.3792L65.9375 75.5917C65.4801 76.3555 64.8332 76.9882 64.0594 77.4284C63.2855 77.8686 62.4111 78.1014 61.5208 78.1042L40.2708 78.125C40.2236 78.1263 40.1764 78.1263 40.1291 78.125C38.0583 78.025 36.9125 75.625 38.0458 73.8625L52.6916 51.1459C52.9442 50.6078 53.3584 50.162 53.8765 49.8707C54.3946 49.5794 54.9907 49.4571 55.5816 49.5209C56.1725 49.5847 56.7288 49.8313 57.1728 50.2265C57.6168 50.6216 57.9264 51.1455 58.0583 51.725C58.2135 52.3963 58.1295 53.1007 57.8208 53.7167C57.7327 53.8889 57.628 54.0564 57.5083 54.2084L55.2791 57.6959C55.1264 57.9255 55.035 58.1904 55.0135 58.4654C54.9921 58.7403 55.0413 59.0162 55.1566 59.2667C55.2718 59.5173 55.4493 59.7342 55.672 59.8968C55.8947 60.0595 56.1554 60.1624 56.4291 60.1959L61.8291 60.5875C62.3261 60.6226 62.8249 60.5548 63.2944 60.3885C63.764 60.2222 64.1942 59.9609 64.5583 59.6209C65.1 58.975 66.6666 56.4959 68.2916 53.8417L69.2666 52.2459C70.2333 50.6542 71.1458 49.1209 71.8041 48.0125C72.1109 47.4853 72.2584 46.8805 72.2288 46.2712C72.1992 45.6619 71.9938 45.0743 71.6375 44.5792L71.6583 44.5667L64.7375 33.6584L63.4416 31.5875C63.3053 31.4122 63.1866 31.2238 63.0875 31.025L63.0375 30.95C62.7742 30.3581 62.6805 29.7046 62.7666 29.0625C62.8608 28.3703 63.1702 27.7251 63.6509 27.2182C64.1317 26.7113 64.7595 26.3682 65.4458 26.2375Z"
fill="#3989D9"
/>
fill="var(--fill-devtron-loader)" />
</g>
</g>
</svg>
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "dashboard",
"version": "1.5.0",
"version": "1.6.0",
"private": true,
"homepage": "/dashboard",
"dependencies": {
"@devtron-labs/devtron-fe-common-lib": "1.5.0",
"@devtron-labs/devtron-fe-common-lib": "1.6.0",
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@rjsf/core": "^5.13.3",
"@rjsf/utils": "^5.13.3",
Expand All @@ -30,7 +30,6 @@
"react-csv": "^2.2.2",
"react-dates": "^21.8.0",
"react-dom": "^17.0.2",
"react-draggable": "^4.4.5",
"react-ga4": "^1.4.1",
"react-gtm-module": "^2.0.11",
"react-mde": "^11.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ export default function App() {
<Suspense fallback={null}>
{validating ? (
<div className="full-height-width">
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80" />
<DevtronProgressing parentClasses="h-100 flex bg__primary" classes="icon-dim-80" />
</div>
) : (
<>
Expand Down
16 changes: 16 additions & 0 deletions src/Pages/App/Details/ExternalFlux/index.tsx
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
/*
* Copyright (c) 2024. Devtron Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

export { default as ExternalFluxAppDetailsRoute } from './ExternalFluxAppDetailsRoute'
16 changes: 16 additions & 0 deletions src/Pages/App/Details/ExternalFlux/service.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (c) 2024. Devtron Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { get, getUrlWithSearchParams } from '@devtron-labs/devtron-fe-common-lib'
import { Routes } from '../../../../config'

Expand Down
16 changes: 16 additions & 0 deletions src/Pages/App/Details/ExternalFlux/types.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (c) 2024. Devtron Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

export interface ExternalFluxAppDetailParams {
clusterId: string
appName: string
Expand Down
16 changes: 16 additions & 0 deletions src/Pages/App/Details/ExternalFlux/utils.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (c) 2024. Devtron Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { EXTERNAL_FLUX_APP_STATUS } from './types'

// In case of FluxCD Apps True means app is Ready and False denotes app is not ready
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (c) 2024. Devtron Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { BASE_CONFIGURATION_ENV_ID, EnvResourceType } from '@devtron-labs/devtron-fe-common-lib'

export const BASE_CONFIGURATIONS = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ export const AppConfig = ({ appName, resourceKind, filteredEnvIds }: AppConfigPr
<>
<div className={`app-compose ${getAdditionalParentClass()}`}>
<div
className={`app-compose__nav ${getAppComposeClasses()} flex column left top dc__overflow-scroll`}
className={`app-compose__nav ${getAppComposeClasses()} flex column left top dc__overflow-auto`}
>
<AppNavigation />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@

import React, { lazy, Suspense } from 'react'
import { useRouteMatch, useHistory, Route, Switch, Redirect, useLocation, generatePath } from 'react-router-dom'

import {
Progressing,
EnvResourceType,
BASE_CONFIGURATION_ENV_ID,
ApprovalConfigDataKindType,
getIsApprovalPolicyConfigured,
CMSecretComponentType,
} from '@devtron-labs/devtron-fe-common-lib'

import { ReactComponent as Next } from '@Icons/ic-arrow-forward.svg'
import { URLS } from '@Config/index'
import { ErrorBoundary, useAppContext } from '@Components/common'
import ExternalLinks from '@Components/externalLinks/ExternalLinks'
import { CMSecretComponentType } from '@Pages/Shared/ConfigMapSecret/types'
import { ConfigMapSecretWrapper } from '@Pages/Shared/ConfigMapSecret/ConfigMapSecret.wrapper'

import { NextButtonProps, STAGE_NAME } from '../AppConfig.types'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (c) 2024. Devtron Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import {
Button,
ButtonComponentType,
Expand Down
Loading

0 comments on commit 679dbba

Please sign in to comment.