Merge branch 'main' into task/WP-367-public-data-navigation

TACC · Dec 12, 2023 · 1fa75fe · 1fa75fe
2 parents 5d44e38 + dda1cc7
commit 1fa75fe
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.4.3] - 2023-12-11: Fix push key handling
+### Fixed
+
+- WP-408: use archiveSystemId set in app definition as default (#917)
+
+
 ## [3.4.2] - 2023-12-07: Fix push key handling
 ### Fixed
 
@@ -1019,7 +1025,8 @@ WP-306: Fix target path regression (#871)
 ## [1.0.0] - 2020-02-28
 v1.0.0 Production release as of Feb 28, 2020.
 
-[unreleased]: https://github.com/TACC/Core-Portal/compare/v3.4.2...HEAD
+[unreleased]: https://github.com/TACC/Core-Portal/compare/v3.4.3...HEAD
+[3.4.3]: https://github.com/TACC/Core-Portal/releases/tag/v3.4.3
 [3.4.2]: https://github.com/TACC/Core-Portal/releases/tag/v3.4.2
 [3.4.1]: https://github.com/TACC/Core-Portal/releases/tag/v3.4.1
 [3.4.0]: https://github.com/TACC/Core-Portal/releases/tag/v3.4.0

diff --git a/client/src/components/Applications/AppForm/AppForm.jsx b/client/src/components/Applications/AppForm/AppForm.jsx
@@ -274,7 +274,7 @@ export const AppSchemaForm = ({ app }) => {
     coresPerNode: app.definition.jobAttributes.coresPerNode,
     maxMinutes: app.definition.jobAttributes.maxMinutes,
     archiveSystemId:
-      defaultSystem || app.definition.jobAttributes.archiveSystemId,
+      app.definition.jobAttributes.archiveSystemId || defaultSystem,
     archiveSystemDir: app.definition.jobAttributes.archiveSystemDir,
     archiveOnAppError: true,
     appId: app.definition.id,
@@ -785,14 +785,19 @@ export const AppSchemaForm = ({ app }) => {
                         description="System into which output files are archived after application execution."
                         name="archiveSystemId"
                         type="text"
-                        placeholder={defaultSystem}
+                        placeholder={
+                          app.definition.archiveSystemId || defaultSystem
+                        }
                       />
                       <FormField
                         label="Archive Directory"
                         description="Directory into which output files are archived after application execution."
                         name="archiveSystemDir"
                         type="text"
-                        placeholder="HOST_EVAL($WORK)/tapis-jobs-archive/${JobCreateDate}/${JobName}-${JobUUID}" // TODOv3: Determine safe root path for archiving https://jira.tacc.utexas.edu/browse/WP-103
+                        placeholder={
+                          app.definition.archiveSystemDir ||
+                          'HOST_EVAL($HOME)/tapis-jobs-archive/${JobCreateDate}/${JobName}-${JobUUID}'
+                        }
                       />
                     </>
                   ) : null}

diff --git a/client/src/components/Applications/AppForm/AppForm.test.js b/client/src/components/Applications/AppForm/AppForm.test.js
@@ -72,11 +72,20 @@ describe('AppSchemaForm', () => {
       ...initialMockState,
     });
 
-    const { getByText } = renderAppSchemaFormComponent(store, {
+    const { getByText, container } = renderAppSchemaFormComponent(store, {
       ...helloWorldAppFixture,
     });
+
+    const archiveSystemId = container.querySelector(
+      'input[name="archiveSystemId"]'
+    );
     await waitFor(() => {
       expect(getByText(/TACC-ACI/)).toBeDefined();
+
+      // use app definition default archive system
+      expect(archiveSystemId.value).toBe(
+        helloWorldAppFixture.definition.jobAttributes.archiveSystemId
+      );
     });
   });
 

diff --git a/client/src/components/Applications/AppForm/fixtures/AppForm.app.fixture.js b/client/src/components/Applications/AppForm/fixtures/AppForm.app.fixture.js
@@ -26,7 +26,7 @@ export const helloWorldAppFixture = {
       execSystemInputDir: '${JobWorkingDir}',
       execSystemOutputDir: '${JobWorkingDir}/output',
       execSystemLogicalQueue: 'development',
-      archiveSystemId: 'cloud.data',
+      archiveSystemId: 'frontera',
       archiveSystemDir:
         'HOST_EVAL($HOME)/tapis-jobs-archive/${JobCreateDate}/${JobName}-${JobUUID}',
       archiveOnAppError: true,

diff --git a/server/portal/apps/workspace/api/views.py b/server/portal/apps/workspace/api/views.py
@@ -459,6 +459,7 @@ def getPublicApps(self, user):
 
                 categoryResult["apps"].append(app)
 
+            categoryResult["apps"] = sorted(categoryResult["apps"], key=lambda app: app['label'] or app['appId'])
             categories.append(categoryResult)
 
         return categories, html_definitions