Merge pull request #2592 from devtron-labs/release-candidate-v0.32.0

release: Release candidate v0.32.0

Author: eshankvaish

.env

@@ -51,7 +51,6 @@ FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE=false
 HIDE_NETWORK_STATUS_INTERFACE=true
 SYSTEM_CONTROLLER_LISTING_TIMEOUT=300000
 FEATURE_IMAGE_PROMOTION_ENABLE=false
-FEATURE_CD_MANDATORY_PLUGINS_ENABLE=true
 FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS=false
 FEATURE_CONFIG_DRIFT_ENABLE=false
 FEATURE_PROMO_EMBEDDED_BUTTON_TEXT=
@@ -64,7 +63,7 @@ FEATURE_DEFAULT_MERGE_STRATEGY=
 FEATURE_CLUSTER_MAP_ENABLE=true
 FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
+FEATURE_APPLICATION_TEMPLATES_ENABLE=true
 FEATURE_CODE_MIRROR_ENABLE=false
 FEATURE_EXPERIMENTAL_THEMING_ENABLE=true
-FEATURE_EXPERIMENTAL_MODERN_LAYOUT_ENABLE=false
 FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false

.eslintignore

@@ -8,8 +8,6 @@ vite.config.mts
 # The following files have eslint errors/warnings
 src/App.tsx
 src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
-src/components/AppSelector/AppSelector.tsx
-src/components/AppSelector/AppSelectorUtil.tsx
 src/components/AppSelector/ChartSelector.tsx
 src/components/ApplicationGroup/AppGroup.service.ts
 src/components/ApplicationGroup/AppGroup.types.ts
@@ -33,11 +31,7 @@ src/components/ApplicationGroup/Details/EnvironmentOverview/HibernateStatusRow.t
 src/components/ApplicationGroup/Details/EnvironmentOverview/__test__/EnvironmentOverview.test.tsx
 src/components/ApplicationGroup/Details/TriggerView/BulkCDTrigger.tsx
 src/components/ApplicationGroup/Details/TriggerView/BulkCITrigger.tsx
-src/components/ApplicationGroup/Details/TriggerView/BulkSourceChange.tsx
 src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx
-src/components/ApplicationGroup/Details/TriggerView/SourceUpdateResponseModal.tsx
-src/components/ApplicationGroup/Details/TriggerView/TriggerModalTableRow.tsx
-src/components/ApplicationGroup/Details/TriggerView/TriggerResponseModal.tsx
 src/components/ApplicationGroup/SearchBar.tsx
 src/components/CIPipelineN/AdvancedConfigOptions.tsx
 src/components/CIPipelineN/Build.tsx
@@ -93,7 +87,6 @@ src/components/app/create/validationRules.ts
 src/components/app/details/AboutAppInfoModal.tsx
 src/components/app/details/AboutTagEditModal.tsx
 src/components/app/details/AppHeader.tsx
-src/components/app/details/appDetails/AppDetails.tsx
 src/components/app/details/appDetails/AppMetrics.tsx
 src/components/app/details/appDetails/AppStatusCard.tsx
 src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx
@@ -170,7 +163,6 @@ src/components/charts/charts.util.tsx
 src/components/charts/dialogs/ValuesYamlConfirmDialog.tsx
 src/components/charts/discoverChartDetail/About.tsx
 src/components/charts/discoverChartDetail/ChartDeploymentList.tsx
-src/components/charts/discoverChartDetail/ChartVersionSelectorModal.tsx
 src/components/charts/discoverChartDetail/DiscoverChartDetails.tsx
 src/components/charts/list/ChartGroup.tsx
 src/components/charts/list/ChartListPopUp.tsx
@@ -336,7 +328,6 @@ src/components/security/security.service.ts
 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/ReleaseStatusEmptyState.tsx
 src/components/v2/appDetails/SyncError.component.tsx
 src/components/v2/appDetails/__tests__/index.store.test.ts
@@ -345,16 +336,8 @@ 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/nodeDetail/EphemeralContainerDrawer.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/CustomLogsModal/CustomLogsModal.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Events.component.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/EventsTable.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/LogViewer.component.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Logs.component.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Manifest.component.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Summary.component.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Terminal.component.tsx
-src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/TerminalWrapper.component.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/__tests__/Terminal.component.test.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/__tests__/TerminalWrapper.test.tsx
@@ -408,7 +391,6 @@ src/components/workflowEditor/EmptyWorkflow.tsx
 src/components/workflowEditor/NoGitOpsConfiguredWarning.tsx
 src/components/workflowEditor/NoGitOpsRepoConfiguredWarning.tsx
 src/components/workflowEditor/PipelineSelect.tsx
