From b1958859d3865cf33da71d07cc7d7355a85224f3 Mon Sep 17 00:00:00 2001 From: Frederick Borges Date: Mon, 5 Dec 2022 17:08:03 +0100 Subject: [PATCH] B #~: Show only OS, CDROM, and DATABLOCK images on image tab (#2400) --- .../src/client/features/OneApi/image.js | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/fireedge/src/client/features/OneApi/image.js b/src/fireedge/src/client/features/OneApi/image.js index 632fada3e1..0a4d85d792 100644 --- a/src/fireedge/src/client/features/OneApi/image.js +++ b/src/fireedge/src/client/features/OneApi/image.js @@ -61,8 +61,10 @@ const imageApi = oneApi.injectEndpoints({ : [data.IMAGE_POOL.IMAGE] : [] - const images = imagesPool?.filter?.((image) => - IMAGE_TYPES_FOR_IMAGES.some(() => getType(image)) + const images = imagesPool?.filter((image) => + IMAGE_TYPES_FOR_IMAGES.some( + (imageType) => imageType === getType(image) + ) ) return images.flat() @@ -93,7 +95,13 @@ const imageApi = oneApi.injectEndpoints({ return { params, command } }, transformResponse: (data) => { - const images = data?.IMAGE_POOL?.IMAGE?.filter?.((image) => + const imagesPool = data?.IMAGE_POOL?.IMAGE + ? Array.isArray(data.IMAGE_POOL.IMAGE) + ? data.IMAGE_POOL.IMAGE + : [data.IMAGE_POOL.IMAGE] + : [] + + const images = imagesPool?.filter((image) => IMAGE_TYPES_FOR_FILES.some( (imageType) => imageType === getType(image) ) @@ -127,7 +135,13 @@ const imageApi = oneApi.injectEndpoints({ return { params, command } }, transformResponse: (data) => { - const images = data?.IMAGE_POOL?.IMAGE?.filter?.((image) => + const imagesPool = data?.IMAGE_POOL?.IMAGE + ? Array.isArray(data.IMAGE_POOL.IMAGE) + ? data.IMAGE_POOL.IMAGE + : [data.IMAGE_POOL.IMAGE] + : [] + + const images = imagesPool?.filter((image) => IMAGE_TYPES_FOR_BACKUPS.some( (imageType) => imageType === getType(image) )