Cleanup

src/ApiServer/index.js

@@ -98,7 +98,7 @@ export function startApiServer({ environment = "test", timing = 0 } = {}) {
         return schema.db.availableParameters[0].data;
       });
 
-      this.get(serviceUrl.getWorkflowTemplates(), (schema) => {
+      this.get(serviceUrl.template.getWorkflowTemplates(), (schema) => {
         return schema.db.workflowTemplates[0];
       });
 

src/Components/CreateTemplateWorkflow/CreateTemplateWorkflow.tsx

@@ -23,7 +23,7 @@ function CreateTemplateWorkflow({ team, workflowList }: CreateTemplateWorkflowPr
   const queryClient = useQueryClient();
   const history = useHistory();
   const workflowQuotasEnabled: boolean = useFeature(FeatureFlag.WorkflowQuotasEnabled);
-  const workflowTemplatesUrl = serviceUrl.getWorkflowTemplates();
+  const workflowTemplatesUrl = serviceUrl.template.getWorkflowTemplates();
 
   //WorkflowTemplates are global Tasks only
   const queryTasksUrl = serviceUrl.task.queryTasks({ query: "" });

src/Components/CreateWorkflow/CreateWorkflow.tsx

@@ -39,7 +39,7 @@ const CreateWorkflow: React.FC<CreateWorkflowProps> = ({ team, hasReachedWorkflo
         <ToastNotification kind="success" title={`Create ${viewType}`} subtitle={`${viewType} successfully created`} />,
       );
       if (viewType === WorkflowView.Template) {
-        queryClient.invalidateQueries(serviceUrl.getWorkflowTemplates());
+        queryClient.invalidateQueries(serviceUrl.template.getWorkflowTemplates());
       } else {
         queryClient.invalidateQueries(serviceUrl.team.workflow.getWorkflows({ team: team?.name }));
       }
@@ -63,7 +63,7 @@ const CreateWorkflow: React.FC<CreateWorkflowProps> = ({ team, hasReachedWorkflo
         <ToastNotification kind="success" title={`Update ${viewType}`} subtitle={`${viewType} successfully updated`} />,
       );
       if (viewType === WorkflowView.Template) {
-        queryClient.invalidateQueries(serviceUrl.getWorkflowTemplates());
+        queryClient.invalidateQueries(serviceUrl.template.getWorkflowTemplates());
       } else {
         queryClient.invalidateQueries(serviceUrl.team.workflow.getWorkflows({ team: team?.name }));
       }

src/Components/WorkflowCard/WorkflowCard.tsx

@@ -80,7 +80,7 @@ const WorkflowCard: React.FC<WorkflowCardProps> = ({ teamName, quotas, workflow,
         <ToastNotification kind="success" title={`Delete ${viewType}`} subtitle={`${viewType} successfully deleted`} />,
       );
       if (viewType === WorkflowView.Template) {
-        queryClient.invalidateQueries(serviceUrl.getWorkflowTemplates());
+        queryClient.invalidateQueries(serviceUrl.template.getWorkflowTemplates());
       } else {
         queryClient.invalidateQueries(getWorkflowsUrl);
       }
@@ -106,7 +106,7 @@ const WorkflowCard: React.FC<WorkflowCardProps> = ({ teamName, quotas, workflow,
         />,
       );
       if (viewType === WorkflowView.Template) {
-        queryClient.invalidateQueries(serviceUrl.getWorkflowTemplates());
+        queryClient.invalidateQueries(serviceUrl.template.getWorkflowTemplates());
       } else {
         queryClient.invalidateQueries(getWorkflowsUrl);
       }

src/Config/servicesConfig.ts

@@ -84,7 +84,6 @@ export const serviceUrl = {
   // postImportWorkflow: ({ query }) => `${BASE_URL}/workflow/import?${query}`,
   putActivationApp: () => `${BASE_URL}/activate`,
   resourceSettings: () => `${BASE_URL}/settings`,
-  getWorkflowTemplates: () => `${BASE_URL}/workflowtemplate/query`,
   resourceTrigger: () => `${BASE_URL}/trigger`,
   getGitHubAppInstallation: ({ id }: IdArg) => `${BASE_URL}/integration/github/installation${id ? "?id=" + id : ""}`,
   getGitHubAppInstallationForTeam: ({ team }: TeamArg) => `${BASE_URL}/integration/github/installation${team ? "?team=" + team : ""}`,
@@ -103,6 +102,10 @@ export const serviceUrl = {
     putTask: ({ name, replace }: NameArg & Partial<ReplaceArg>) => `${BASE_URL}/task/${name}/?replace=${replace ? replace : false}`,
     postValidateYaml: () => `${BASE_URL}/task/validate`,
   },
+  "template": {
+    getWorkflowTemplates: () => `${BASE_URL}/workflowtemplate/query`,
+    postWorkflowTemplate: () => `${BASE_URL}/workflowtemplate`,
+  },
   "team": {
     deleteTeamMembers: ({ team }: TeamArg) => `${BASE_URL}/team/${team}/members`,
     leaveTeam: ({ team }: TeamArg) => `${BASE_URL}/team/${team}/leave`,
@@ -209,9 +212,9 @@ export const resolver = {
       data: body,
       method: HttpMethod.Post,
     }),
-  postCreateTemplate: ({ body }) => axios.post(serviceUrl.getWorkflowTemplates(), body),
+  postCreateTemplate: ({ body }) => axios.post(serviceUrl.workflowtemplate.postWorkflowTemplate(), body),
   postCreateWorkflow: ({ team, body }) => axios.post(serviceUrl.team.workflow.postCreateWorkflow({ team }), body),
-  postDuplicateWorkflow: ({ team, workflowId }) => axios.post(serviceUrl.postDuplicateWorkflow({ team, workflowId })),
+  postDuplicateWorkflow: ({ team, workflowId }) => axios.post(serviceUrl.team.workflow.postDuplicateWorkflow({ team, workflowId })),
   postTemplateWorkflow: ({ workflowId, body }) => axios.post(serviceUrl.postDuplicateWorkflow({ workflowId }), body),
   postToken: ({ body }) => axios({ url: serviceUrl.postToken(), data: body, method: HttpMethod.Post }),
   putApplyTaskTemplate: ({ name, replace, body }) =>

src/Features/TemplateWorkflows/TemplateWorkflows.tsx

@@ -22,7 +22,7 @@ export default function TemplateWorkflows() {
     data: templatesWorkflowData,
     error: errorTemplatesWorkflow,
     isLoading: isLoadingTemplatesWorkflow,
-  } = useQuery(serviceUrl.getWorkflowTemplates());
+  } = useQuery(serviceUrl.template.getWorkflowTemplates());
 
   let safeQuery = "";
   if (Array.isArray(searchQuery)) {