Merge pull request #2798 from devtron-labs/feat/external-flux

feat: external flux

Author: arunjaindev

.eslintignore

@@ -189,7 +189,6 @@ src/components/ciPipeline/ConfigureWebhook.tsx
 src/components/ciPipeline/ExternalCIPipeline.tsx
 src/components/ciPipeline/LinkedCIPipelineEdit.tsx
 src/components/ciPipeline/LinkedCIPipelineView.tsx
-src/components/ciPipeline/SourceMaterials.tsx
 src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx
 src/components/ciPipeline/Webhook/webhook.service.ts
 src/components/ciPipeline/Webhook/webhook.utils.ts
@@ -239,7 +238,6 @@ src/components/common/hooks/__tests__/FileReader.test.tsx
 src/components/common/icons/Icons.tsx
 src/components/common/lineChart/lineChart.tsx
 src/components/common/navigation/Navigation.tsx
-src/components/common/navigation/NavigationRoutes.tsx
 src/components/dockerRegistry/Docker.tsx
 src/components/dockerRegistry/ManageRegistry.tsx
 src/components/dockerRegistry/service.tsx

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         cache: 'yarn'
 
     - name: Install dependencies
-      run: yarn install --frozen-lockfile
+      run: yarn install --immutable
 
     - name: Check linting issues
       run: yarn lint

.nvmrc

@@ -1 +1 @@
-v20.11.0
+v22

.yarn/releases/yarn-4.9.2.cjs

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.9.2.cjs

.yarnrc.yml

@@ -1,12 +1,17 @@
-FROM node:20-alpine AS builder
-
-RUN apk add --no-cache git
+FROM node:22-alpine AS builder
 
 WORKDIR /app
+
+RUN corepack enable yarn && \
+    yarn set version 4.9.2
+
 COPY package.json .
 COPY yarn.lock .
+COPY .yarn/ .yarn/
+COPY .yarnrc.yml ./
 
-RUN yarn install --frozen-lockfile --network-timeout 600000
+RUN apk add --no-cache git
+RUN yarn install --immutable --network-timeout 600000
 
 COPY src/ src
 COPY nginx.conf .

Dockerfile

@@ -38,6 +38,8 @@
                     display: flex;
                     justify-content: center;
                     align-items: center;
+                    /* cannot use --bg-primary here, so using rgb */
+                    background: rgb(30, 31, 40);
                 "
             >
                 <svg width="80" height="80" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">

index.html

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.16.0-beta-1",
+        "@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-3",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -14,7 +14,6 @@
         "@sentry/tracing": "7.50.0",
         "@tippyjs/react": "4.2.6",
         "@typeform/embed-react": "2.20.0",
-        "@vitejs/plugin-react": "4.3.1",
         "command-line-parser": "^0.2.10",
         "compute-histogram": "^0.9.11",
         "dayjs": "^1.11.8",
@@ -39,9 +38,6 @@
         "rxjs": "^7.5.4",
         "sockjs-client": "1.6.1",
         "tippy.js": "^6.3.7",
-        "vite": "5.4.19",
-        "vite-plugin-require-transform": "1.0.21",
-        "vite-plugin-svgr": "^2.4.0",
         "xterm": "^4.19.0",
         "xterm-addon-fit": "^0.5.0",
         "xterm-addon-search": "^0.9.0",
@@ -87,6 +83,7 @@
         "@types/recompose": "^0.30.10",
         "@typescript-eslint/eslint-plugin": "8.3.0",
         "@typescript-eslint/parser": "8.3.0",
+        "@vitejs/plugin-react": "4.5.2",
         "env-cmd": "10.1.0",
         "eslint": "^8.57.1",
         "eslint-config-airbnb": "^19.0.4",
@@ -115,9 +112,11 @@
         "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": "6.3.5",
+        "vite-plugin-compression2": "2.0.1",
         "vite-plugin-pwa": "^0.21.1",
+        "vite-plugin-require-transform": "1.0.21",
+        "vite-plugin-svgr": "^2.4.0",
         "vite-tsconfig-paths": "5.0.1"
     },
     "jest": {
@@ -139,5 +138,6 @@
         "rollup": "^4.22.4",
         "path-to-regexp": "^1.9.0",
         "cross-spawn": "^7.0.5"
-    }
+    },
+    "packageManager": "[email protected]"
 }

package.json

@@ -170,7 +170,6 @@ const App = () => {
                     </Switch>
                     <div id="visible-modal" />
                     <div id="visible-modal-2" />
-                    <div id="animated-dialog-backdrop" />
                 </BreadcrumbStore>
             </ErrorBoundary>
         )
@@ -179,9 +178,7 @@ const App = () => {
         <div className={customThemeClassName}>
             <Suspense fallback={null}>
                 {validating ? (
-                    <div className="full-height-width">
-                        <DevtronProgressing parentClasses="h-100 flex bg__primary" classes="icon-dim-80" />
-                    </div>
+                    <DevtronProgressing parentClasses="full-height-width flex bg__primary" classes="icon-dim-80" />
                 ) : (
                     renderRoutesWithErrorBoundary()
                 )}

src/App.tsx

@@ -0,0 +1,41 @@
+import { DeploymentAppTypes } from '@devtron-labs/devtron-fe-common-lib'
+
+import { DeploymentAppRadioGroup } from '@Components/v2/values/chartValuesDiff/ChartValuesView.component'
+
+import { CDPipelineDeploymentAppTypeProps } from './types'
+
+export const CDPipelineDeploymentAppType = ({
+    isVirtualEnvironment,
+    allowedDeploymentTypes,
+    noGitOpsModuleInstalledAndConfigured,
+    isGitOpsInstalledButNotConfigured,
+    deploymentAppType,
+    rootClassName,
+    isDisabled,
+    handleChange,
+    isGitOpsRepoNotConfigured,
+    gitOpsRepoConfigInfoBar,
+}: CDPipelineDeploymentAppTypeProps) =>
+    !window._env_.HIDE_GITOPS_OR_HELM_OPTION &&
+    !isVirtualEnvironment &&
+    allowedDeploymentTypes?.length > 0 &&
+    // Want to show this when gitops module is installed, does not matter if it is configured or not
+    (!noGitOpsModuleInstalledAndConfigured || isGitOpsInstalledButNotConfigured) && (
+        <div className="mt-16">
+            {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+            <label className="form__label form__label--sentence">How do you want to deploy?</label>
+            <DeploymentAppRadioGroup
+                deploymentAppType={deploymentAppType ?? DeploymentAppTypes.HELM}
+                handleOnChange={handleChange}
+                allowedDeploymentTypes={allowedDeploymentTypes}
+                rootClassName={rootClassName}
+                isDisabled={isDisabled}
+                isFromCDPipeline
+                isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
+                gitOpsRepoConfigInfoBar={gitOpsRepoConfigInfoBar}
+                areGitopsCredentialsConfigured={!isGitOpsInstalledButNotConfigured}
+                // Want to show this when gitops module is installed, does not matter if it is configured or not
+                showGitOpsOption={!noGitOpsModuleInstalledAndConfigured || isGitOpsInstalledButNotConfigured}
+            />
+        </div>
+    )