Merge pull request #150 from devtron-labs/feat/artifact-release-mapping

feat: add artifact release mapping info in cd material type

Author: eshankvaish

package-lock.json

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

package.json

@@ -247,4 +247,4 @@ export const abortPreviousRequests = <T>(
  */
 export const getIsRequestAborted = (error) =>
     // The 0 code is common for aborted and blocked requests
-    error && error.code === 0 && error.message === 'The user aborted a request.'
+    error && error.code === 0 && (error.message === 'The user aborted a request.' || error.message === 'signal is aborted without reason')

src/Common/Api.ts

@@ -144,6 +144,7 @@ const cdMaterialListModal = (artifacts: any[], offset: number, artifactId?: numb
             promotionApprovalMetadata: material.promotionApprovalMetadata,
             deployedOnEnvironments: material.deployedOnEnvironments ?? [],
             deploymentWindowArtifactMetadata: material.deploymentWindowArtifactMetadata ?? null,
+            configuredInReleases: material.configuredInReleases ?? [],
         }
     })
     return materials
@@ -174,6 +175,7 @@ const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
             resourceFilters: [],
             totalCount: 0,
             requestedUserId: 0,
+            appWorkflowId: 0,
         }
     }
 
@@ -184,6 +186,7 @@ const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
         resourceFilters: cdMaterialsResult.resourceFilters ?? [],
         totalCount: cdMaterialsResult.totalCount ?? 0,
         requestedUserId: cdMaterialsResult.requestedUserId,
+        appWorkflowId: cdMaterialsResult.appWorkflowId,
     }
 }
 

src/Common/Common.service.ts

@@ -4,10 +4,10 @@ import GenericEmptyState from './EmptyState/GenericEmptyState'
 import { ErrorPageType } from './Types'
 import { noop, refresh, reportIssue } from './Helper'
 
-const ErrorPage = ({ code, image, title, subTitle, imageType, heightToDeduct, reload }: ErrorPageType) => {
+const ErrorPage = ({ code, image, title, subTitle, imageType, heightToDeduct, reload, redirectURL }: ErrorPageType) => {
     const { push } = useHistory()
     const redirectToHome = () => {
-        push(`/${ROUTES.APP_LIST}`)
+        push(redirectURL || `/${ROUTES.APP_LIST}`)
     }
 
     const getErrorPageProps = (

src/Common/ErrorPage.tsx

@@ -1,12 +1,19 @@
 import notFound from '../Assets/Img/ic-not-found.svg'
 import badRequest from '../Assets/Img/ic-page-not-found.svg'
 import unauthorized from '../Assets/Img/ic-not-authorized.svg'
-import { ERROR_STATUS_CODE, ERROR_EMPTY_SCREEN } from './Constants'
+import { ERROR_STATUS_CODE, ERROR_EMPTY_SCREEN, ROUTES } from './Constants'
 import Reload from './Reload'
 import ErrorPage from './ErrorPage'
 import { ErrorScreenManagerProps, ImageType } from './Types'
 
-const ErrorScreenManager = ({ code, reload, subtitle, reloadClass, heightToDeduct }: ErrorScreenManagerProps) => {
+const ErrorScreenManager = ({
+    code,
+    reload,
+    subtitle,
+    reloadClass,
+    heightToDeduct,
+    redirectURL = ROUTES.APP_LIST,
+}: ErrorScreenManagerProps) => {
     const getMessage = () => {
         switch (code) {
             case ERROR_STATUS_CODE.BAD_REQUEST:
@@ -52,6 +59,7 @@ const ErrorScreenManager = ({ code, reload, subtitle, reloadClass, heightToDeduc
                         image={notFound}
                         imageType={ImageType.Large}
                         heightToDeduct={heightToDeduct}
+                        redirectURL={redirectURL}
                     />
                 )
             case ERROR_STATUS_CODE.INTERNAL_SERVER_ERROR:
@@ -63,6 +71,7 @@ const ErrorScreenManager = ({ code, reload, subtitle, reloadClass, heightToDeduc
                         image={badRequest}
                         imageType={ImageType.Large}
                         heightToDeduct={heightToDeduct}
+                        reload={reload}
                     />
                 )
             case ERROR_STATUS_CODE.BAD_GATEWAY:

src/Common/ErrorScreenManager.tsx

@@ -139,7 +139,7 @@ export interface GenericEmptyStateType {
 }
 
 export interface ErrorPageType
-    extends Pick<GenericEmptyStateType, 'image' | 'title' | 'subTitle' | 'renderButton' | 'imageType'>, Pick<ErrorScreenManagerProps, 'reload'> {
+    extends Pick<GenericEmptyStateType, 'image' | 'title' | 'subTitle' | 'renderButton' | 'imageType'>, Pick<ErrorScreenManagerProps, 'reload' | 'redirectURL'> {
     code: number
     heightToDeduct?: number
 }
@@ -150,6 +150,11 @@ export interface ErrorScreenManagerProps {
     subtitle?: React.ReactChild
     reloadClass?: string
     heightToDeduct?: number
+    /**
+     * Would be used to redirect URL in case of 404
+     * @default - APP_LIST
+     */
+    redirectURL?: string
 }
 
 export interface ErrorScreenNotAuthorizedProps {
@@ -353,6 +358,15 @@ export interface DeploymentWindowArtifactMetadata {
     type: DEPLOYMENT_WINDOW_TYPE
 }
 
+export interface ArtifactReleaseMappingType {
+    id : number, 
+    identifier: string,
+    releaseVersion: string,
+    name: string
+    kind: string
+    version: string
+}
+
 export interface CDMaterialType {
     index: number
     id: string
@@ -397,6 +411,10 @@ export interface CDMaterialType {
     promotionApprovalMetadata?: PromotionApprovalMetadataType
     deployedOnEnvironments?: string[]
     deploymentWindowArtifactMetadata?: DeploymentWindowArtifactMetadata
+    /**
+     * Will only be present in case of release
+     */
+    configuredInReleases: ArtifactReleaseMappingType[]
 }
 
 export enum CDMaterialServiceEnum {
@@ -577,6 +595,10 @@ export interface CDMaterialsMetaInfo {
      * This is the ID of user that has request the material
      */
     requestedUserId: number
+    /**
+     * Would currently only be received in case of release
+     */
+    appWorkflowId: number
 }
 
 export interface ImagePromotionMaterialInfo {