task/WP-288-QueueFilter-v1

TACC · Oct 10, 2023 · ff2cd88 · ff2cd88
1 parent a0ade92
commit ff2cd88
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/client/src/components/Applications/AppForm/AppForm.jsx b/client/src/components/Applications/AppForm/AppForm.jsx
@@ -44,6 +44,7 @@ const appShape = PropTypes.shape({
     coresPerNode: PropTypes.number,
     maxMinutes: PropTypes.number,
     tags: PropTypes.arrayOf(PropTypes.string),
+    queueFilter: PropTypes.arrayOf(PropTypes.string),
   }),
   systemNeedsKeys: PropTypes.bool,
   pushKeysSystem: PropTypes.shape({}),
@@ -268,6 +269,7 @@ export const AppSchemaForm = ({ app }) => {
     appId: app.definition.id,
     appVersion: app.definition.version,
     execSystemId: app.definition.jobAttributes.execSystemId,
+    queueFilter: app.definition.notes.queueFilter,
   };
 
   let missingAllocation = false;
@@ -691,11 +693,21 @@ export const AppSchemaForm = ({ app }) => {
                         )
                         .map((q) => q.name)
                         .sort()
-                        .map((queueName) => (
-                          <option key={queueName} value={queueName}>
-                            {queueName}
-                          </option>
-                        ))
+                        .map((queueName) =>
+                          app.definition.notes.queueFilter ? (
+                            app.definition.notes.queueFilter.includes(
+                              queueName
+                            ) && (
+                              <option key={queueName} value={queueName}>
+                                {queueName}
+                              </option>
+                            )
+                          ) : (
+                            <option key={queueName} value={queueName}>
+                              {queueName}
+                            </option>
+                          )
+                        )
                         .sort()}
                     </FormField>
                   )}