-src/components/workflowEditor/ToggleCDSelectButton.tsx
 src/components/workflowEditor/Workflow.tsx
 src/components/workflowEditor/nodes/CDNode.tsx
 src/components/workflowEditor/nodes/CINode.tsx

package.json

@@ -1,10 +1,10 @@
 {
     "name": "dashboard",
-    "version": "1.9.0",
+    "version": "1.10.0",
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.9.0-patch-4",
+        "@devtron-labs/devtron-fe-common-lib": "1.10.0",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/App.tsx

@@ -159,10 +159,6 @@ export default function App() {
     }
 
     useEffect(() => {
-        if (window._env_.FEATURE_EXPERIMENTAL_MODERN_LAYOUT_ENABLE) {
-            document.body.classList.add('modern-layout')
-        }
-
         if (typeof Storage !== 'undefined') {
             // TODO (Arun): Remove in next packet
             localStorage.removeItem('undefined')
@@ -333,7 +329,7 @@ export default function App() {
                                 <Reload />
                             </div>
                             ) : (
-                            <ErrorBoundary shouldAddFullScreenBg={window._env_.FEATURE_EXPERIMENTAL_MODERN_LAYOUT_ENABLE}>
+                            <ErrorBoundary>
                                 <BreadcrumbStore>
                                     <Switch>
                                         {isDirectApprovalNotification && GenericDirectApprovalModal && (
@@ -350,7 +346,6 @@ export default function App() {
                                             to={window._env_.K8S_CLIENT ? '/' : `${URLS.LOGIN_SSO}${location.search}`}
                                         />
                                     </Switch>
-                                    <div id="full-screen-modal" />
                                     <div id="visible-modal" />
                                     <div id="visible-modal-2" />
                                     <div id="animated-dialog-backdrop" />

src/Pages/App/CreateAppModal/AppToCloneSelector.tsx

@@ -0,0 +1,77 @@
+/*
+ * 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 {
+    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) => {
+    const [inputValue, setInputValue] = useState('')
+    const [areOptionsLoading, setAreOptionsLoading] = useState(false)
+    const [options, setOptions] = useState([])
+
+    const onInputChange: SelectPickerProps['onInputChange'] = async (val) => {
+        setInputValue(val)
+        setAreOptionsLoading(true)
+        const fetchedOptions = await appListOptions(val, isJobView)
+        setAreOptionsLoading(false)
+        setOptions(fetchedOptions)
+    }
+
+    const onChange = (selectedClonedApp) => {
+        handleCloneIdChange(selectedClonedApp.value)
+    }
+
+    const noOptionsMessage: SelectPickerProps['noOptionsMessage'] = () =>
+        appSelectorNoOptionsMessage({
+            inputValue,
+        })
+
+    return (
+        <>
+            <SelectPicker
+                label={`Select an ${isJobView ? 'job' : 'app'} to clone`}
+                inputId={`${isJobView ? 'job' : 'app'}-name-for-clone`}
+                options={options}
+                onChange={onChange}
+                placeholder={`Select ${isJobView ? 'job' : 'app'}`}
+                inputValue={inputValue}
+                onInputChange={onInputChange}
+                isLoading={areOptionsLoading}
+                noOptionsMessage={noOptionsMessage}
+                error={error}
+                size={ComponentSizeType.large}
+            />
+            <InfoBlock
+                heading="Important:"
+                description={
+                    isJobView
+                        ? 'Do not forget to modify git repositories and corresponding branches to be used for each Job Pipeline if required.'
+                        : 'Do not forget to modify git repositories, corresponding branches and container registries to be used for each CI Pipeline if required.'
+                }
+            />
+        </>
+    )
+}
+
+export default AppToCloneSelector

src/Pages/App/CreateAppModal/ApplicationInfoForm.tsx

@@ -0,0 +1,158 @@
+/*
+ * 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 { 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 { importComponentFromFELibrary } from '@Components/common'
+import { APP_TYPE } from '@Config/constants'
+import ProjectSelector from './ProjectSelector'
+import {
+    ApplicationInfoFormProps,
+    CreateAppFormStateActionType,
+    CreateAppFormStateType,
+    CreationMethodType,
+    HandleFormStateChangeParamsType,
+    ProjectSelectorProps,
+} from './types'
+import AppToCloneSelector from './AppToCloneSelector'
+
+const MandatoryTagsContainer = importComponentFromFELibrary('MandatoryTagsContainer', null, 'function')
+
+const ApplicationInfoForm = ({
+    formState,
+    handleFormStateChange,
+    isJobView,
+    formErrorState,
+    handleTagErrorChange,
+    selectedCreationMethod,
+    isTagsAccordionExpanded,
+    toggleIsTagsAccordionExpanded,
+}: ApplicationInfoFormProps) => {
+    const handleInputChange =
+        (
+            action: Extract<
+                HandleFormStateChangeParamsType['action'],
+                CreateAppFormStateActionType.updateName | CreateAppFormStateActionType.updateDescription
+            >,
+        ) =>
+        (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+            handleFormStateChange({ action, value: event.target.value })
+        }
+
+    const handleProjectIdChange: ProjectSelectorProps['handleProjectIdChange'] = (projectId) => {
+        handleFormStateChange({
+            action: CreateAppFormStateActionType.updateProjectId,
+            value: projectId,
+        })
+    }
+
+    const handleTagsUpdate = (tags: CreateAppFormStateType['tags']) => {
+        handleFormStateChange({
+            action: CreateAppFormStateActionType.updateTags,
+            value: tags,
+        })
+    }
+
+    const handleCloneIdChange = (cloneId) => {
+        handleFormStateChange({
+            action: CreateAppFormStateActionType.updateCloneAppId,
+            value: cloneId,
+        })
+    }
+
+    return (
+        // key is required for ensuring autoFocus on name on creation method change
+        <div className="flexbox-col dc__gap-16 p-20 br-8 border__secondary bg__primary" key={selectedCreationMethod}>
+            <ICDevtronApp className="icon-dim-48 dc__no-shrink" />
+            <div className="flexbox dc__gap-8">
+                <ProjectSelector
+                    selectedProjectId={formState.projectId}
+                    handleProjectIdChange={handleProjectIdChange}
+                    error={formErrorState.projectId}
+                />
+                <span className="pt-26 fs-20 lh-36 cn-7 dc__no-shrink">/</span>
+                <CustomInput
+                    label={isJobView ? 'Job name' : 'Application name'}
+                    required
+                    name="name"
+                    onChange={handleInputChange(CreateAppFormStateActionType.updateName)}
+                    value={formState.name}
+                    placeholder="Enter name"
+                    error={formErrorState.name}
+                    helperText={
+                        !isJobView && 'Apps are NOT env specific and can be used to deploy to multiple environments.'
+                    }
+                    fullWidth
+                    autoFocus
+                />
+            </div>
+            <Textarea
+                label="Description"
+                name="description"
+                value={formState.description}
+                onChange={handleInputChange(CreateAppFormStateActionType.updateDescription)}
+                placeholder={isJobView ? 'Describe this job' : 'Write a description for this application'}
+                fullWidth
+                error={formErrorState.description}
+            />
+            <div className="flexbox-col dc__gap-16">
+                <button
+                    className="dc__transparent p-0 flex left dc__gap-8 dc__w-fit-content"
+                    type="button"
+                    onClick={toggleIsTagsAccordionExpanded}
+                >
+                    <ICCaretLeftSmall
+                        className={`scn-7 dc__no-shrink dc__transition--transform ${isTagsAccordionExpanded ? 'dc__flip-270' : 'dc__flip-180'}`}
+                    />
+                    <span className="fs-13 fw-6 lh-20 cn-9">Add tags to {isJobView ? 'job' : 'application'}</span>
+                </button>
+                <div className={!isTagsAccordionExpanded ? 'dc__hide-section' : ''}>
+                    {MandatoryTagsContainer ? (
+                        <MandatoryTagsContainer
+                            isCreateApp
+                            appType={isJobView ? APP_TYPE.JOB : APP_TYPE.DEVTRON_APPS}
+                            projectId={formState.projectId}
+                            tags={formState.tags}
+                            setTags={handleTagsUpdate}
+                            tagsError={formErrorState.tags}
+                            setTagErrors={handleTagErrorChange}
+                        />
+                    ) : (
+                        <TagsContainer
+                            appType={isJobView ? APP_TYPE.JOB : APP_TYPE.DEVTRON_APPS}
+                            isCreateApp
+                            rows={formState.tags}
+                            setRows={handleTagsUpdate}
+                            tagsError={formErrorState.tags}
+                            setTagErrors={handleTagErrorChange}
+                        />
+                    )}
+                </div>
+            </div>
+            {selectedCreationMethod === CreationMethodType.clone && (
+                <AppToCloneSelector
+                    error={formErrorState.cloneAppId}
+                    isJobView={isJobView}
+                    handleCloneIdChange={handleCloneIdChange}
+                />
+            )}
+        </div>
+    )
+}
+
+export default ApplicationInfoForm