@abgov/nx-adsp 5.9.0-beta.5 → 5.9.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "5.9.0-beta.5",
+  "version": "5.9.0-beta.6",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for ADSP apps.",

package/src/generators/react-form/files/__fileName__/__fileName__.module.css__tmpl__

@@ -3,6 +3,7 @@
   
   > fieldset {
     display: none;
+    padding-bottom: 64px;
   }
 
   > fieldset.show {
@@ -10,6 +11,15 @@
   }
 }
 
+.formFile {
+  display: flex;
+  align-items: center;
+
+  > a {
+    display: none;
+  }
+}
+
 .formActions {  
   display: flex;
   margin-top: 16px;

package/src/generators/react-form/files/__fileName__/__fileName__.slice.ts__tmpl__

@@ -13,6 +13,9 @@ import { CONFIG_FEATURE_KEY, ConfigState } from '../config.slice';
 export const <%= constantName %>_FEATURE_KEY = '<%= fileName %>';
 const FORM_DEFINITION_ID = '<%= id %>';
 const FORM_SERVICE_ID = 'urn:ads:platform:form-service';
+const FILE_TYPE_ID = '<%= fileName %>-files';
+const FILE_SERVICE_ID = 'urn:ads:platform:file-service';
+const FILE_SERVICE_RESOURCE_PREFIX = `${FILE_SERVICE_ID}:v1:`;
 
 /*
  * Update these interfaces according to your requirements.
@@ -38,15 +41,26 @@ const required: Record<string, string[]> = {
 type FormStatus = 'draft' | 'locked' | 'submitted';
 type SectionCompletion = 'complete' | 'incomplete' | null;
 
+export interface FileInformation {
+  urn?: string;
+  filename: string;
+  progress: number;
+  size: number;
+  dataUri?: string;
+}
+
 export interface <%= className %>State {
   formId: string;
   status: FormStatus;
   step: number;
   values: <%= className %>;
+  files: Record<string, FileInformation>;
   errors: Record<string, Record<string, boolean>>;
   complete: Record<string, SectionCompletion>;
   busy: {
     loading: boolean;
+    loadingFiles: boolean;
+    uploadingFile: boolean;
     saving: boolean;
     submitting: boolean;
   };
@@ -88,6 +102,13 @@ function areSectionsComplete(
   return complete;
 }
 
+function getFileUrl(directory: Record<string, string>, urn: string): URL {
+  return new URL(
+    urn.replace(FILE_SERVICE_RESOURCE_PREFIX, 'v1'),
+    `${directory[FILE_SERVICE_ID]}/file/v1`
+  );
+}
+
 /**
  * Export an effect using createAsyncThunk from
  * the Redux Toolkit: https://redux-toolkit.js.org/api/createAsyncThunk
@@ -107,7 +128,7 @@ function areSectionsComplete(
  */
 export const initializeForm = createAsyncThunk(
   '<%= propertyName %>/initialize',
-  async (_, { getState }) => {
+  async (_, { dispatch, getState }) => {
     const state = getState();
     const { user }: UserState = state['user'];
     if (!user) {
@@ -160,18 +181,80 @@ export const initializeForm = createAsyncThunk(
     const { data } = await axios.get<{
       id: string;
       data: <%= className %>;
+      files: Record<string, string>;
     }>(`${directory[FORM_SERVICE_ID]}/form/v1/forms/${form.id}/data`, {
       headers: {
         Authorization: `Bearer ${user.access_token}`,
       },
     });
 
+    dispatch(getFileMetadata(data.files));
+
     const complete = areSectionsComplete(data.data);
 
     return { ...form, ...data, complete };
   }
 );
 
+export const getFileMetadata = createAsyncThunk(
+  '<%= propertyName %>/get-file-metadata',
+  async (files: Record<string, string>, { getState }) => {
+    const state = getState();
+    const { user }: UserState = state['user'];
+    const { directory }: ConfigState = state[CONFIG_FEATURE_KEY];
+
+    const metadata: Record<string, FileInformation> = {};
+    for (const [key, urn] of Object.entries(files)) {
+      const { data } = await axios.get<FileInformation>(
+        getFileUrl(directory, urn).href,
+        {
+          headers: { Authorization: `Bearer ${user.access_token}` },
+        }
+      );
+
+      metadata[key] = {
+        urn: data.urn,
+        filename: data.filename,
+        size: data.size,
+        progress: 100,
+      };
+    }
+
+    return metadata;
+  }
+);
+
+export const downloadFile = createAsyncThunk(
+  '<%= propertyName %>/download-file',
+  async (
+    { key, file }: { key: string; file: FileInformation },
+    { getState }
+  ) => {
+    const state = getState();
+    const { user }: UserState = state['user'];
+    const { directory }: ConfigState = state[CONFIG_FEATURE_KEY];
+
+    let uri = file.dataUri;
+    if (!uri) {
+      const { data } = await axios.get(
+        `${getFileUrl(directory, file.urn).href}/download`,
+        {
+          responseType: 'arraybuffer',
+          headers: { Authorization: `Bearer ${user.access_token}` },
+        }
+      );
+      uri = URL.createObjectURL(new Blob([data]));
+
+      const anchor = document.createElement('a');
+      anchor.href = uri;
+      anchor.setAttribute('download', file.filename);
+      anchor.click();
+    }
+
+    return uri;
+  }
+);
+
 const formSaved = createAction(
   '<%= propertyName %>/saved',
   (values: <%= className %>) => ({ payload: values })
@@ -185,7 +268,13 @@ const formSaveRejected = createAction(
 const queueSaveForm = createAsyncThunk(
   '<%= propertyName %>/queue-save',
   debounce(
-    async (values: <%= className %>, { dispatch, getState }) => {
+    async (
+      {
+        values,
+        files,
+      }: { values: <%= className %>; files: Record<string, FileInformation> },
+      { dispatch, getState }
+    ) => {
       const state = getState();
       const { user }: UserState = state['user'];
       const { directory }: ConfigState = state[CONFIG_FEATURE_KEY];      
@@ -194,7 +283,16 @@ const queueSaveForm = createAsyncThunk(
       try {
         await axios.put(
           `${directory[FORM_SERVICE_ID]}/form/v1/forms/${formId}/data`,
-          { data: values },
+          {
+            data: values,
+            files: Object.entries(files).reduce((fileValues, [key, file]) => {
+              if (file) {
+                fileValues[key] = file.urn;
+              }
+
+              return fileValues;
+            }, {} as Record<string, string>),
+          },
           { headers: { Authorization: `Bearer ${user.access_token}` } }
         );
 
@@ -215,7 +313,7 @@ const queueSaveForm = createAsyncThunk(
 
 export const updateForm = createAsyncThunk(
   '<%= propertyName %>/update',
-  async (values: <%= className %>, { dispatch }) => {
+  async (values: <%= className %>, { dispatch, getState }) => {
     const errors: Record<string, Record<string, boolean>> = {};
     let hasError = false;
     Object.entries(rules).forEach(([section, sectionRules]) => {
@@ -236,13 +334,73 @@ export const updateForm = createAsyncThunk(
     const complete = areSectionsComplete(values, errors);
 
     if (!hasError) {
-      dispatch(queueSaveForm(values));
+      const { files }: <%= className %>State = getState()[<%= constantName %>_FEATURE_KEY];
+      dispatch(queueSaveForm({ values, files }));
     }
 
     return { values, complete, errors };
   }
 );
 
+const setFileProgress = createAction(
+  '<%= propertyName %>/set-file-progress',
+  (key: string, progress: number) => {
+    return { payload: { key, progress } };
+  }
+);
+
+export const updateFile = createAsyncThunk(
+  '<%= propertyName %>/update-file',
+  async (
+    { key, old, file }: { key: string; old?: FileInformation; file?: File },
+    { dispatch, getState }
+  ) => {
+    const state = getState();
+    const { user }: UserState = state['user'];
+    const { directory }: ConfigState = state[CONFIG_FEATURE_KEY];
+    const { formId }: <%= className %>State = state[<%= constantName %>_FEATURE_KEY];
+
+    let newFile: FileInformation = null;
+    if (file) {
+      const formData = new FormData();
+      formData.append('type', FILE_TYPE_ID);
+      formData.append('recordId', formId);
+      formData.append('file', file);
+
+      const { data } = await axios.post<Omit<FileInformation, 'progress'>>(
+        `${directory[FILE_SERVICE_ID]}/file/v1/files`,
+        formData,
+        {
+          headers: { Authorization: `Bearer ${user.access_token}` },
+          onUploadProgress: ({ loaded, total }: ProgressEvent) => {
+            const progress = Math.floor((loaded * 100) / total);
+            dispatch(setFileProgress(key, progress));
+          },
+        }
+      );
+
+      newFile = {
+        urn: data.urn,
+        filename: data.filename,
+        size: data.size,
+        progress: 100,
+      };
+    }
+
+    if (old?.urn) {
+      await axios.delete(getFileUrl(directory, old.urn).href, {
+        headers: { Authorization: `Bearer ${user.access_token}` },
+      });
+    }
+
+    const { values, files }: <%= className %>State = getState()[<%= constantName %>_FEATURE_KEY];
+
+    dispatch(queueSaveForm({ values, files: { ...files, [key]: newFile } }));
+
+    return { key, file: newFile };
+  }
+);
+
 export const submitForm = createAsyncThunk(
   '<%= propertyName %>/submit',
   async (_, { getState }) => {
@@ -269,10 +427,13 @@ export const initial<%= className %>State: <%= className %>State = {
   status: null,
   step: 1,
   values: {} as <%= className %>,
+  files: {},
   errors: {},
   complete: {},
   busy: {
     loading: false,
+    loadingFiles: false,
+    uploadingFile: false,
     saving: false,
     submitting: false,
   },
@@ -302,11 +463,49 @@ export const <%= propertyName %>Slice = createSlice({
       .addCase(initializeForm.rejected, (state) => {
         state.busy.loading = false;
       })
+      .addCase(getFileMetadata.pending, (state) => {
+        state.busy.loadingFiles = true;
+      })
+      .addCase(getFileMetadata.fulfilled, (state, action) => {
+        state.busy.loadingFiles = false;
+        state.files = action.payload;
+      })
+      .addCase(getFileMetadata.rejected, (state) => {
+        state.busy.loadingFiles = false;
+      })
+      .addCase(downloadFile.fulfilled, (state, action) => {
+        if (state.files[action.meta.arg.key]) {
+          state.files[action.meta.arg.key].dataUri = action.payload;
+        }
+      })
       .addCase(updateForm.fulfilled, (state, action) => {
         state.values = action.payload.values;
         state.complete = action.payload.complete;
         state.errors = action.payload.errors;
       })
+      .addCase(updateFile.pending, (state, action) => {
+        const file = action.meta.arg.file;
+        state.busy.uploadingFile = true;
+        state.files[action.meta.arg.key] = file
+          ? {
+              filename: file.name,
+              size: file.size,
+              progress: 0,
+            }
+          : null;
+      })
+      .addCase(updateFile.fulfilled, (state, action) => {
+        state.busy.uploadingFile = false;
+        state.files[action.payload.key] = action.payload.file;
+      })
+      .addCase(updateFile.rejected, (state) => {
+        state.busy.uploadingFile = false;
+      })
+      .addCase(setFileProgress, (state, action) => {
+        if (state.files[action.payload.key]) {
+          state.files[action.payload.key].progress = action.payload.progress;
+        }
+      })
       .addCase(queueSaveForm.pending, (state) => {
         state.busy.saving = true;
       })
@@ -393,6 +592,11 @@ export const getFormValues = createSelector(
   (state) => state.values
 );
 
+export const getFormFiles = createSelector(
+  get<%= className %>State,
+  (state) => state.files
+);
+
 export const getFormErrors = createSelector(
   get<%= className %>State,
   (state) => state.errors

package/src/generators/react-form/files/__fileName__/__fileName__.tsx__tmpl__

@@ -6,9 +6,12 @@ import {
   GoADivider,
   GoADropdown,
   GoADropdownItem,
+  GoAFileUploadCard,
+  GoAFileUploadInput,
   GoAFormItem,
   GoAFormStep,
   GoAFormStepper,
+  GoAIconButton,
   GoAInput,
   GoAInputDate,
   GoAInputDateTime,
@@ -17,14 +20,20 @@ import {
   GoASpinner,
   GoATextArea,
 } from '@abgov/react-components';
-import { FunctionComponent, useEffect } from 'react';
+import { 
+  FunctionComponent,
+  useEffect,
+  useRef, 
+} from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { AppDispatch } from '../../store';
 import {
+  FileInformation,
   getFormBusy,
   getFormCanSubmit,
   getFormComplete,
   getFormErrors,
+  getFormFiles,
   getFormInReview,
   getFormStatus,
   getFormStep,
@@ -33,6 +42,8 @@ import {
   submitForm,
   <%= propertyName %>Actions,
   updateForm,
+  updateFile,
+  downloadFile,
 } from './<%= fileName %>.slice';
 import styles from './<%= fileName %>.module.css';
 
@@ -50,13 +61,44 @@ function onArrayItemChange(
   onChange({ ...value, [arrayProperty]: updatedArray });
 }
 
+interface FormFileProps {
+  property: string;
+  file: FileInformation;
+}
+
+const FormFile: FunctionComponent<FormFileProps> = ({ property, file }) => {
+  const anchorRef = useRef<HTMLAnchorElement>();
+  const dispatch = useDispatch<AppDispatch>();
+  return (
+    <div className={styles.formFile}>
+      <span>{file.filename}</span>
+      <GoAIconButton
+        ml="s"
+        icon="download"
+        onClick={() => {
+          if (file.dataUri) {
+            anchorRef.current.click();
+          } else {
+            dispatch(downloadFile({ key: property, file }));
+          }
+        }}
+      />
+      <a ref={anchorRef} href={file.dataUri} download={file.filename}>
+        Download
+      </a>
+    </div>
+  );
+};
+
 interface FieldSetProps {
   className?: string;
   inReview: boolean;
   isReadOnly: boolean;
   value: Record<string, unknown>;
+  files: Record<string, FileInformation>;
   errors: Record<string, boolean>;
   onChange: (value: Record<string, unknown>) => void;
+  onFileChange: (key: string, old?: FileInformation, file?: File) => void;
   onEdit: () => void;
 }
 
@@ -66,8 +108,10 @@ const <%= section.className %>FieldSet: FunctionComponent<FieldSetProps> = ({
   inReview,
   isReadOnly,
   value,
+  files,
   errors,
   onChange,
+  onFileChange,
   onEdit,
 }) => {
   return (
@@ -95,6 +139,7 @@ export const <%= className %>Form: FunctionComponent = () => {
   const formStatus = useSelector(getFormStatus);
   const formStep = useSelector(getFormStep);
   const formData = useSelector(getFormValues);
+  const formFiles = useSelector(getFormFiles);
   const formErrors = useSelector(getFormErrors);
   const formBusy = useSelector(getFormBusy);
   const formComplete = useSelector(getFormComplete);
@@ -137,10 +182,14 @@ export const <%= className %>Form: FunctionComponent = () => {
             inReview={inReview}
             isReadOnly={formStatus !== 'draft'}
             value={formData.<%= sectionKey %> as any || {}}
+            files={formFiles}
             errors={formErrors['<%= sectionKey %>'] || {}}
             onChange={(value) =>
               dispatch(updateForm({ ...formData, '<%= sectionKey %>': value as any }))
             }
+            onFileChange={(key, old, file) =>
+              dispatch(updateFile({ key, old, file }))
+            }
             onEdit={() => dispatch(<%= propertyName %>Actions.setStep(<%= idx + 1 %>))}
           />
         <%_ }); _%>

package/src/generators/react-form/includes/input-template.ejs

@@ -44,6 +44,32 @@
           value={<%= valueVar %>.<%= key %> ? new Date(<%= valueVar %>.<%= key %> as string) : null}
           onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: (updated as Date)?.toISOString() })}
         />
+      <%_ break;
+        case 'uri': _%>
+        <% if (!inArray) { %>
+          {files['<%= key %>'] ? (
+            isReadOnly || inReview ? (
+              <FormFile property="<%= key %>" file={files['<%= key %>']} />
+            ) : (
+              <GoAFileUploadCard
+                filename={files['<%= key %>'].filename}
+                size={files['<%= key %>'].size}
+                progress={files['<%= key %>'].progress}
+                onDelete={() => onFileChange('<%= key %>', files['<%= key %>'])}
+              />
+            )
+          ) : (
+            !isReadOnly &&
+            !inReview && (
+              <GoAFileUploadInput
+                variant="dragdrop"
+                onSelectFile={(file) =>
+                  onFileChange('<%= key %>', files['<%= key %>'], file)
+                }
+              />
+            )
+          )}
+        <% } %>
       <%_ break;
         default: _%>
         <% if (property.maxLength > 100) { %>

package/src/generators/react-form/react-form.js

@@ -20,13 +20,13 @@ function getFormDefinition(configurationServiceUrl, token) {
         if (choices.length < 1) {
             throw new Error('No form definitions with data schema found.');
         }
-        const result = yield (0, enquirer_1.prompt)({
+        const { definition } = yield (0, enquirer_1.prompt)({
             type: 'autocomplete',
             name: 'definition',
             message: 'Which form definition do you want to generate a component for?',
             choices,
         });
-        const formDefinition = definitions.find((r) => r.name === result.definition);
+        const formDefinition = definitions.find((r) => r.name === definition);
         const general = {
             type: 'object',
             className: 'General',
@@ -46,6 +46,29 @@ function getFormDefinition(configurationServiceUrl, token) {
         if (addGeneral) {
             formDefinition.dataSchema.properties = Object.assign({ general }, formDefinition.dataSchema.properties);
         }
+        const fileTypeName = `${formDefinition.name} files`;
+        const fileTypeId = `${(0, devkit_1.names)(formDefinition.name).fileName}-files`;
+        const { addFileType } = yield (0, enquirer_1.prompt)({
+            type: 'confirm',
+            name: 'addFileType',
+            message: `Create file type (${fileTypeName}) for form files?`,
+        });
+        if (addFileType) {
+            yield axios_1.default.patch(new URL('configuration/v2/configuration/platform/file-service', configurationServiceUrl).href, {
+                operation: 'UPDATE',
+                update: {
+                    [fileTypeId]: {
+                        id: fileTypeId,
+                        name: fileTypeName,
+                        readRoles: formDefinition.assessorRoles,
+                        updateRoles: formDefinition.applicantRoles,
+                        anonymousRead: false,
+                    },
+                },
+            }, {
+                headers: { Authorization: `Bearer ${token}` },
+            });
+        }
         return formDefinition;
     });
 }

package/src/generators/react-form/react-form.js.map

@@ -1 +1 @@
-{"version":3,"file":"react-form.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-form/react-form.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"react-form.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-form/react-form.ts"],"names":[],"mappings":"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"}

package/src/generators/react-form/react-forms.spec.ts

@@ -48,6 +48,8 @@ const formDefinition: FormDefinition = {
       },
     },
   },
+  assessorRoles: [],
+  applicantRoles: [],
 };
 
 jest.mock('@abgov/nx-oc');
@@ -69,7 +71,8 @@ axiosMock.get.mockResolvedValueOnce({
 
 jest.mock('enquirer', () => ({ prompt: jest.fn() }));
 const promptMock = prompt as jest.Mock;
-promptMock.mockResolvedValue({ definition: 'Some Intake' });
+promptMock.mockResolvedValueOnce({ definition: 'Some Intake' });
+promptMock.mockResolvedValueOnce({ addFileType: false });
 
 describe('React Form Generator', () => {
   const options: Schema = {
@@ -91,7 +94,9 @@ describe('React Form Generator', () => {
     });
 
     await generator(host, options);
-    expect(host.exists('apps/test/src/app/some-intake/some-intake.tsx')).toBeTruthy();
+    expect(
+      host.exists('apps/test/src/app/some-intake/some-intake.tsx')
+    ).toBeTruthy();
     expect(
       host.exists('apps/test/src/app/some-intake/some-intake.slice.ts')
     ).toBeTruthy();

package/src/utils/form.d.ts

@@ -2,5 +2,7 @@ export interface FormDefinition {
     id: string;
     name: string;
     dataSchema: Record<string, unknown>;
+    assessorRoles: string[];
+    applicantRoles: string[];
 }
 export declare function generateFormInterface({ name, dataSchema, }: FormDefinition): Promise<string>;

package/src/utils/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/form.ts"],"names":[],"mappings":";;;;AAAA,yEAAoD;AAQpD,SAAsB,qBAAqB,CAAC,EAC1C,IAAI,EACJ,UAAU,GACK;;QACf,MAAM,KAAK,GAAG,MAAM,IAAA,mCAAO,EAAC,UAAU,EAAE,IAAI,EAAE;YAC5C,oBAAoB,EAAE,KAAK;YAC3B,aAAa,EAAE,EAAE;YACjB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAXD,sDAWC"}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/form.ts"],"names":[],"mappings":";;;;AAAA,yEAAoD;AAUpD,SAAsB,qBAAqB,CAAC,EAC1C,IAAI,EACJ,UAAU,GACK;;QACf,MAAM,KAAK,GAAG,MAAM,IAAA,mCAAO,EAAC,UAAU,EAAE,IAAI,EAAE;YAC5C,oBAAoB,EAAE,KAAK;YAC3B,aAAa,EAAE,EAAE;YACjB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAXD,sDAWC"}