Merge pull request #157 from parodos-dev/pc/remove-assessment-task-check

remove assessmentTask

plugins/parodos/config.d.ts

@@ -6,11 +6,6 @@ export interface Config {
        * @visibility frontend
        */
       assessment: string;
-      /**
-       * TODO: description
-       * @visibility frontend
-       */
-      assessmentTask: string;
     };
     /**
      * TODO: description

plugins/parodos/src/components/TestApp.tsx

@@ -23,7 +23,6 @@ export const TestApp: React.FC = ({ children }) => {
     parodos: {
       workflows: {
         assessment: 'onboardingAssessment_ASSESSMENT_WORKFLOW',
-        assessmentTask: 'onboardingAssessmentTask',
       },
       pollingInterval: 5000,
     },

plugins/parodos/src/components/api/useGetAppConfig.ts

@@ -10,7 +10,6 @@ export const useGetAppConfig = (): ParodosConfig => {
       backendUrl: configApi.getString('backend.baseUrl'),
       workflows: {
         assessment: configApi.getString('parodos.workflows.assessment'),
-        assessmentTask: configApi.getString('parodos.workflows.assessmentTask'),
       },
       pollingInterval: configApi.getNumber('parodos.pollingInterval'),
     }),

plugins/parodos/src/components/workflow/Workflow.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import {
   ContentHeader,
   InfoCard,
+  Progress,
   SupportButton,
 } from '@backstage/core-components';
 import { errorApiRef, useApi } from '@backstage/core-plugin-api';
@@ -40,7 +41,6 @@ const useStyles = makeStyles(theme => ({
 
 export function Workflow(): JSX.Element {
   const assessment = useStore(state => state.workflows.assessment);
-  const assessmentTask = useStore(state => state.workflows.assessmentTask);
   const [searchParams] = useSearchParams();
   const selectedProject = useStore(state =>
     state.getProjectById(searchParams.get('project')),
@@ -57,7 +57,7 @@ export function Workflow(): JSX.Element {
   const formSchema = useGetProjectAssessmentSchema();
 
   const [{ error: createWorkflowError, loading: _ }, createWorkflow] =
-    useCreateWorkflow({ assessment, assessmentTask });
+    useCreateWorkflow({ assessment });
 
   const [{ error: startAssessmentError }, startAssessment] = useAsyncFn(
     async ({ formData }: IChangeEvent<Record<string, ProjectsPayload>>) => {
@@ -66,7 +66,7 @@ export function Workflow(): JSX.Element {
       setAssessmentStatus('inprogress');
 
       setWorkflowOptions(
-        await createWorkflow({ workflowProject: selectedProject, formData }),
+        await createWorkflow({ project: selectedProject, formData }),
       );
 
       setAssessmentStatus('complete');
@@ -100,6 +100,7 @@ export function Workflow(): JSX.Element {
         Select a project for an assessment of what additional workflows, if any,
         it qualifies for.
       </Typography>
+      {inProgress && <Progress />}
       {formSchema && (
         <InfoCard className={styles.fullHeight}>
           <Grid container direction="row" className={styles.form}>

plugins/parodos/src/components/workflow/hooks/useCreateWorkflow.ts

@@ -11,6 +11,8 @@ import { useStore } from '../../../stores/workflowStore/workflowStore';
 import { fetchApiRef, useApi } from '@backstage/core-plugin-api';
 import { getWorkflowOptions } from './getWorkflowOptions';
 import { pollWorkflowStatus } from './pollWorkflowStatus';
+import { getWorklfowsPayload } from './workflowsPayload';
+import assert from 'assert-ts';
 
 export type WorkflowOptionsListItem = WorkflowOptionItem & { type: string };
 
@@ -21,47 +23,34 @@ export interface ProjectsPayload {
   project?: Project;
 }
 
-export function useCreateWorkflow({
-  assessment,
-  assessmentTask,
-}: {
-  assessment: string;
-  assessmentTask: string;
-}) {
+export function useCreateWorkflow({ assessment }: { assessment: string }) {
   const workflowsUrl = useStore(state => state.getApiUrl(urls.Workflows));
+  const assessmentWorkflow = useStore(state =>
+    state.getWorkDefinitionBy('byName', assessment),
+  );
+
+  assert(!!assessmentWorkflow, `no assessmentWorkflow found for ${assessment}`);
+
   const { fetch } = useApi(fetchApiRef);
 
   return useAsyncFn(
     async ({
-      workflowProject,
+      project,
       formData,
     }: {
-      workflowProject: Project;
+      project: Project;
       formData: Record<string, ProjectsPayload>;
     }) => {
-      delete formData[assessmentTask].project;
+      const payload = getWorklfowsPayload({
+        projectId: project.id,
+        workflow: assessmentWorkflow,
+        schema: formData,
+      });
 
       // TODO:  task here should be dynamic based on assessment workflow definition
       const workFlowResponse = await fetch(workflowsUrl, {
         method: 'POST',
-        body: JSON.stringify({
-          projectId: workflowProject.id,
-          workFlowName: assessment,
-          works: [
-            {
-              type: 'TASK',
-              workName: assessmentTask,
-              arguments: Object.entries(formData[assessmentTask]).map(
-                ([key, value]) => {
-                  return {
-                    key: key,
-                    value: value,
-                  };
-                },
-              ),
-            },
-          ],
-        }),
+        body: JSON.stringify(payload),
       });
 
       if (!workFlowResponse.ok) {
@@ -96,6 +85,6 @@ export function useCreateWorkflow({
 
       return options;
     },
-    [assessment, assessmentTask, fetch, workflowsUrl],
+    [assessmentWorkflow, fetch, workflowsUrl],
   );
 }

plugins/parodos/src/hooks/useInitializeStore.ts

@@ -29,23 +29,14 @@ export const useInitializeStore = () => {
       return;
     }
 
-    const { assessment, assessmentTask } = appConfig.workflows;
+    const { assessment } = appConfig.workflows;
 
     const assessmentWorkflow = getWorkDefinitionBy('byName', assessment);
 
     assert(
       !!assessmentWorkflow,
       `invalid workflow config for assessment ${assessment}`,
     );
-
-    const assessmentWorkflowTask = assessmentWorkflow?.works.find(
-      w => w.name === assessmentTask,
-    );
-
-    assert(
-      !!assessmentWorkflowTask,
-      `no assessment task named ${assessmentTask} found in ${assessment} works array`,
-    );
   }, [appConfig.workflows, getWorkDefinitionBy, workflowDefinitions]);
 
   return {

plugins/parodos/src/stores/slices/uiSlice.ts

@@ -13,7 +13,6 @@ export const createUISlice: StateCreator<
   pollingInterval: 0,
   workflows: {
     assessment: '',
-    assessmentTask: '',
   },
   getApiUrl(url: string) {
     return `${get().baseUrl}${url}`;
@@ -23,7 +22,6 @@ export const createUISlice: StateCreator<
       unstable_batchedUpdates(() => {
         state.baseUrl = config.backendUrl;
         state.workflows.assessment = config.workflows.assessment;
-        state.workflows.assessmentTask = config.workflows.assessmentTask;
         state.pollingInterval = config.pollingInterval;
       }, false);
     });

plugins/parodos/src/types.tsx

@@ -2,7 +2,6 @@ export interface ParodosConfig {
   backendUrl: string;
   workflows: {
     assessment: string;
-    assessmentTask: string;
   };
   pollingInterval: number;
 }