Merge pull request #205 from devtron-labs/fix/plugin-version

feat: add prop to configure showError for mandatory plugins

Author: AbhishekA1509

src/Common/Policy.Types.ts

@@ -16,6 +16,7 @@
 
 import { PluginDataStoreType } from '../Shared'
 import { VariableType } from './CIPipeline.Types'
+import { ServerErrors } from './ServerError'
 import { ResponseType } from './Types'
 
 export enum ApplyPolicyToStage {
@@ -62,6 +63,7 @@ export interface MandatoryPluginDataType {
 export interface ProcessPluginDataReturnType {
     mandatoryPluginData: MandatoryPluginDataType
     pluginDataStore: PluginDataStoreType
+    mandatoryPluginsError?: ServerErrors
 }
 
 export enum ConsequenceAction {

src/Shared/Components/Plugin/service.tsx

@@ -16,6 +16,7 @@ export const getPluginsDetail = async ({
     appId,
     parentPluginIds,
     pluginIds,
+    shouldShowError = true,
 }: PluginDetailServiceParamsType): Promise<Pick<GetPluginStoreDataReturnType, 'pluginStore'>> => {
     try {
         const payload: PluginDetailPayloadType = {
@@ -34,7 +35,9 @@ export const getPluginsDetail = async ({
             pluginStore,
         }
     } catch (error) {
-        showError(error)
+        if (shouldShowError) {
+            showError(error)
+        }
         throw error
     }
 }

src/Shared/Components/Plugin/types.ts

@@ -62,6 +62,10 @@ export interface PluginDetailServiceParamsType {
     appId: number
     pluginIds?: number[]
     parentPluginIds?: number[]
+    /**
+     * @default true
+     */
+    shouldShowError?: boolean
 }
 
 export interface PluginDetailPayloadType extends Pick<PluginDetailServiceParamsType, 'appId'> {

src/Shared/Components/Plugin/utils.tsx

@@ -99,7 +99,7 @@ export const pluginTagSelectStyles = {
 }
 
 /**
- * @description This method takes the initial plugin data store and updates only keys that are not present in the initial store with the values from the target store.
+ * @description This method takes the initial plugin data store and updates the keys with the target parent plugin store and plugin version store
  */
 export const getUpdatedPluginStore = (
     initialPluginDataStore: PluginDataStoreType,
@@ -109,15 +109,11 @@ export const getUpdatedPluginStore = (
     const clonedPluginDataStore = structuredClone(initialPluginDataStore)
 
     Object.keys(targetParentPluginStore).forEach((key) => {
-        if (!clonedPluginDataStore.parentPluginStore[key]) {
-            clonedPluginDataStore.parentPluginStore[key] = targetParentPluginStore[key]
-        }
+        clonedPluginDataStore.parentPluginStore[key] = targetParentPluginStore[key]
     })
 
     Object.keys(targetPluginVersionStore).forEach((key) => {
-        if (!clonedPluginDataStore.pluginVersionStore[key]) {
-            clonedPluginDataStore.pluginVersionStore[key] = targetPluginVersionStore[key]
-        }
+        clonedPluginDataStore.pluginVersionStore[key] = targetPluginVersionStore[key]
     })
 
     return clonedPluginDataStore