Task/WP-80 Implement dynamic execution system selection

client/src/components/Applications/AppForm/AppFormUtils.js

@@ -1,11 +1,13 @@
 import * as Yup from 'yup';
-import { getSystemName } from 'utils/systems';
+import { getExecSystemFromId } from 'utils/apps';
 
 export const TARGET_PATH_FIELD_PREFIX = '_TargetPath_';
 
-export const getQueueMaxMinutes = (app, queueName) => {
-  return app.exec_sys.batchLogicalQueues.find((q) => q.name === queueName)
-    .maxMinutes;
+export const getQueueMaxMinutes = (exec_sys, queueName) => {
+  return (
+    exec_sys?.batchLogicalQueues.find((q) => q.name === queueName)
+      ?.maxMinutes ?? 0
+  );
 };
 
 /**
@@ -16,6 +18,9 @@ export const getQueueMaxMinutes = (app, queueName) => {
  * @returns {Yup.number()} min/max validation of max minutes
  */
 export const getMaxMinutesValidation = (queue) => {
+  if (!queue) {
+    return Yup.number();
+  }
   return Yup.number()
     .min(
       queue.minMinutes,
@@ -83,6 +88,9 @@ export const createMaxRunTimeRegex = (maxRunTime) => {
  * @returns {Yup.number()} min/max validation of node count
  */
 export const getNodeCountValidation = (queue) => {
+  if (!queue) {
+    return Yup.number();
+  }
   return Yup.number()
     .integer('Node Count must be an integer.')
     .min(
@@ -103,6 +111,9 @@ export const getNodeCountValidation = (queue) => {
  * @returns {Yup.number()} min/max validation of coresPerNode
  */
 export const getCoresPerNodeValidation = (queue) => {
+  if (!queue) {
+    return Yup.number();
+  }
   if (queue.maxCoresPerNode === -1) {
     return Yup.number().integer();
   }
@@ -123,8 +134,9 @@ export const getCoresPerNodeValidation = (queue) => {
  * @returns {Object} updated/fixed values
  */
 export const updateValuesForQueue = (app, values) => {
+  const exec_sys = getExecSystemFromId(app, values.execSystemId);
   const updatedValues = { ...values };
-  const queue = app.exec_sys.batchLogicalQueues.find(
+  const queue = exec_sys.batchLogicalQueues.find(
     (q) => q.name === values.execSystemLogicalQueue
   );
 
@@ -168,6 +180,81 @@ export const updateValuesForQueue = (app, values) => {
   return updatedValues;
 };
 
+/**
+ * Get the default queue for a execution system.
+ * Queue Name determination order:
+ *   1. Use given queue name.
+ *   2. Otherwise, use the app default queue.
+ *   3. Otherwise, use the execution system default queue.
+ *
+ * @function
+ * @param {any} app App Shape defined in AppForm.jsx
+ * @param {any} exec_sys execution system, shape defined in AppForm.jsx
+ * @returns {String} queue_name nullable, queue name to lookup
+ */
+export const getQueueValueForExecSystem = (app, exec_sys, queue_name) => {
+  const queueName =
+    queue_name ??
+    app.definition.jobAttributes.execSystemLogicalQueue ??
+    exec_sys?.batchDefaultLogicalQueue;
+  return (
+    exec_sys?.batchLogicalQueues.find((q) => q.name === queueName) ||
+    exec_sys?.batchLogicalQueues[0]
+  );
+};
+
+/**
+ * Apply the following two filters and get the list of queues applicable.
+ * Filters:
+ * 1. If Node and Core per Node is enabled, only allow
+ *    queues which match min and max node count with job attributes
+ * 2. if queue filter list is set, only allow queues in that list.
+ * @returns list of queues in sorted order
+ */
+export const getAppQueueValues = (app, queues) => {
+  /*
+    Hide queues for which the app default nodeCount does not meet the minimum or maximum requirements
+    while hideNodeCountAndCoresPerNode is true
+    */
+  return (queues ?? [])
+    .filter(
+      (q) =>
+        !app.definition.notes.hideNodeCountAndCoresPerNode ||
+        (app.definition.jobAttributes.nodeCount >= q.minNodeCount &&
+          app.definition.jobAttributes.nodeCount <= q.maxNodeCount)
+    )
+    .map((q) => q.name)
+    .filter((queueName) =>
+      app.definition.notes.queueFilter
+        ? app.definition.notes.queueFilter.includes(queueName)
+        : true
+    )
+    .sort();
+};
+
+/**
+ * Build a map of allocations applicable to each execution
+ * system based on the host match.
+ * Handle case where dynamic execution system is provided.
+ * If there is no allocation for a given exec system, skip it.
+ * @param {*} app
+ * @param {*} allocations
+ * @returns a Map of allocations applicable to each execution system.
+ */
+export const matchExecSysWithAllocations = (app, allocations) => {
+  return app.execSystems.reduce((map, exec_sys) => {
+    const matchingExecutionHost = Object.keys(allocations.hosts).find(
+      (host) => exec_sys.host === host || exec_sys.host.endsWith(`.${host}`)
+    );
+
+    if (matchingExecutionHost) {
+      map.set(exec_sys.id, allocations.hosts[matchingExecutionHost]);
+    }
+
+    return map;
+  }, new Map());
+};
+
 /**
  * Get the field name used for target path in AppForm
  *
@@ -236,3 +323,31 @@ export const checkAndSetDefaultTargetPath = (targetPathFieldValue) => {
 
   return targetPathFieldValue;
 };
+
+/**
+ * Gets the execution systems with portal's default allocation.
+ * It will return empty list, if there is no allocation system matching portal's
+ * default allocation.
+ * @param {Map} execSystemAllocationsMap
+ * @param {String} portalAllocation
+ */
+export const getExecSystemsForPortalAllocation = (
+  execSystemAllocationsMap,
+  portalAllocation
+) => {
+  // Look at each execution system and its corressponding allocations
+  // Gather all execution system whose allocation is the default portal allocation.
+  const execSystems = [];
+  execSystemAllocationsMap.forEach((execAllocations, execSystem) => {
+    if (execAllocations.includes(portalAllocation)) {
+      execSystems.push(execSystem);
+    }
+  });
+  // If user does not have any execution systems matching portalAllocation,
+  // this list will be empty.
+  return execSystems;
+};
+
+export const isAppUsingDynamicExecSystem = (app) => {
+  return !!app.definition.notes.dynamicExecSystems;
+};

client/src/components/Applications/AppForm/AppFormUtils.test.js

@@ -3,12 +3,14 @@ import { helloWorldAppFixture } from './fixtures/AppForm.app.fixture';
 import { getNodeCountValidation, updateValuesForQueue } from './AppFormUtils';
 
 describe('AppFormUtils', () => {
-  const normalQueue = helloWorldAppFixture.exec_sys.batchLogicalQueues.find(
-    (q) => q.name === 'normal'
-  );
-  const smallQueue = helloWorldAppFixture.exec_sys.batchLogicalQueues.find(
-    (q) => q.name === 'small'
-  );
+  const normalQueue =
+    helloWorldAppFixture.execSystems[0].batchLogicalQueues.find(
+      (q) => q.name === 'normal'
+    );
+  const smallQueue =
+    helloWorldAppFixture.execSystems[0].batchLogicalQueues.find(
+      (q) => q.name === 'small'
+    );
 
   const parallelFronteraApp = {
     ...helloWorldAppFixture,
@@ -37,6 +39,7 @@ describe('AppFormUtils', () => {
     nodeCount: 1,
     coresPerNode: 1,
     maxMinutes: '',
+    execSystemId: 'frontera',
   };
 
   it('handles node count validation', () => {