Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/scan-cve-listing

Author: arunjaindev

.eslintignore

@@ -262,7 +262,6 @@ src/components/notifications/notifications.util.tsx
 src/components/onboardingGuide/GuideCommonHeader.tsx
 src/components/onboardingGuide/OnboardingGuide.tsx
 src/components/onboardingGuide/onboarding.utils.ts
-src/components/project/Project.tsx
 src/components/project/ProjectList.tsx
 src/components/scopedVariables/Descriptor.tsx
 src/components/scopedVariables/DescriptorSearchBar.tsx

package.json

@@ -1,10 +1,10 @@
 {
  "name": "dashboard",
- "version": "1.14.2",
+ "version": "1.21.0",
  "private": true,
  "homepage": "/dashboard",
  "dependencies": {
- "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-52",
+ "@devtron-labs/devtron-fe-common-lib": "1.21.0-pre-1",
  "@esbuild-plugins/node-globals-polyfill": "0.2.3",
  "@rjsf/core": "^5.13.3",
  "@rjsf/utils": "^5.13.3",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentConfigCompare/DeploymentConfigCompare.tsx

@@ -398,7 +398,6 @@ export const DeploymentConfigCompare = ({
  updateSearchParams({
  compareWith: value,
  chartRefId: null,
- manifestChartRefId: null,
  compareWithManifestChartRefId: null,
  compareWithIdentifierId: null,
  compareWithPipelineId: null,

src/components/CIPipelineN/OutputDirectoryPath.tsx

@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { CustomInput } from '@devtron-labs/devtron-fe-common-lib'
 import { TaskFieldDescription, TaskFieldLabel } from '../ciPipeline/types'
 import { ReactComponent as Close } from '../../assets/icons/ic-close.svg'
 import { ReactComponent as Add } from '../../assets/icons/ic-add.svg'
 import TaskFieldTippyDescription from './TaskFieldTippyDescription'
 import { pipelineContext } from '../workflowEditor/workflowEditor'
+import { ValidationRules } from '@Components/ciPipeline/validationRules'
 
 const OutputDirectoryPath = () => {
- const { selectedTaskIndex, formData, setFormData, activeStageName } = useContext(pipelineContext)
+ const { selectedTaskIndex, formData, setFormData, activeStageName, formDataErrorObj, setFormDataErrorObj } =
+ useContext(pipelineContext)
 
  const addOutputDirectoryPath = (): void => {
  const _formData = { ...formData }
@@ -33,18 +35,50 @@ const OutputDirectoryPath = () => {
  }
  _formData[activeStageName].steps[selectedTaskIndex].outputDirectoryPath.unshift('')
  setFormData(_formData)
+
+ const updatedErrorObj = { ...formDataErrorObj }
+ if (!updatedErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath) {
+ updatedErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath = []
+ }
+ updatedErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath.unshift({
+ isValid: true,
+ message: '',
+ })
+ setFormDataErrorObj(updatedErrorObj)
  }
 
  const handleStoreArtifact = (ev, index) => {
  const _formData = { ...formData }
- _formData[activeStageName].steps[selectedTaskIndex].outputDirectoryPath[index] = ev.target.value
+ const value = ev.target.value
+
+ const currentOutputPaths = _formData[activeStageName].steps[selectedTaskIndex].outputDirectoryPath
+ currentOutputPaths[index] = value
  setFormData(_formData)
+
+ const updatedErrorObj = { ...formDataErrorObj }
+ const outputPathErrors = updatedErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath
+
+ // If already saved, create valid error array of same length
+ if (!outputPathErrors?.length && currentOutputPaths?.length) {
+ updatedErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath = new Array(
+ currentOutputPaths.length,
+ { isValid: true, message: '' },
+ )
+ }
+
+ updatedErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath[index] =
+ new ValidationRules().outputDirectoryPath(value)
+ setFormDataErrorObj(updatedErrorObj)
  }
 
  const deleteOutputDirectory = (index) => {
  const _formData = { ...formData }
  _formData[activeStageName].steps[selectedTaskIndex].outputDirectoryPath.splice(index, 1)
  setFormData(_formData)
+
+ const updatedErrorObj = { ...formDataErrorObj }
+ updatedErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath.splice(index, 1)
+ setFormDataErrorObj(updatedErrorObj)
  }
 
  return (
@@ -72,6 +106,10 @@ const OutputDirectoryPath = () => {
  value={elm}
  onChange={(e) => handleStoreArtifact(e, index)}
  name="directory-path"
+ error={
+ formDataErrorObj[activeStageName].steps[selectedTaskIndex].outputDirectoryPath?.[index]
+ ?.message
+ }
  />
  <Close
  className="icon-dim-24 pointer mt-6 ml-6"

src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx

@@ -35,6 +35,10 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
+import {
+ getManifestResource,
+ updateManifestResourceHelmApps,
+} from '@Components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.api'
 
 import { getShowResourceScanModal, importComponentFromFELibrary } from '../../common'
 import { NodeType } from '../../v2/appDetails/appDetails.type'
@@ -58,6 +62,8 @@ const getResourceScanDetails: ({
  'function',
 )
 
+const RBRestartWorkloadModal = importComponentFromFELibrary('RBRestartWorkloadModal', null, 'function')
+
 const ResourceBrowserActionMenu = forwardRef(
  (
  {
@@ -75,18 +81,20 @@ const ResourceBrowserActionMenu = forwardRef(
  const { installedModuleMap } = useMainContext()
 
  const [showDeleteDialog, setShowDeleteDialog] = useState(false)
+ const [showRestartModal, setShowRestartModal] = useState(false)
  const [showVulnerabilityModal, setShowVulnerabilityModal] = useState(false)
 
+ const resource = {
+ name: String(resourceData.name),
+ namespace: String(resourceData.namespace),
+ group: selectedResource?.gvk?.Group,
+ kind: selectedResource?.gvk?.Kind,
+ version: selectedResource?.gvk?.Version,
+ clusterId: +clusterId,
+ }
+
  const [resourceScanLoading, resourceScanResponse, resourceScanError] = useAsync(
- () =>
- getResourceScanDetails({
- name: String(resourceData.name),
- namespace: String(resourceData.namespace),
- group: selectedResource?.gvk?.Group,
- kind: selectedResource?.gvk?.Kind,
- version: selectedResource?.gvk?.Version,
- clusterId: +clusterId,
- }),
+ () => getResourceScanDetails(resource),
  [],
  showVulnerabilityModal && !!getResourceScanDetails,
  )
@@ -125,6 +133,9 @@ const ResourceBrowserActionMenu = forwardRef(
  },
  })
  return
+ case ResourceBrowserActionMenuEnum.restart:
+ setShowRestartModal(true)
+ return
  case ResourceBrowserActionMenuEnum.delete:
  toggleDeleteDialog()
  return
@@ -139,6 +150,10 @@ const ResourceBrowserActionMenu = forwardRef(
 
  const id = JSON.stringify(resourceData)
 
+ const onRestartWorkloadModalClose = () => {
+ setShowRestartModal(false)
+ }
+
  return (
  <>
  <ActionMenu<ResourceBrowserActionMenuEnum>
@@ -158,6 +173,18 @@ const ResourceBrowserActionMenu = forwardRef(
  label: 'Events',
  startIcon: { name: 'ic-calendar' },
  },
+ ...(RBRestartWorkloadModal &&
+ window._env_.FEATURE_BULK_RESTART_WORKLOADS_FROM_RB.includes(
+ selectedResource?.gvk?.Kind.toLowerCase(),
+ )
+ ? [
+ {
+ id: ResourceBrowserActionMenuEnum.restart,
+ label: 'Restart',
+ startIcon: { name: 'ic-arrows-clockwise' },
+ } as ActionMenuItemType<ResourceBrowserActionMenuEnum>,
+ ]
+ : []),
  ...(selectedResource?.gvk?.Kind === Nodes.Pod
  ? [
  {
@@ -227,6 +254,15 @@ const ResourceBrowserActionMenu = forwardRef(
  hidePolicy
  />
  )}
+
+ {RBRestartWorkloadModal && showRestartModal && (
+ <RBRestartWorkloadModal
+ resource={resource}
+ getManifestResource={getManifestResource}
+ updateManifestResourceHelmApps={updateManifestResourceHelmApps}
+ onClose={onRestartWorkloadModalClose}
+ />
+ )}
  </>
  )
  },

src/components/app/details/appDetails/AppMetrics.tsx

@@ -17,6 +17,7 @@
 import React, { useState, useEffect } from 'react'
 import {
  ComponentSizeType,
+ DatePickerRangeController,
  DocLink,
  not,
  Progressing,
@@ -42,7 +43,7 @@ import {
  AppDetailsPathParams,
 } from './appDetails.type'
 import { GraphModal, GraphModalProps } from './GraphsModal'
-import { DatePickerType2 as DateRangePicker, InValidHostUrlWarningBlock } from '../../../common'
+import { InValidHostUrlWarningBlock } from '../../../common'
 import { ReactComponent as GraphIcon } from '../../../../assets/icons/ic-graph.svg'
 import { ReactComponent as Fullscreen } from '../../../../assets/icons/ic-fullscreen-2.svg'
 import { ReactComponent as OpenInNew } from '../../../../assets/icons/ic-open-in-new.svg'
@@ -393,7 +394,7 @@ export const AppMetrics: React.FC<{
  <span className="dc__tertiary-tab">Per Pod</span>
  </label>
  </div>
- <DateRangePicker
+ <DatePickerRangeController
  calendar={calendar}
  calendarInputs={calendarInputs}
  focusedInput={focusedInput}

src/components/app/details/appDetails/AppStatusCard.tsx

@@ -80,7 +80,7 @@ const AppStatusCard = ({ appDetails, status, cardLoading, setDetailed, message }
  <div
  data-testid="app-status-card"
  onClick={showApplicationDetailedModal}
- className="app-details-info-card pointer flex left bg__primary br-8 mr-12 lh-20 w-200"
+ className="app-details-info-card pointer flex left bg__primary br-8 lh-20 w-200"
  >
  <div className="app-details-info-card__top-container flex">
  <div className="app-details-info-card__top-container__content">

src/components/app/details/appDetails/DeployedCommitCard.tsx

@@ -54,7 +54,7 @@ const DeployedCommitCard = ({ cardLoading, showCommitInfoDrawer, envId, ciArtifa
  <div
  data-testid="deployed-commit-card"
  onClick={showCommitInfoDrawer}
- className="app-details-info-card pointer flex left bg__primary br-8 mr-12 lh-20 w-200"
+ className="app-details-info-card pointer flex left bg__primary br-8 lh-20 w-200"
  >
  <div className="app-details-info-card__top-container flex">
  <div className="app-details-info-card__top-container__content">

src/components/app/details/appDetails/DeploymentStatusCard.tsx

@@ -119,7 +119,7 @@ const DeploymentStatusCard = ({
  <div
  data-testid="deployment-status-card"
  onClick={onClickLastDeploymentStatus}
- className={`app-details-info-card flex left bg__primary br-8 mr-12 lh-20 w-250 ${hideDetails ? '' : 'cursor'}`}
+ className={`app-details-info-card flex left bg__primary br-8 lh-20 w-250 ${hideDetails ? '' : 'cursor'}`}
  >
  {renderDeploymentStatus()}
  </div>

src/components/app/details/appDetails/GraphsModal.tsx

@@ -16,12 +16,12 @@
 
 import { Component } from 'react'
 import { Moment } from 'moment'
-import { DatePickerType2 as DateRangePicker } from '../../../common'
 import { AppMetricsTabType, ChartType, StatusType, ChartTypes, StatusTypes, AppMetricsTab } from './appDetails.type'
 import { getIframeSrc, isK8sVersionValid, ThroughputSelect, getCalendarValue, LatencySelect, AppInfo } from './utils'
 import { ReactComponent as GraphIcon } from '../../../../assets/icons/ic-graph.svg'
 import { DEFAULTK8SVERSION } from '../../../../config'
 import { APP_METRICS_CALENDAR_INPUT_DATE_FORMAT } from './constants'
+import { DatePickerRangeController } from '@devtron-labs/devtron-fe-common-lib'
 
 export const ChartNames = {
  cpu: 'CPU Usage',
@@ -464,7 +464,7 @@ export class GraphModal extends Component<GraphModalProps, GraphModalState> {
  <span className="dc__tertiary-tab">Per Pod</span>
  </label>
  </div>
- <DateRangePicker
+ <DatePickerRangeController
  calendar={this.state.calendar}
  calendarInputs={this.state.calendarInputs}
  focusedInput={this.state.focusedInput}