fix: remove location field from file model

Author: Pavel910

packages/api-file-manager/src/domain/file/file.model.ts

@@ -11,7 +11,6 @@ class FilePrivateModelImpl implements ModelFactory.Interface {
         const privateFiles = this.wcp.canUsePrivateFiles();
 
         model.fields(fields => ({
-            location: fields.location(),
             name: fields.text().label("Name").required("Value is required."),
             key: fields.text().label("Key").required("Value is required."),
             type: fields.text().label("Type").required("Value is required."),

packages/api-file-manager/src/features/file/CreateFile/CreateFileRepository.ts

@@ -5,6 +5,7 @@ import { FileModel } from "~/domain/file/abstractions.js";
 import type { File, FileInput } from "~/domain/file/types.js";
 import { EntryToFileMapper } from "../shared/EntryToFileMapper.js";
 import { FileNotAuthorizedError, FilePersistenceError } from "~/domain/file/errors.js";
+import { FileInputToEntryInputMapper } from "~/features/file/shared/FileInputToEntryInputMapper.js";
 
 class CreateFileRepositoryImpl implements RepositoryAbstraction.Interface {
     constructor(
@@ -13,10 +14,10 @@ class CreateFileRepositoryImpl implements RepositoryAbstraction.Interface {
     ) {}
 
     async execute(data: FileInput): Promise<Result<File, RepositoryAbstraction.Error>> {
-        const result = await this.createEntry.execute(this.fileModel, {
-            ...data,
-            values: data
-        });
+        const result = await this.createEntry.execute(
+            this.fileModel,
+            FileInputToEntryInputMapper.toEntry(data)
+        );
 
         if (result.isFail()) {
             if (result.error.code === "Cms/Entry/NotAuthorized") {

packages/api-file-manager/src/features/file/shared/EntryToFileMapper.ts

@@ -17,7 +17,7 @@ export class EntryToFileMapper {
             type: entry.values.type,
             meta: entry.values.meta || {},
             accessControl: entry.values.accessControl,
-            location: entry.values.location || { folderId: "root" },
+            location: { folderId: entry.location?.folderId ?? "root" },
             tags: entry.values.tags || [],
             extensions: entry.values.extensions
         };

packages/api-file-manager/src/features/file/shared/FileInputToEntryInputMapper.ts

@@ -0,0 +1,29 @@
+import type { CreateCmsEntryInput } from "@webiny/api-headless-cms/types";
+import type { FileInput } from "~/domain/file/types.js";
+
+export class FileInputToEntryInputMapper {
+    static toEntry(file: FileInput): CreateCmsEntryInput {
+        return {
+            id: file.id,
+            createdOn: file.createdOn,
+            modifiedOn: file.modifiedOn,
+            savedOn: file.savedOn,
+            createdBy: file.createdBy,
+            modifiedBy: file.modifiedBy,
+            savedBy: file.savedBy,
+            location: file.location || { folderId: "root" },
+            values: {
+                name: file.name,
+                key: file.key,
+                size: file.size,
+                type: file.type,
+                meta: file.meta || {},
+                accessControl: {
+                    type: "public"
+                },
+                tags: file.tags || [],
+                extensions: file.extensions
+            }
+        };
+    }
+}

packages/api-file-manager/src/graphql/createFilesTypeDefs.ts

@@ -72,6 +72,21 @@ export const createFilesTypeDefs = (params: CreateFilesTypeDefsParams): string =
     });
 
     return /* GraphQL */ `
+        type FmLocation {
+            folderId: String!
+        }
+
+        input FmLocationInput {
+            folderId: String!
+        }
+
+        input FmLocationWhereInput {
+            folderId: ID
+            folderId_in: [ID!]
+            folderId_not: ID
+            folderId_not_in: [ID!]
+        }
+        
         ${fieldTypes.map(f => f.typeDefs).join("\n")}
 
         type FmFile {
@@ -82,6 +97,7 @@ export const createFilesTypeDefs = (params: CreateFilesTypeDefsParams): string =
             createdBy: FmCreatedBy!
             modifiedBy: FmCreatedBy
             savedBy: FmCreatedBy!
+            location: FmLocation!
             src: String
             ${fieldTypes.map(f => f.fields).join("\n")}
         }
@@ -102,6 +118,7 @@ export const createFilesTypeDefs = (params: CreateFilesTypeDefsParams): string =
             createdBy: FmCreatedByInput
             modifiedBy: FmCreatedByInput
             savedBy: FmCreatedByInput
+            location: FmLocationInput!
             ${inputCreateFields.map(f => f.fields).join("\n")}
         }
 
@@ -112,6 +129,7 @@ export const createFilesTypeDefs = (params: CreateFilesTypeDefsParams): string =
             createdBy: FmCreatedByInput
             modifiedBy: FmCreatedByInput
             savedBy: FmCreatedByInput
+            location: FmLocationInput
             ${inputUpdateFields.map(f => f.fields).join("\n")}
         }
 
@@ -121,6 +139,7 @@ export const createFilesTypeDefs = (params: CreateFilesTypeDefsParams): string =
         }
 
         input FmFileListWhereInput {
+            location: FmLocationWhereInput
             ${listFilterFieldsRender.allFiltersAsString()}
             AND: [FmFileListWhereInput!]
             OR: [FmFileListWhereInput!]

packages/app-file-manager/src/modules/FileManagerApiProvider/FileManagerApiContext/getFileGraphQLSelection.ts

@@ -22,6 +22,9 @@ export const getFileGraphQLSelection = (model: ReturnType<typeof useFileModel>)
             displayName
         }
         src
+        location {
+            folderId
+        }
         ${fields}
     }`;
 };