From 40374a11d552cae62baf4946da20ba838609ff03 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 15 Jul 2025 13:21:14 -0700 Subject: [PATCH 1/6] Invalid file (that exist but isn't accessible) should show red triangle icon --- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 5 +++++ .../src/internal/renderers/FileColumnRenderer.test.tsx | 7 +++++++ .../src/internal/renderers/FileColumnRenderer.tsx | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index a10a8904a9..bffcdf2727 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.56.0", + "version": "6.56.1-fb-filePathIssues.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index ea51ac227c..a4210cfd68 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,6 +1,11 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages +### version 6.X +*Released*: X July 2025 +- File handling - File path related issue bundle + - Invalid file (that exist but isn't accessible) should show red triangle icon + ### version 6.56.0 *Released*: 11 July 2025 - Package updates diff --git a/packages/components/src/internal/renderers/FileColumnRenderer.test.tsx b/packages/components/src/internal/renderers/FileColumnRenderer.test.tsx index dd69f38b11..14af80ecfa 100644 --- a/packages/components/src/internal/renderers/FileColumnRenderer.test.tsx +++ b/packages/components/src/internal/renderers/FileColumnRenderer.test.tsx @@ -95,6 +95,13 @@ describe('getAttachmentCardProp', () => { iconFontCls: 'fa fa-file-image-o', unavailable: false, }); + const dataUnavailable = { url: 'testurl', value: 'test.png (unavailable)' }; + validate(getAttachmentCardProp(dataUnavailable), true, 'attachment', false, 'testurl', { + name: 'test.png', + title: 'test.png', + iconFontCls: 'fa fa-exclamation-triangle', + unavailable: true, + }); }); test('allowRemove', () => { diff --git a/packages/components/src/internal/renderers/FileColumnRenderer.tsx b/packages/components/src/internal/renderers/FileColumnRenderer.tsx index f6fc9e8e9b..8cb79aca74 100644 --- a/packages/components/src/internal/renderers/FileColumnRenderer.tsx +++ b/packages/components/src/internal/renderers/FileColumnRenderer.tsx @@ -57,11 +57,11 @@ export const getAttachmentCardProp = ( if (Iterable.isIterable(data)) { url = data.get('url'); value = data.get('value'); - display = getFileDisplayValue(data.get('displayValue')); + display = getFileDisplayValue(data.get('displayValue') ?? value); } else { url = caseInsensitive(data, 'url'); value = caseInsensitive(data, 'value'); - display = getFileDisplayValue(caseInsensitive(data, 'displayValue')); + display = getFileDisplayValue(caseInsensitive(data, 'displayValue') ?? value); } const titleStyle = isConditionalFormattingEnabled() ? getDataStyling(data) : undefined; const filename = display.filename; From 3c0f54f8c2affa34997e0925575677f440ef919f Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 15 Jul 2025 13:29:31 -0700 Subject: [PATCH 2/6] File path related bugs --- packages/components/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index a78fc8927d..e23ddba54d 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.56.0", + "version": "6.56.1-fb-filePathIssues.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.56.0", + "version": "6.56.1-fb-filePathIssues.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", From 68c024bff8eb3867aadb90291b1b08b26c18a386 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 23 Jul 2025 11:53:33 -0700 Subject: [PATCH 3/6] Merge branch 'develop' into fb_filePathIssues # Conflicts: # biologics/package-lock.json # biologics/package.json # inventory/package-lock.json # inventory/package.json # sampleManagement/package-lock.json # sampleManagement/package.json --- packages/components/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 2dca7d7610..01e64e5eb0 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.56.2", + "version": "6.56.3-fb-filePathIssues.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.56.2", + "version": "6.56.3-fb-filePathIssues.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", From 8f1f336aa84eb11cd72219e08063ba6aadf8451a Mon Sep 17 00:00:00 2001 From: XingY Date: Fri, 25 Jul 2025 09:52:53 -0700 Subject: [PATCH 4/6] Merge branch 'develop' into fb_filePathIssues # Conflicts: # biologics/package-lock.json # biologics/package.json # inventory/package-lock.json # inventory/package.json # sampleManagement/package-lock.json # sampleManagement/package.json # sampleManagement/test/src/org/labkey/test/tests/samplemanagement/folders/SMProSamplesCrossFolderCRUDTest.java --- packages/components/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index c704efb92b..6b83387841 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.56.3", + "version": "6.56.4-fb-filePathIssues.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.56.3", + "version": "6.56.4-fb-filePathIssues.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", From d7130d3b6d9cb63a925acb9080c10ab7c567a407 Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 4 Aug 2025 18:44:23 -0700 Subject: [PATCH 5/6] publish --- packages/components/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 0350f3eb22..b19cfa6a89 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.0", + "version": "6.58.1-fb-filePathIssues.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.0", + "version": "6.58.1-fb-filePathIssues.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", From fd209c022557c963ce4d9a5da23ccb96a0bfaa58 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 5 Aug 2025 09:23:25 -0700 Subject: [PATCH 6/6] publish --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index b19cfa6a89..b3d3571a8b 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.1-fb-filePathIssues.1", + "version": "6.58.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.1-fb-filePathIssues.1", + "version": "6.58.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/packages/components/package.json b/packages/components/package.json index 6b97b8e4f0..3dd58a6ead 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.1-fb-filePathIssues.1", + "version": "6.58.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 672d11a2d2..5ba9da1629 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,8 +1,8 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages -### version 6.X -*Released*: X July 2025 +### version 6.58.1 +*Released*: 5 August 2025 - File handling - File path related issue bundle - Invalid file (that exist but isn't accessible) should show red triangle icon