From 43da7093ab2d5a2e6e4792ac8f4e029aa54b2508 Mon Sep 17 00:00:00 2001 From: Garrett Edmonds Date: Tue, 1 Jul 2025 14:18:20 -0500 Subject: [PATCH 1/2] Change default settings to use express apps for compress and extract --- server/portal/settings/settings_default.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/portal/settings/settings_default.py b/server/portal/settings/settings_default.py index 5b287243f0..088399d1a0 100644 --- a/server/portal/settings/settings_default.py +++ b/server/portal/settings/settings_default.py @@ -246,11 +246,11 @@ "makeLink": True, "viewPath": True, "compressApp": { - "id": "compress", - "version": "0.0.4" # Can be set to "" to use the latest version + "id": "compress-express", + "version": "0.0.1" # Can be set to "" to use the latest version }, "extractApp": { - "id": "extract", + "id": "extract-express", "version": "0.0.1" # Can be set to "" to use the latest version }, "makePublic": True, From f90a8d5213e6a38c56457a8d6ea7a997042fbc50 Mon Sep 17 00:00:00 2001 From: Garrett Edmonds Date: Tue, 1 Jul 2025 14:22:37 -0500 Subject: [PATCH 2/2] Update tests to use express apps --- .../tests/DataFilesCompressModal.fixture.js | 2 +- .../tests/DataFilesDownloadMessageModal.fixture.js | 2 +- .../tests/DataFilesDownloadMessageModal.test.jsx | 4 ++-- .../DataFiles/DataFilesToolbar/DataFilesToolbar.test.jsx | 8 ++++---- client/src/components/DataFiles/tests/DataFiles.test.jsx | 6 +++--- client/src/redux/sagas/fixtures/compress.fixture.js | 2 +- client/src/redux/sagas/fixtures/extract.fixture.js | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.fixture.js b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.fixture.js index 359ec6de51..74b8681d7d 100644 --- a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.fixture.js +++ b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.fixture.js @@ -78,7 +78,7 @@ const DataFilesCompressModalFixture = { }, workbench: { config: { - compressApp: { id: 'compress', version: '0.0.4' }, + compressApp: { id: 'compress-express', version: '0.0.1' }, }, }, allocations: { diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js index ba805c454c..586352c3d5 100644 --- a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js +++ b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js @@ -69,7 +69,7 @@ const DataFilesDownloadMessageModalFixture = { }, workbench: { config: { - compressApp: { id: 'compress', version: '0.0.4' }, + compressApp: { id: 'compress-express', version: '0.0.1' }, }, }, allocations: { diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx index 342a833698..ed1b300abf 100644 --- a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx +++ b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx @@ -15,8 +15,8 @@ vi.mock('hooks/datafiles/mutations/toolbarAppUtils', async (importOriginal) => { return { ...actual, // keep `getDefaultAllocation` getAppUtil: vi.fn().mockResolvedValue({ - id: 'compress', - version: '0.0.4', + id: 'compress-express', + version: '0.0.1', definition: { jobAttributes: { execSystemId: 'frontera', diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.jsx b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.jsx index 2c216cc48d..3ffba5e390 100644 --- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.jsx +++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.jsx @@ -357,8 +357,8 @@ describe('DataFilesToolbar', () => { allocations: { portal_alloc: undefined, active: [] }, workbench: { config: { - extractApp: { id: 'extract', version: '0.0.3' }, - compressApp: { id: 'compress', version: '0.0.4' }, + extractApp: { id: 'extract-express', version: '0.0.1' }, + compressApp: { id: 'compress-express', version: '0.0.1' }, }, }, files: { @@ -389,8 +389,8 @@ describe('DataFilesToolbar', () => { allocations: { portal_alloc: undefined, active: ['foo'] }, workbench: { config: { - extractApp: { id: 'extract', version: '0.0.3' }, - compressApp: { id: 'compress', version: '0.0.4' }, + extractApp: { id: 'extract-express', version: '0.0.1' }, + compressApp: { id: 'compress-express', version: '0.0.1' }, }, }, files: { diff --git a/client/src/components/DataFiles/tests/DataFiles.test.jsx b/client/src/components/DataFiles/tests/DataFiles.test.jsx index 431d836ade..803bcc4715 100644 --- a/client/src/components/DataFiles/tests/DataFiles.test.jsx +++ b/client/src/components/DataFiles/tests/DataFiles.test.jsx @@ -22,12 +22,12 @@ describe('DataFiles', () => { workbench: { config: { extract: { - id: 'extract', + id: 'extract-express', version: '0.0.1', }, compress: { - id: 'compress', - version: '0.0.4', + id: 'compress-express', + version: '0.0.1', }, }, }, diff --git a/client/src/redux/sagas/fixtures/compress.fixture.js b/client/src/redux/sagas/fixtures/compress.fixture.js index 2e479a3473..d28760da1d 100644 --- a/client/src/redux/sagas/fixtures/compress.fixture.js +++ b/client/src/redux/sagas/fixtures/compress.fixture.js @@ -3,7 +3,7 @@ export const compressApp = { sharedAppCtx: true, isPublic: true, tenant: 'portals', - id: 'compress', + id: 'compress-express', version: '0.0.1', description: 'Compress a file or folder for download.', owner: 'wma_prtl', diff --git a/client/src/redux/sagas/fixtures/extract.fixture.js b/client/src/redux/sagas/fixtures/extract.fixture.js index a9545a879d..bff4f76345 100644 --- a/client/src/redux/sagas/fixtures/extract.fixture.js +++ b/client/src/redux/sagas/fixtures/extract.fixture.js @@ -5,7 +5,7 @@ export const extractApp = { sharedAppCtx: true, isPublic: true, tenant: 'portals', - id: 'extract', + id: 'extract-express', version: '0.0.1', description: 'Extract a tar, tar.gz, tgz, gz, or zip file.', owner: 'wma_prtl',