Merge pull request #284 from devtron-labs/refactor/compare-manifest

feat: Deployment Template, ConfigMap, Secret UI Revamp

Author: RohitRaj011

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -15,10 +15,17 @@
  */
 
 import { useEffect, useState } from 'react'
+import { SelectPicker, SelectPickerVariantType } from '@Shared/Components'
 import { fetchChartTemplateVersions } from './Common.service'
-import { ChartVersionAndTypeSelectorProps, DeploymentChartVersionType } from './Types'
+import { ChartVersionAndTypeSelectorProps } from './Types'
 import { getFilteredChartVersions, showError } from './Helper'
-import { SelectPicker, SelectPickerVariantType } from '@Shared/Components'
+
+interface DeploymentChartVersionType {
+    chartRefId: number
+    chartVersion: string
+    chartType: string
+    type: number
+}
 
 // @TODO: Generalize this component to be used in CodeEditor as Chart selector toolbar
 // when the Code Editor is moved to the fe-common-lib

src/Assets/Icon/ic-warning-y5.svg

@@ -21,9 +21,9 @@ import ReactGA from 'react-ga4'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
 import { configureMonacoYaml } from 'monaco-yaml'
 
+import { ReactComponent as ICWarningY5 } from '@Icons/ic-warning-y5.svg'
 import { ReactComponent as Info } from '../../Assets/Icon/ic-info-filled.svg'
 import { ReactComponent as ErrorIcon } from '../../Assets/Icon/ic-error-exclamation.svg'
-import { ReactComponent as WarningIcon } from '../../Assets/Icon/ic-warning.svg'
 import './codeEditor.scss'
 import 'monaco-editor'
 
@@ -452,7 +452,7 @@ const ValidationError = () => {
 
 const Warning: React.FC<InformationBarProps> = (props) => (
     <div className={`code-editor__warning ${props.className || ''}`}>
-        <WarningIcon className="code-editor__information-info-icon" />
+        <ICWarningY5 className="code-editor__information-info-icon" />
         {props.text}
         {props.children}
     </div>
@@ -476,7 +476,7 @@ const Information: React.FC<InformationBarProps> = (props) => (
 
 const Clipboard = () => {
     const { state } = useCodeEditorContext()
-    return <ClipboardButton content={state.code} rootClassName="bcn-1" iconSize={20} />
+    return <ClipboardButton content={state.code} iconSize={16} />
 }
 
 const SplitPane = ({}) => {

src/Common/ChartVersionAndTypeSelector.tsx

@@ -105,18 +105,6 @@
     min-height: 300px;
 }
 
-.code-editor__warning {
-    font-size: 12px;
-    font-weight: 400;
-    line-height: 1.33;
-    letter-spacing: normal;
-    color: var(--Y700);
-    height: auto;
-    padding: 8px 16px;
-    border-bottom: 1px solid #d6dbdf;
-    background-color: var(--Y100);
-}
-
 .code-editor__information {
     font-size: 12px;
     font-weight: 400;

src/Common/CodeEditor/CodeEditor.tsx

@@ -24,6 +24,7 @@ export const DOCUMENTATION_HOME_PAGE = 'https://docs.devtron.ai'
 export const DOCUMENTATION_VERSION = '/v/v0.7'
 export const DISCORD_LINK = 'https://discord.devtron.ai/'
 export const DOCUMENTATION = {
+    APP_METRICS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/app-details/app-metrics`,
     APP_TAGS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/create-application#tags`,
     APP_OVERVIEW_TAGS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/overview#manage-tags`,
     BLOB_STORAGE: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/getting-started/install/installation-configuration#configuration-of-blob-storage`,
@@ -70,6 +71,7 @@ export const URLS = {
 export const ROUTES = {
     APP: 'app',
     APP_ARTIFACT_PROMOTE_MATERIAL: 'app/artifact/promotion-request/material',
+    APP_TEMPLATE_DATA: 'app/template/data',
     PROJECT_LIST_MIN: 'team/autocomplete',
     USER_CHECK_ROLE: 'user/check/roles',
     IMAGE_TAGGING: 'app/image-tagging',
@@ -507,6 +509,7 @@ export const API_STATUS_CODES = {
     PERMISSION_DENIED: 403,
     NOT_FOUND: 404,
     EXPECTATION_FAILED: 417,
+    LOCKED: 423,
 }
 
 export enum SERVER_MODE {

src/Common/CodeEditor/codeEditor.scss

@@ -642,7 +642,7 @@ export const powerSetOfSubstringsFromStart = (strings: string[], regex: RegExp)
         return _keys
     })
 
-export const convertJSONPointerToJSONPath = (pointer: string) => pointer.replace(/\//g, '.').replace(/\./, '$.')
+export const convertJSONPointerToJSONPath = (pointer: string) => pointer.replace(/\/([\*0-9]+)\//g, '[$1].').replace(/\//g, '.').replace(/\./, '$.')
 
 export const flatMapOfJSONPaths = (
     paths: string[],

src/Common/Constants.ts

@@ -771,6 +771,8 @@ export interface AppEnvironment {
     isProtected?: boolean
     pipelineId?: number
     latestCdWorkflowRunnerId?: number
+    commits?: string[]
+    ciArtifactId?: number
 }
 
 export interface Strategy {
@@ -901,13 +903,6 @@ export interface CiPipeline {
     pipelineType?: string
 }
 
-export interface DeploymentChartVersionType {
-    chartRefId: number
-    chartVersion: string
-    chartType: string
-    type: number
-}
-
 export interface ChartVersionAndTypeSelectorProps {
     setSelectedChartRefId: React.Dispatch<React.SetStateAction<number>>
 }