Merge pull request #766 from intuitem/CA-420-cannot-edit-evidence-wit…

…h-attachment Ca 420 cannot edit evidence with attachment
intuitem · Aug 28, 2024 · 8b3ee4c · 8b3ee4c
2 parents 59d7e94 + 7176600
commit 8b3ee4c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 31 deletions.
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
@@ -127,6 +127,7 @@ export interface ModelMapEntry {
  foreignKeyFields?: ForeignKeyField[];
  reverseForeignKeyFields?: ForeignKeyField[];
  selectFields?: SelectField[];
+ fileFields?: string[];
  filters?: SelectField[];
  path?: string;
 }
@@ -367,6 +368,7 @@ export const URL_MODEL_MAP: ModelMap = {
  localNamePlural: 'evidences',
  verboseName: 'Evidence',
  verboseNamePlural: 'Evidences',
+ fileFields: ['attachment'],
  foreignKeyFields: [
  { field: 'folder', urlModel: 'folders' },
  { field: 'applied_controls', urlModel: 'applied-controls' },
@@ -596,7 +598,7 @@ export const urlParamModelSelectFields = (model: string): SelectField[] => {
  return URL_MODEL_MAP[model]?.selectFields || [];
 };
 
-export const getModelInfo = (model: urlModel): ModelMapEntry => {
+export const getModelInfo = (model: urlModel | string): ModelMapEntry => {
  const map = URL_MODEL_MAP[model] || {};
  map['urlModel'] = model;
  return map;

diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
@@ -214,7 +214,7 @@ export const ComplianceAssessmentSchema = baseNamedObject({
 });
 
 export const EvidenceSchema = baseNamedObject({
- attachment: z.instanceof(File).optional().nullable(),
+ attachment: z.any().optional().nullable(),
  folder: z.string(),
  applied_controls: z.preprocess(toArrayPreprocessor, z.array(z.string().optional())).optional(),
  requirement_assessments: z.string().optional().array().optional(),

diff --git a/frontend/src/routes/(app)/[model=urlmodel]/+page.server.ts b/frontend/src/routes/(app)/[model=urlmodel]/+page.server.ts
@@ -82,11 +82,12 @@ export const actions: Actions = {
  return fail(400, { form: form });
  }
 
- const model: ModelInfo = getModelInfo(event.params.model!);
  const endpoint = `${BASE_API_URL}/${event.params.model}/`;
 
- const fileFields = Object.fromEntries(
- Object.entries(form.data).filter(([, value]) => value instanceof File)
+ const model = getModelInfo(event.params.model!);
+
+ const fileFields: Record<string, File> = Object.fromEntries(
+ Object.entries(form.data).filter(([key]) => model.fileFields?.includes(key) ?? false)
  );
 
  Object.keys(fileFields).forEach((key) => {
@@ -121,9 +122,8 @@ export const actions: Actions = {
 
  if (fileFields) {
  for (const [, file] of Object.entries(fileFields)) {
- if (file.size <= 0) {
- continue;
- }
+ if (!file) continue;
+ if (file.size <= 0) continue;
  const fileUploadEndpoint = `${BASE_API_URL}/${event.params.model}/${createdObject.id}/upload/`;
  const fileUploadRequestInitOptions: RequestInit = {
  headers: {

diff --git a/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/+page.server.ts
@@ -1,5 +1,5 @@
 import { BASE_API_URL } from '$lib/utils/constants';
-import { urlParamModelVerboseName } from '$lib/utils/crud';
+import { getModelInfo, urlParamModelVerboseName } from '$lib/utils/crud';
 
 import { localItems, toCamelCase } from '$lib/utils/locales';
 import * as m from '$paraglide/messages';
@@ -32,8 +32,10 @@ export const actions: Actions = {
 
  const endpoint = `${BASE_API_URL}/${urlModel}/`;
 
- const fileFields = Object.fromEntries(
- Object.entries(form.data).filter(([, value]) => value instanceof File)
+ const model = getModelInfo(event.params.model!);
+
+ const fileFields: Record<string, File> = Object.fromEntries(
+ Object.entries(form.data).filter(([key]) => model.fileFields?.includes(key) ?? false)
  );
 
  Object.keys(fileFields).forEach((key) => {

diff --git a/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/[model=urlmodel]/[id=uuid]/edit/+page.server.ts
@@ -1,16 +1,14 @@
-import { safeTranslate } from '$lib/utils/i18n';
 import { BASE_API_URL } from '$lib/utils/constants';
+import { getModelInfo, urlParamModelVerboseName } from '$lib/utils/crud';
+import { getSecureRedirect } from '$lib/utils/helpers';
+import { safeTranslate } from '$lib/utils/i18n';
 import { modelSchema } from '$lib/utils/schemas';
-import { fail, type Actions } from '@sveltejs/kit';
-import { setError, superValidate } from 'sveltekit-superforms';
+import { fail, redirect, type Actions } from '@sveltejs/kit';
 import { setFlash } from 'sveltekit-flash-message/server';
-import { urlParamModelVerboseName } from '$lib/utils/crud';
-import { getSecureRedirect } from '$lib/utils/helpers';
-import { redirect } from '@sveltejs/kit';
+import { setError, superValidate } from 'sveltekit-superforms';
 
-import { localItems, toCamelCase } from '$lib/utils/locales';
+import { toCamelCase } from '$lib/utils/locales';
 import * as m from '$paraglide/messages';
-import { languageTag } from '$paraglide/runtime';
 import { zod } from 'sveltekit-superforms/adapters';
 
 export const actions: Actions = {
@@ -31,12 +29,14 @@ export const actions: Actions = {
 
  const endpoint = `${BASE_API_URL}/${event.params.model}/${event.params.id}/`;
 
- const fileFields = Object.fromEntries(
- Object.entries(form.data).filter(([, value]) => value instanceof File)
+ const model = getModelInfo(event.params.model!);
+
+ const fileFields: Record<string, File> = Object.fromEntries(
+ Object.entries(form.data).filter(([key]) => model.fileFields?.includes(key) ?? false)
  );
 
  Object.keys(fileFields).forEach((key) => {
- form.data[key] = undefined;
+ delete form.data[key];
  });
 
  const requestInitOptions: RequestInit = {
@@ -67,9 +67,8 @@ export const actions: Actions = {
 
  if (fileFields) {
  for (const [, file] of Object.entries(fileFields)) {
- if (file.size <= 0) {
- continue;
- }
+ if (!file) continue;
+ if (file.size <= 0) continue;
  const fileUploadEndpoint = `${BASE_API_URL}/${event.params.model}/${createdObject.id}/upload/`;
  const fileUploadRequestInitOptions: RequestInit = {
  headers: {

diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/edit/+page.server.ts
@@ -341,8 +341,10 @@ export const actions: Actions = {
 
  const endpoint = `${BASE_API_URL}/evidences/`;
 
- const fileFields = Object.fromEntries(
- Object.entries(form.data).filter(([, value]) => value instanceof File)
+ const model = getModelInfo(event.params.model!);
+
+ const fileFields: Record<string, File> = Object.fromEntries(
+ Object.entries(form.data).filter(([key]) => model.fileFields?.includes(key) ?? false)
  );
 
  Object.keys(fileFields).forEach((key) => {
@@ -377,9 +379,8 @@ export const actions: Actions = {
 
  if (fileFields) {
  for (const [, file] of Object.entries(fileFields)) {
- if (file.size <= 0) {
- continue;
- }
+ if (!file) continue;
+ if (file.size <= 0) continue;
  const fileUploadEndpoint = `${BASE_API_URL}/${'evidences'}/${createdObject.id}/upload/`;
  const fileUploadRequestInitOptions: RequestInit = {
  headers: {

diff --git a/frontend/src/routes/(app)/users/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/users/[id=uuid]/edit/+page.server.ts
@@ -7,7 +7,6 @@ import { redirect, fail, type Actions } from '@sveltejs/kit';
 import { getModelInfo } from '$lib/utils/crud';
 import { setFlash } from 'sveltekit-flash-message/server';
 import * as m from '$paraglide/messages';
-import { languageTag } from '$paraglide/runtime';
 import { localItems } from '$lib/utils/locales';
 import { zod } from 'sveltekit-superforms/adapters';