Merge branch 'develop' into feat/stack-manager-misc

Author: arunjaindev

.eslintignore

@@ -372,7 +372,6 @@ src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
 src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
 src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
 src/components/v2/values/common/chartValues.api.ts
-src/components/workflowEditor/CDSuccessModal.tsx
 src/components/workflowEditor/CreateWorkflow.tsx
 src/components/workflowEditor/DeprecatedWarningModal.tsx
 src/components/workflowEditor/EmptyWorkflow.tsx

Dockerfile

@@ -10,6 +10,7 @@ RUN yarn install --frozen-lockfile --network-timeout 600000
 COPY . .
 
 RUN echo `git rev-parse --short HEAD` > health.html && \
+    echo "" >> .env && \
     echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env && \
     yarn build
 

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.14.1-pre-5",
+        "@devtron-labs/devtron-fe-common-lib": "1.14.1-pre-6",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/License/ActivateLicense.tsx

@@ -46,7 +46,7 @@ const ActivateLicense = () => {
             return
         }
 
-        if (licenseData.licenseStatusError.code === LicensingErrorCodes.LicKeyNotFound) {
+        if (licenseData?.licenseStatusError.code === LicensingErrorCodes.LicKeyNotFound) {
             setShowActivateDialog(true)
         }
     }, [isLoading, licenseData])

src/components/CIPipelineN/VariableDataTable/constants.ts

@@ -119,6 +119,7 @@ export const VARIABLE_DATA_TABLE_CELL_ERROR_MSGS = {
     VARIABLE_VALUE_REQUIRED: 'Variable value is required',
     VARIABLE_VALUE_NOT_A_NUMBER: 'Variable value is not a number',
     VARIABLE_VALUE_NOT_A_BOOLEAN: 'Variable value is not a boolean',
+    MAX_LENGTH_255: 'Max 255 characters allowed',
 }
 
 export const VARIABLE_DATA_TABLE_CELL_BOOL_VALUES = ['True', 'False', 'true', 'false']

src/components/CIPipelineN/VariableDataTable/validations.ts

@@ -112,6 +112,12 @@ export const validateInputOutputVariableCell = ({
                 isValid: false,
             }
         }
+        if (name.length > 255) {
+            return {
+                errorMessages: [VARIABLE_DATA_TABLE_CELL_ERROR_MSGS.MAX_LENGTH_255],
+                isValid: false,
+            }
+        }
         if ((keysFrequencyMap[name] ?? 0) > 1) {
             return {
                 errorMessages: [VARIABLE_DATA_TABLE_CELL_ERROR_MSGS.UNIQUE_VARIABLE_NAME],
@@ -149,6 +155,14 @@ export const validateInputOutputVariableCell = ({
         }
     }
 
+    // test for max length if variable is string
+    if (key === 'val' && format === VariableTypeFormat.STRING && variableValue && !!value && value.length > 255) {
+        return {
+            errorMessages: [VARIABLE_DATA_TABLE_CELL_ERROR_MSGS.MAX_LENGTH_255],
+            isValid: false,
+        }
+    }
+
     return { errorMessages: [], isValid: true }
 }
 

src/components/app/details/triggerView/cdMaterial.tsx

@@ -102,7 +102,6 @@ import {
     RuntimeParamsErrorState,
 } from './types'
 import close from '../../../../assets/icons/ic-close.svg'
-import { ReactComponent as Check } from '../../../../assets/icons/ic-check-circle.svg'
 import { ReactComponent as DeployIcon } from '../../../../assets/icons/ic-nav-rocket.svg'
 import { ReactComponent as BackIcon } from '../../../../assets/icons/ic-arrow-backward.svg'
 import { ReactComponent as InfoOutline } from '../../../../assets/icons/ic-info-outline.svg'

src/components/cdPipeline/CDPipeline.tsx

@@ -1418,6 +1418,8 @@ export default function CDPipeline({
             return ''
         }
 
+        const buttonDisableText = getButtonDisabledMessage()
+
         return (
             <div
                 className={`modal__body modal__body__ci_new_ui br-0 modal__body--p-0 ${
@@ -1476,15 +1478,17 @@ export default function CDPipeline({
                         {formData && (
                             <>
                                 {renderSecondaryButton()}
-                                <ButtonWithLoader
-                                    rootClassName="cta cta--workflow"
+                                <Button
                                     dataTestId="build-pipeline-button"
+                                    text={text}
                                     onClick={savePipeline}
                                     isLoading={loadingData}
-                                    disabled={!!getButtonDisabledMessage()}
-                                >
-                                    {text}
-                                </ButtonWithLoader>
+                                    disabled={!!buttonDisableText}
+                                    showTooltip={!!buttonDisableText}
+                                    tooltipProps={{
+                                        content: buttonDisableText,
+                                    }}
+                                />
                             </>
                         )}
                     </div>

src/components/dockerRegistry/Docker.tsx

@@ -1975,6 +1975,7 @@ const DockerForm = ({
                             startIcon={<Trash />}
                             dataTestId="delete-container-registry"
                             onClick={showConfirmationModal}
+                            disabled={loading}
                         />
                     )}
                     <div className="flex right w-100 dc__gap-12">
@@ -1984,10 +1985,11 @@ const DockerForm = ({
                             text="Cancel"
                             variant={ButtonVariantType.secondary}
                             size={ComponentSizeType.medium}
+                            disabled={loading}
                         />
                         <Button
                             dataTestId="container-registry-save-button"
-                            disabled={loading}
+                            isLoading={loading}
                             text={id ? 'Update' : 'Save'}
                             size={ComponentSizeType.medium}
                             buttonProps={{

src/components/v2/appDetails/NodeDetailComponentWrapper.tsx

@@ -63,7 +63,16 @@ const NodeDetailComponentWrapper = ({
             .catch(noop)
     }, [podName, nodeType, tabId])
 
-    return <NodeDetailComponent key={tabId} {...nodeDetailComponentProps} updateTabUrl={handleUpdateTabUrl} />
+    return (
+        <NodeDetailComponent
+            key={tabId}
+            {...nodeDetailComponentProps}
+            isResourceBrowserView={false}
+            isDynamicTabsStuck={nodeDetailComponentProps.isDynamicTabsStuck}
+            updateTabUrl={handleUpdateTabUrl}
+            handleStickDynamicTabsToTop={nodeDetailComponentProps.handleStickDynamicTabsToTop}
+        />
+    )
 }
 
 export default NodeDetailComponentWrapper