Merge pull request #2673 from devtron-labs/rc-merge/v0.34.0

chore: merge rc-v0.34.0

Author: vivek-devtron

.eslintrc.js

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+const tsconfigPath = require('./tsconfig.json')
+
 module.exports = {
     parser: '@typescript-eslint/parser',
-    plugins: ['@typescript-eslint', 'react', 'prettier', 'import'],
+    plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort'],
     env: {
         browser: true,
         es2021: true,
@@ -112,6 +114,26 @@ module.exports = {
         'import/named': 'off',
         'no-use-before-define': 'off',
         '@typescript-eslint/no-use-before-define': 'error',
+        'simple-import-sort/imports': [
+            'error',
+            {
+                groups: [
+                    // Packages `react` related packages and external packages.
+                    ['^react', '^@?\\w'],
+                    // Devtron packages
+                    ['^@devtron-labs'],
+                    // Internal packages.
+                    [...Object.keys(tsconfigPath.compilerOptions.paths).map((alias) => alias.replace('/*', ''))],
+                    // Side effect imports.
+                    ['^\\u0000'],
+                    // Put same-folder imports, `..` and `.` last. Other relative imports.
+                    ['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$',],
+                    // Style imports.
+                    [ '^.+\\.?(css|scss)$'],
+                ],
+            },
+        ],
+        'simple-import-sort/exports': 'error',
     },
     overrides: [
         {

config.md

@@ -45,5 +45,9 @@
 | 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_EXTERNAL_FLUX_CD_ENABLE | false |  To enable flux cd option in app list page |
+| FEATURE_BULK_RESTART_WORKLOADS_FROM_RB | deployment,rollout,daemonset,statefulset | Enables the bulk operations in the resource browser for specific workload type. | 
+| FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE | false | If enabled user can pass the manual gitops repo |
+| SENTRY_RELEASE_VERSION |  | Sentry release Version |
 
 # DASHBOARD CONFIG SECRET

nginx.conf

@@ -19,6 +19,14 @@ http {
     sendfile        on;
     #tcp_nopush     on;
     keepalive_timeout  65;
+
     gzip  on;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_static on;
+
     include /etc/nginx/conf.d/*.conf;
 }

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.11.2",
+        "@devtron-labs/devtron-fe-common-lib": "1.12.0",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -42,7 +42,7 @@
         "rxjs": "^7.5.4",
         "sockjs-client": "1.6.1",
         "tippy.js": "^6.3.7",
-        "vite": "5.4.14",
+        "vite": "5.4.17",
         "vite-plugin-require-transform": "1.0.21",
         "vite-plugin-svgr": "^2.4.0",
         "xterm": "^4.19.0",
@@ -111,6 +111,7 @@
         "eslint-plugin-prettier": "^5.1.2",
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-react-hooks": "^4.6.0",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
         "eslint-plugin-storybook": "^0.8.0",
         "husky": "^7.0.4",
         "jest-extended": "^2.0.0",
@@ -129,6 +130,7 @@
         "ts-jest": "29.2.5",
         "ts-node": "10.9.2",
         "typescript": "5.5.4",
+        "vite-plugin-compression2": "^1.3.3",
         "vite-plugin-image-optimizer": "^1.1.8",
         "vite-plugin-pwa": "^0.21.1",
         "vite-tsconfig-paths": "5.0.1"

src/Pages/App/CreateAppModal/AppToCloneSelector.tsx

@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
+import { useState } from 'react'
+
 import {
     AppSelectorNoOptionsMessage as appSelectorNoOptionsMessage,
     ComponentSizeType,
     InfoBlock,
     SelectPicker,
     SelectPickerProps,
 } from '@devtron-labs/devtron-fe-common-lib'
+
 import { appListOptions } from '@Components/AppSelector/AppSelectorUtil'
-import { useState } from 'react'
+
 import { AppToCloneSelectorProps } from './types'
 
 const AppToCloneSelector = ({ isJobView, error, handleCloneIdChange }: AppToCloneSelectorProps) => {

src/Pages/App/CreateAppModal/ApplicationInfoForm.tsx

@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
+import { ChangeEvent } from 'react'
+
 import { CustomInput, TagsContainer, Textarea } from '@devtron-labs/devtron-fe-common-lib'
-import { ReactComponent as ICDevtronApp } from '@Icons/ic-devtron-app.svg'
+
 import { ReactComponent as ICCaretLeftSmall } from '@Icons/ic-caret-left-small.svg'
-import { ChangeEvent } from 'react'
+import { ReactComponent as ICDevtronApp } from '@Icons/ic-devtron-app.svg'
 import { importComponentFromFELibrary } from '@Components/common'
 import { APP_TYPE } from '@Config/constants'
+
+import AppToCloneSelector from './AppToCloneSelector'
 import ProjectSelector from './ProjectSelector'
 import {
     ApplicationInfoFormProps,
@@ -29,7 +33,6 @@ import {
     HandleFormStateChangeParamsType,
     ProjectSelectorProps,
 } from './types'
-import AppToCloneSelector from './AppToCloneSelector'
 
 const MandatoryTagsContainer = importComponentFromFELibrary('MandatoryTagsContainer', null, 'function')
 

src/Pages/App/CreateAppModal/CreateAppModal.component.tsx

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+import { useEffect, useMemo, useState } from 'react'
+import { useHistory } from 'react-router-dom'
+
 import {
     Button,
     ButtonStyleType,
@@ -28,17 +31,21 @@ import {
     validateTagKeyValue,
     validateTagValue,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { useEffect, useMemo, useState } from 'react'
-import { getHostURLConfiguration } from '@Services/service'
+
+import { ReactComponent as ICAppTemplate } from '@Icons/ic-app-template.svg'
+import { ReactComponent as ICBack } from '@Icons/ic-caret-left-small.svg'
+import { importComponentFromFELibrary } from '@Components/common'
 import { saveHostURLConfiguration } from '@Components/hostURL/hosturl.service'
 import { createJob } from '@Components/Jobs/Service'
-import { APP_COMPOSE_STAGE, getAppComposeURL, URLS } from '@Config/routes'
-import { useHistory } from 'react-router-dom'
 import { REQUIRED_FIELDS_MISSING } from '@Config/constants'
-import { importComponentFromFELibrary } from '@Components/common'
-import { ReactComponent as ICBack } from '@Icons/ic-caret-left-small.svg'
-import { ReactComponent as ICAppTemplate } from '@Icons/ic-app-template.svg'
+import { APP_COMPOSE_STAGE, getAppComposeURL, URLS } from '@Config/routes'
+import { getHostURLConfiguration } from '@Services/service'
 
+import ApplicationInfoForm from './ApplicationInfoForm'
+import { createAppInitialFormErrorState, createAppInitialFormState } from './constants'
+import HeaderSection from './HeaderSection'
+import { createApp } from './service'
+import Sidebar from './Sidebar'
 import {
     ApplicationInfoFormProps,
     CreateAppFormErrorStateType,
@@ -47,13 +54,8 @@ import {
     CreateAppModalProps,
     CreationMethodType,
 } from './types'
-import { createAppInitialFormErrorState, createAppInitialFormState } from './constants'
-import { getCreateMethodConfig, validateAppName, validateCloneApp, validateProject } from './utils'
-import { createApp } from './service'
-import ApplicationInfoForm from './ApplicationInfoForm'
-import HeaderSection from './HeaderSection'
-import Sidebar from './Sidebar'
 import UpdateTemplateConfig from './UpdateTemplateConfig'
+import { getCreateMethodConfig, validateAppName, validateCloneApp, validateProject } from './utils'
 
 import './styles.scss'
 

src/Pages/App/CreateAppModal/HeaderSection.tsx

@@ -15,7 +15,9 @@
  */
 
 import { Button, ButtonStyleType, ButtonVariantType, ComponentSizeType } from '@devtron-labs/devtron-fe-common-lib'
+
 import { ReactComponent as ICClose } from '@Icons/ic-close.svg'
+
 import { HeaderSectionProps } from './types'
 
 const HeaderSection = ({ isJobView, handleClose, isCloseDisabled }: HeaderSectionProps) => (

src/Pages/App/CreateAppModal/ProjectSelector.tsx

@@ -21,7 +21,9 @@ import {
     SelectPickerProps,
     useGetResourceKindsOptions,
 } from '@devtron-labs/devtron-fe-common-lib'
+
 import { ReactComponent as ICFolderColor } from '@Icons/ic-folder-color.svg'
+
 import { CreateAppFormStateType, ProjectSelectorProps } from './types'
 
 const ProjectSelector = ({ selectedProjectId, handleProjectIdChange, error }: ProjectSelectorProps) => {

src/Pages/App/CreateAppModal/Sidebar.tsx

@@ -15,7 +15,9 @@
  */
 
 import { ModalSidebarPanel } from '@devtron-labs/devtron-fe-common-lib'
+
 import { DOCUMENTATION } from '@Config/constants'
+
 import { CreationMethodType, SidebarProps } from './types'
 
 const Sidebar = ({

src/Pages/App/CreateAppModal/UpdateTemplateConfig.tsx

@@ -16,14 +16,14 @@
 
 import { noop } from '@devtron-labs/devtron-fe-common-lib'
 
-import MaterialList from '@Components/material/MaterialList'
 import CIConfig from '@Components/ciConfig/CIConfig'
 import { CIConfigProps } from '@Components/ciConfig/types'
 import { DockerConfigOverrideKeys } from '@Components/ciPipeline/types'
 import { MaterialListProps } from '@Components/material/material.types'
+import MaterialList from '@Components/material/MaterialList'
 
-import { Workflow, WorkflowProps } from './Workflow'
 import { CreateAppFormStateActionType, UpdateTemplateConfigProps } from './types'
+import { Workflow, WorkflowProps } from './Workflow'
 
 const parentState: CIConfigProps['parentState'] = {
     loadingState: null,

src/Pages/App/CreateAppModal/Workflow/Workflow.tsx

@@ -15,6 +15,7 @@
  */
 
 import { useEffect, useState } from 'react'
+
 import {
     APIResponseHandler,
     GenericEmptyState,
@@ -29,6 +30,7 @@ import {
 import { getCreateWorkflows } from '@Components/app/details/triggerView/workflow.service'
 import { getEnvironmentListMin } from '@Services/service'
 
+import { HandleNodeUpdateActionProps, NodeUpdateActionType, WorkflowProps } from './types'
 import {
     getCDNodeIcon,
     getPipelineIdFromNodeId,
@@ -37,7 +39,6 @@ import {
     getWorkflowGraphVisualizerNodes,
     getWorkflowLinkedCDNodes,
 } from './utils'
-import { HandleNodeUpdateActionProps, NodeUpdateActionType, WorkflowProps } from './types'
 
 export const Workflow = ({ templateId, onChange, workflowIdToErrorMessageMap }: WorkflowProps) => {
     // STATES

src/Pages/App/CreateAppModal/Workflow/index.ts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export * from './Workflow'
 export type { WorkflowProps } from './types'
+export * from './Workflow'

src/Pages/App/CreateAppModal/Workflow/utils.tsx

@@ -26,15 +26,15 @@ import {
     WorkflowType,
 } from '@devtron-labs/devtron-fe-common-lib'
 
-import { ReactComponent as ICCi } from '@Icons/ic-CI.svg'
 import { ReactComponent as ICCD } from '@Icons/ic-CD.svg'
+import { ReactComponent as ICCi } from '@Icons/ic-CI.svg'
 import { ReactComponent as ICCIWebhook } from '@Icons/ic-CIWebhook.svg'
-import { ReactComponent as ICNodeBuildLinked } from '@Icons/ic-node-build-linked.svg'
-import { ReactComponent as ICWarning } from '@Icons/ic-warning.svg'
+import { ReactComponent as ICError } from '@Icons/ic-error.svg'
 import { ReactComponent as ICJobNode } from '@Icons/ic-job-node.svg'
 import { ReactComponent as ICLinkedCD } from '@Icons/ic-linked-cd.svg'
+import { ReactComponent as ICNodeBuildLinked } from '@Icons/ic-node-build-linked.svg'
 import { ReactComponent as ICPaperRocket } from '@Icons/ic-paper-rocket.svg'
-import { ReactComponent as ICError } from '@Icons/ic-error.svg'
+import { ReactComponent as ICWarning } from '@Icons/ic-warning.svg'
 import { createClusterEnvGroup } from '@Components/common'
 
 import {

src/Pages/App/CreateAppModal/constants.ts

@@ -15,6 +15,7 @@
  */
 
 import { getEmptyTagTableRow } from '@devtron-labs/devtron-fe-common-lib'
+
 import { CreateAppFormErrorStateType, CreateAppFormStateType } from './types'
 
 export const createAppInitialFormState: CreateAppFormStateType = {

src/Pages/App/CreateAppModal/service.ts

@@ -15,6 +15,7 @@
  */
 
 import { post } from '@devtron-labs/devtron-fe-common-lib'
+
 import { Routes } from '@Config/constants'
 
 export const createApp = (request) => post(Routes.APP, request)

src/Pages/App/CreateAppModal/types.ts

@@ -14,16 +14,19 @@
  * limitations under the License.
  */
 
+import { SyntheticEvent } from 'react'
+
 import {
     ButtonProps,
     DynamicDataTableCellErrorType,
     DynamicDataTableRowType,
     SelectPickerProps,
     TagsTableColumnsType,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { SyntheticEvent } from 'react'
-import { GitMaterialType } from '@Components/material/material.types'
+
 import { CIConfigProps } from '@Components/ciConfig/types'
+import { GitMaterialType } from '@Components/material/material.types'
+
 import { getCreateMethodConfig } from './utils'
 
 interface CreateAppWorkflowConfigType {

src/Pages/App/CreateAppModal/utils.tsx

@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import { MAX_LENGTH_30 } from '@Config/constantMessaging'
-import { PATTERNS } from '@Config/constants'
 import { Icon, IconsProps, SelectPickerOptionType, ValidationResponseType } from '@devtron-labs/devtron-fe-common-lib'
+
 import { importComponentFromFELibrary } from '@Components/common'
+import { MAX_LENGTH_30 } from '@Config/constantMessaging'
+import { PATTERNS } from '@Config/constants'
+
 import { CreateAppFormStateType, CreateAppModalProps, CreationMethodType } from './types'
 
 const isFELibAvailable: boolean = importComponentFromFELibrary('isFELibAvailable', null, 'function')

src/Pages/App/Details/ExternalFlux/ExternalFluxAppDetails.tsx

@@ -14,25 +14,27 @@
  * limitations under the License.
  */
 
+import { useEffect, useState } from 'react'
+import { useParams } from 'react-router-dom'
+
 import {
     AppType,
+    DeploymentAppTypes,
+    ERROR_STATUS_CODE,
     ErrorScreenManager,
     IndexStore,
-    useMainContext,
-    DeploymentAppTypes,
-    showError,
-    ResponseType,
     noop,
-    ERROR_STATUS_CODE,
+    ResponseType,
+    showError,
+    useMainContext,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { useEffect, useState } from 'react'
-import { useParams } from 'react-router-dom'
-import { ExternalFluxAppDetailParams } from './types'
-import { getExternalFluxCDAppDetails } from './service'
+
 import { FluxCDTemplateType } from '../../../../components/app/list-new/AppListType'
 import AppDetailsComponent from '../../../../components/v2/appDetails/AppDetails.component'
-import { getAppStatus } from './utils'
 import { AppDetails } from '../../../../components/v2/appDetails/appDetails.type'
+import { getExternalFluxCDAppDetails } from './service'
+import { ExternalFluxAppDetailParams } from './types'
+import { getAppStatus } from './utils'
 
 let initTimer = null