From 78418c0cc8dd35f6c4c590a759d07057ca0f2c0b Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Wed, 10 Jul 2024 11:12:35 +0200 Subject: [PATCH] feat: preview images in versions prior to 41 --- .../WidgetProfile/hooks/getSubValueForTei.js | 4 ++-- .../Stages/Stage/getEventDataWithSubValue.js | 2 +- .../getEventListData/convertToClientEvents.js | 6 +++--- .../helpers/getTeiListData/convertToClientTeis.js | 4 ++-- .../capture-core/converters/clientToList.js | 8 +------- .../capture-core/converters/clientToView.js | 10 +--------- .../capture-core/events/getSubValues.js | 2 +- .../trackedEntityInstances/getSubValues.js | 14 ++++---------- 8 files changed, 15 insertions(+), 35 deletions(-) diff --git a/src/core_modules/capture-core/components/WidgetProfile/hooks/getSubValueForTei.js b/src/core_modules/capture-core/components/WidgetProfile/hooks/getSubValueForTei.js index 2e4c20b831..241316d4eb 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/hooks/getSubValueForTei.js +++ b/src/core_modules/capture-core/components/WidgetProfile/hooks/getSubValueForTei.js @@ -36,8 +36,8 @@ const getImageResourceSubvalue = async ({ attribute, minorServerVersion }: SubVa url: `${absoluteApiPath}/tracker/trackedEntities/${teiId}/attributes/${id}/image?program=${programId}`, previewUrl: `${absoluteApiPath}/tracker/trackedEntities/${teiId}/attributes/${id}/image?program=${programId}&dimension=small`, } : { - url: `${absoluteApiPath}/trackedEntityInstances/${teiId}/${id}/image`, - previewUrl: `${absoluteApiPath}/trackedEntityInstances/${teiId}/${id}/image`, + url: `${absoluteApiPath}/trackedEntityInstances/${teiId}/${id}/image?program=${programId}`, + previewUrl: `${absoluteApiPath}/trackedEntityInstances/${teiId}/${id}/image?program=${programId}&dimension=SMALL`, }; return { diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/getEventDataWithSubValue.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/getEventDataWithSubValue.js index a4dff1973f..29919f0fe8 100644 --- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/getEventDataWithSubValue.js +++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/getEventDataWithSubValue.js @@ -40,7 +40,7 @@ const getImageSubvalue = (keys: Object, querySingleResource: QuerySingleResource previewUrl: `${absoluteApiPath}/tracker/events/${eventId}/dataValues/${key}/image?dimension=small`, } : { url: `${absoluteApiPath}/events/files?dataElementUid=${key}&eventUid=${eventId}`, - previewUrl: `${absoluteApiPath}/events/files?dataElementUid=${key}&eventUid=${eventId}`, + previewUrl: `${absoluteApiPath}/events/files?dataElementUid=${key}&eventUid=${eventId}&dimension=SMALL`, } ), }; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/convertToClientEvents.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/convertToClientEvents.js index 250970edf1..4e0e339c90 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/convertToClientEvents.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/convertToClientEvents.js @@ -53,8 +53,8 @@ const buildTEIRecord = ({ imageUrl: `/tracker/trackedEntities/${trackedEntity}/attributes/${id}/image?program=${programId}`, previewUrl: `/tracker/trackedEntities/${trackedEntity}/attributes/${id}/image?program=${programId}&dimension=small`, } : { - imageUrl: `/trackedEntityInstances/${trackedEntity}/${id}/image`, - previewUrl: `/trackedEntityInstances/${trackedEntity}/${id}/image`, + imageUrl: `/trackedEntityInstances/${trackedEntity}/${id}/image?program=${programId}`, + previewUrl: `/trackedEntityInstances/${trackedEntity}/${id}/image?program=${programId}&dimension=SMALL`, } ))() : {}; @@ -94,7 +94,7 @@ const buildEventRecord = ({ previewUrl: `/tracker/events/${apiEvent.event}/dataValues/${id}/image?dimension=small`, } : { imageUrl: `/events/files?dataElementUid=${id}&eventUid=${apiEvent.event}`, - previewUrl: `/events/files?dataElementUid=${id}&eventUid=${apiEvent.event}`, + previewUrl: `/events/files?dataElementUid=${id}&eventUid=${apiEvent.event}&dimension=SMALL`, } ))() : {}; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/convertToClientTeis.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/convertToClientTeis.js index 101a796fd1..f726604bba 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/convertToClientTeis.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/convertToClientTeis.js @@ -34,8 +34,8 @@ export const convertToClientTeis = ( imageUrl: `/tracker/trackedEntities/${tei.trackedEntity}/attributes/${id}/image?program=${programId}`, previewUrl: `/tracker/trackedEntities/${tei.trackedEntity}/attributes/${id}/image?program=${programId}&dimension=small`, } : { - imageUrl: `/trackedEntityInstances/${tei.trackedEntity}/${id}/image`, - previewUrl: `/trackedEntityInstances/${tei.trackedEntity}/${id}/image`, + imageUrl: `/trackedEntityInstances/${tei.trackedEntity}/${id}/image?program=${programId}`, + previewUrl: `/trackedEntityInstances/${tei.trackedEntity}/${id}/image?program=${programId}&dimension=SMALL`, } ))() : {}; diff --git a/src/core_modules/capture-core/converters/clientToList.js b/src/core_modules/capture-core/converters/clientToList.js index ea052fda36..a5f39b4105 100644 --- a/src/core_modules/capture-core/converters/clientToList.js +++ b/src/core_modules/capture-core/converters/clientToList.js @@ -4,7 +4,6 @@ import moment from 'moment'; import i18n from '@dhis2/d2-i18n'; import { Tag } from '@dhis2/ui'; import { PreviewImage } from 'capture-ui'; -import { featureAvailable, FEATURES } from 'capture-core-utils'; import { dataElementTypes, type DataElement } from '../metaData'; import { convertMomentToDateFormatString } from '../utils/converters/date'; import { stringifyNumber } from './common/stringifyNumber'; @@ -60,12 +59,7 @@ function convertImageForDisplay(clientValue: ImageClientValue) { if (typeof clientValue === 'string' || clientValue instanceof String) { return clientValue; } - return featureAvailable(FEATURES.trackerImageEndpoint) ? ( - - ) : convertFileForDisplay(clientValue); + return ; } function convertRangeForDisplay(parser: any, clientValue: any) { diff --git a/src/core_modules/capture-core/converters/clientToView.js b/src/core_modules/capture-core/converters/clientToView.js index 51b91f07e5..a1301e6836 100644 --- a/src/core_modules/capture-core/converters/clientToView.js +++ b/src/core_modules/capture-core/converters/clientToView.js @@ -3,7 +3,6 @@ import React from 'react'; import moment from 'moment'; import i18n from '@dhis2/d2-i18n'; import { PreviewImage } from 'capture-ui'; -import { featureAvailable, FEATURES } from 'capture-core-utils'; import { dataElementTypes, type DataElement } from '../metaData'; import { convertMomentToDateFormatString } from '../utils/converters/date'; import { stringifyNumber } from './common/stringifyNumber'; @@ -52,16 +51,9 @@ function convertFileForDisplay(clientValue: FileClientValue) { } function convertImageForDisplay(clientValue: ImageClientValue) { - return featureAvailable(FEATURES.trackerImageEndpoint) ? ( - - ) : convertFileForDisplay(clientValue); + return ; } - const valueConvertersForType = { [dataElementTypes.NUMBER]: stringifyNumber, [dataElementTypes.INTEGER]: stringifyNumber, diff --git a/src/core_modules/capture-core/events/getSubValues.js b/src/core_modules/capture-core/events/getSubValues.js index 8004fa62f9..005dbc4d9d 100644 --- a/src/core_modules/capture-core/events/getSubValues.js +++ b/src/core_modules/capture-core/events/getSubValues.js @@ -49,7 +49,7 @@ const subValueGetterByElementType = { previewUrl: `${absoluteApiPath}/tracker/events/${eventId}/dataValues/${metaElementId}/image?dimension=small`, } : { url: `${absoluteApiPath}/events/files?dataElementUid=${metaElementId}&eventUid=${eventId}`, - previewUrl: `${absoluteApiPath}/events/files?dataElementUid=${metaElementId}&eventUid=${eventId}`, + previewUrl: `${absoluteApiPath}/events/files?dataElementUid=${metaElementId}&eventUid=${eventId}&dimension=SMALL`, } ), [dataElementTypes.ORGANISATION_UNIT]: ({ diff --git a/src/core_modules/capture-core/trackedEntityInstances/getSubValues.js b/src/core_modules/capture-core/trackedEntityInstances/getSubValues.js index 3b6f08c12c..abd6eda46a 100644 --- a/src/core_modules/capture-core/trackedEntityInstances/getSubValues.js +++ b/src/core_modules/capture-core/trackedEntityInstances/getSubValues.js @@ -16,16 +16,10 @@ const subValueGetterByElementType = { absoluteApiPath: string, programId: ?string, }) => { - const buildUrl = () => { - if (featureAvailable(FEATURES.trackerImageEndpoint)) { - if (programId) { - return `${absoluteApiPath}/tracker/trackedEntities/${teiId}/attributes/${attributeId}/image?program=${programId}&dimension=small`; - } - return `${absoluteApiPath}/tracker/trackedEntities/${teiId}/attributes/${attributeId}/image?dimension=small`; - } - return `${absoluteApiPath}/trackedEntityInstances/${teiId}/${attributeId}/image`; - }; - const previewUrl = buildUrl(); + const url = featureAvailable(FEATURES.trackerImageEndpoint) + ? `${absoluteApiPath}/tracker/trackedEntities/${teiId}/attributes/${attributeId}/image?dimension=small` + : `${absoluteApiPath}/trackedEntityInstances/${teiId}/${attributeId}/image?dimension=SMALL`; + const previewUrl = programId ? `${url}&program=${programId}` : url; return { previewUrl,