POST to job_templates/{id}/labels endpoint rather than /labels endpoint.

ansible · Jul 20, 2023 · 10806e8 · 10806e8
1 parent fc1b74a
commit 10806e8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/awx/ui/src/components/LaunchPrompt/LaunchPrompt.js b/awx/ui/src/components/LaunchPrompt/LaunchPrompt.js
@@ -5,7 +5,7 @@ import { Formik, useFormikContext } from 'formik';
 import { useDismissableError } from 'hooks/useRequest';
 import mergeExtraVars from 'util/prompt/mergeExtraVars';
 import getSurveyValues from 'util/prompt/getSurveyValues';
-import createNewLabels from 'util/labels';
+import { createNewLabelsOnLaunch } from 'util/labels';
 import ContentLoading from '../ContentLoading';
 import ContentError from '../ContentError';
 import useLaunchSteps from './useLaunchSteps';
@@ -67,7 +67,6 @@ function PromptModalForm({
     setValue('forks', values.forks);
     setValue('job_slice_count', values.job_slice_count);
     setValue('execution_environment', values.execution_environment?.id);
-
     if (launchConfig.ask_instance_groups_on_launch) {
       const instanceGroupIds = [];
       values.instance_groups.forEach((instance_group) => {
@@ -77,14 +76,9 @@ function PromptModalForm({
     }
 
     if (launchConfig.ask_labels_on_launch) {
-      const { labelIds } = createNewLabels(
-        values.labels,
-        resource.organization
-      );
-
+      const { labelIds } = createNewLabelsOnLaunch(values.labels, resource);
       setValue('labels', labelIds);
     }
-
     onSubmit(postValues);
   };
   const { error, dismissError } = useDismissableError(contentError);

diff --git a/awx/ui/src/components/Schedule/ScheduleEdit/ScheduleEdit.js b/awx/ui/src/components/Schedule/ScheduleEdit/ScheduleEdit.js
@@ -8,7 +8,7 @@ import { getAddedAndRemoved } from 'util/lists';
 import { parseVariableField } from 'util/yaml';
 import mergeExtraVars from 'util/prompt/mergeExtraVars';
 import getSurveyValues from 'util/prompt/getSurveyValues';
-import createNewLabels from 'util/labels';
+import { createNewLabels } from 'util/labels';
 import ScheduleForm from '../shared/ScheduleForm';
 import buildRuleSet from '../shared/buildRuleSet';
 import { CardBody } from '../../Card';

diff --git a/awx/ui/src/util/labels.js b/awx/ui/src/util/labels.js
@@ -1,6 +1,6 @@
-import { LabelsAPI, OrganizationsAPI } from '../api';
+import { LabelsAPI, OrganizationsAPI, JobTemplatesAPI } from '../api';
 
-async function createNewLabels(labels = [], organization = null) {
+export async function createNewLabels(labels = [], organization = null) {
   let error = null;
   const labelIds = [];
 
@@ -54,4 +54,32 @@ async function createNewLabels(labels = [], organization = null) {
   };
 }
 
-export default createNewLabels;
+export async function createNewLabelsOnLaunch(labels = [], resource = null) {
+  let error = null;
+  const labelIds = [];
+
+  try {
+    const labelRequests = [];
+    const jobTemplateId = resource.id;
+    const orgId = resource.organization;
+
+    labels.forEach((label) => {
+      labelRequests.push(
+        JobTemplatesAPI.associateLabel(jobTemplateId, label, orgId).then(
+          ({ data }) => {
+            labelIds.push(data.id);
+          }
+        )
+      );
+    });
+
+    await Promise.all(labelRequests);
+  } catch (err) {
+    error = err;
+  }
+
+  return {
+    labelIds,
+    error,
+  };
+}