@payloadcms/ui 4.0.0-internal.e7d4ebc → 4.0.0-internal.ea6e8f8

package/dist/elements/BulkUpload/FormsManager/createFormData.js.map

@@ -1 +1 @@
-{"version":3,"file":"createFormData.js","names":["serialize","reduceFieldsToValues","createFormData","formState","overrides","uploadHandler","data","file","JSON","stringify","docPrefix","prefix","undefined","dataWithOverrides","dataToSerialize","_payload","indices","nullsAsUndefineds"],"sources":["../../../../src/elements/BulkUpload/FormsManager/createFormData.ts"],"sourcesContent":["import type { FormState } from 'payload'\n\nimport { serialize } from 'object-to-formdata'\nimport { reduceFieldsToValues } from 'payload/shared'\n\nimport type { UploadHandlersContext } from '../../../providers/UploadHandlers/index.js'\n\nexport async function createFormData(\n  formState: FormState = {},\n  overrides: Record<string, any> = {},\n  uploadHandler: ReturnType<UploadHandlersContext['getUploadHandler']>,\n) {\n  const data = reduceFieldsToValues(formState, true)\n  let file = data?.file\n\n  if (file) {\n    delete data.file\n  }\n\n  if (file && typeof uploadHandler === 'function') {\n    file = JSON.stringify(\n      await uploadHandler({\n        docPrefix: typeof data?.prefix === 'string' ? data.prefix : undefined,\n        file,\n      }),\n    )\n  }\n\n  const dataWithOverrides = {\n    ...data,\n    ...overrides,\n  }\n\n  const dataToSerialize = {\n    _payload: JSON.stringify(dataWithOverrides),\n    file,\n  }\n\n  return serialize(dataToSerialize, { indices: true, nullsAsUndefineds: false })\n}\n"],"mappings":"AAEA,SAASA,SAAS,QAAQ;AAC1B,SAASC,oBAAoB,QAAQ;AAIrC,OAAO,eAAeC,eACpBC,SAAA,GAAuB,CAAC,CAAC,EACzBC,SAAA,GAAiC,CAAC,CAAC,EACnCC,aAAoE;EAEpE,MAAMC,IAAA,GAAOL,oBAAA,CAAqBE,SAAA,EAAW;EAC7C,IAAII,IAAA,GAAOD,IAAA,EAAMC,IAAA;EAEjB,IAAIA,IAAA,EAAM;IACR,OAAOD,IAAA,CAAKC,IAAI;EAClB;EAEA,IAAIA,IAAA,IAAQ,OAAOF,aAAA,KAAkB,YAAY;IAC/CE,IAAA,GAAOC,IAAA,CAAKC,SAAS,CACnB,MAAMJ,aAAA,CAAc;MAClBK,SAAA,EAAW,OAAOJ,IAAA,EAAMK,MAAA,KAAW,WAAWL,IAAA,CAAKK,MAAM,GAAGC,SAAA;MAC5DL;IACF;EAEJ;EAEA,MAAMM,iBAAA,GAAoB;IACxB,GAAGP,IAAI;IACP,GAAGF;EACL;EAEA,MAAMU,eAAA,GAAkB;IACtBC,QAAA,EAAUP,IAAA,CAAKC,SAAS,CAACI,iBAAA;IACzBN;EACF;EAEA,OAAOP,SAAA,CAAUc,eAAA,EAAiB;IAAEE,OAAA,EAAS;IAAMC,iBAAA,EAAmB;EAAM;AAC9E","ignoreList":[]}
+{"version":3,"file":"createFormData.js","names":["serialize","reduceFieldsToValues","uploadRequiresServerValidation","createFormData","formState","overrides","uploadHandler","allowRestrictedFileTypes","data","file","filename","name","mimeType","type","JSON","stringify","docPrefix","prefix","undefined","dataWithOverrides","dataToSerialize","_payload","indices","nullsAsUndefineds"],"sources":["../../../../src/elements/BulkUpload/FormsManager/createFormData.ts"],"sourcesContent":["import type { FormState } from 'payload'\n\nimport { serialize } from 'object-to-formdata'\nimport { reduceFieldsToValues, uploadRequiresServerValidation } from 'payload/shared'\n\nimport type { UploadHandlersContext } from '../../../providers/UploadHandlers/index.js'\n\nexport async function createFormData(\n  formState: FormState = {},\n  overrides: Record<string, any> = {},\n  uploadHandler: ReturnType<UploadHandlersContext['getUploadHandler']>,\n  allowRestrictedFileTypes?: boolean,\n) {\n  const data = reduceFieldsToValues(formState, true)\n  let file = data?.file\n\n  if (file) {\n    delete data.file\n  }\n\n  if (\n    file &&\n    typeof uploadHandler === 'function' &&\n    !uploadRequiresServerValidation({\n      allowRestrictedFileTypes,\n      filename: file.name,\n      mimeType: file.type,\n    })\n  ) {\n    file = JSON.stringify(\n      await uploadHandler({\n        docPrefix: typeof data?.prefix === 'string' ? data.prefix : undefined,\n        file,\n      }),\n    )\n  }\n\n  const dataWithOverrides = {\n    ...data,\n    ...overrides,\n  }\n\n  const dataToSerialize = {\n    _payload: JSON.stringify(dataWithOverrides),\n    file,\n  }\n\n  return serialize(dataToSerialize, { indices: true, nullsAsUndefineds: false })\n}\n"],"mappings":"AAEA,SAASA,SAAS,QAAQ;AAC1B,SAASC,oBAAoB,EAAEC,8BAA8B,QAAQ;AAIrE,OAAO,eAAeC,eACpBC,SAAA,GAAuB,CAAC,CAAC,EACzBC,SAAA,GAAiC,CAAC,CAAC,EACnCC,aAAoE,EACpEC,wBAAkC;EAElC,MAAMC,IAAA,GAAOP,oBAAA,CAAqBG,SAAA,EAAW;EAC7C,IAAIK,IAAA,GAAOD,IAAA,EAAMC,IAAA;EAEjB,IAAIA,IAAA,EAAM;IACR,OAAOD,IAAA,CAAKC,IAAI;EAClB;EAEA,IACEA,IAAA,IACA,OAAOH,aAAA,KAAkB,cACzB,CAACJ,8BAAA,CAA+B;IAC9BK,wBAAA;IACAG,QAAA,EAAUD,IAAA,CAAKE,IAAI;IACnBC,QAAA,EAAUH,IAAA,CAAKI;EACjB,IACA;IACAJ,IAAA,GAAOK,IAAA,CAAKC,SAAS,CACnB,MAAMT,aAAA,CAAc;MAClBU,SAAA,EAAW,OAAOR,IAAA,EAAMS,MAAA,KAAW,WAAWT,IAAA,CAAKS,MAAM,GAAGC,SAAA;MAC5DT;IACF;EAEJ;EAEA,MAAMU,iBAAA,GAAoB;IACxB,GAAGX,IAAI;IACP,GAAGH;EACL;EAEA,MAAMe,eAAA,GAAkB;IACtBC,QAAA,EAAUP,IAAA,CAAKC,SAAS,CAACI,iBAAA;IACzBV;EACF;EAEA,OAAOT,SAAA,CAAUoB,eAAA,EAAiB;IAAEE,OAAA,EAAS;IAAMC,iBAAA,EAAmB;EAAM;AAC9E","ignoreList":[]}

package/dist/elements/BulkUpload/FormsManager/index.d.ts

@@ -3,8 +3,9 @@ import React from 'react';
 import type { State } from './reducer.js';
 type FormsManagerContext = {
     readonly activeIndex: State['activeIndex'];
-    readonly addFiles: (filelist: FileList) => Promise<void>;
+    readonly addFiles: (filelist: FileList) => Promise<boolean>;
     readonly bulkUpdateForm: (updatedFields: Record<string, unknown>, afterStateUpdate?: () => void) => Promise<void>;
+    readonly changeCollectionSlug: (slug: string) => void;
     readonly collectionSlug: string;
     readonly docPermissions?: SanitizedDocumentPermissions;
     readonly documentSlots: DocumentSlots;

package/dist/elements/BulkUpload/FormsManager/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/BulkUpload/FormsManager/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,IAAI,EACJ,aAAa,EACb,SAAS,EAET,4BAA4B,EAC5B,WAAW,EACZ,MAAM,SAAS,CAAA;AAKhB,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAiBzC,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IAC1C,QAAQ,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,CAAC,cAAc,EAAE,CACvB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,gBAAgB,CAAC,EAAE,MAAM,IAAI,KAC1B,OAAO,CAAC,IAAI,CAAC,CAAA;IAClB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,4BAA4B,CAAA;IACtD,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAA;IACrC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAC9B,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,CAAA;IAC3C,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;IACtC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAA;IACnC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAA;IACtC,QAAQ,CAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAChG,QAAQ,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAChD,QAAQ,CAAC,sBAAsB,EAAE,CAAC,EAChC,UAAU,EACV,KAAK,GACN,EAAE;QACD,UAAU,EAAE,MAAM,CAAA;QAClB,KAAK,EAAE,MAAM,CAAA;KACd,KAAK,IAAI,CAAA;IACV,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAA;CACxD,CAAA;AA6BD,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC;IAC/B,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;CAChC,CAAC,CAAA;AAEF,KAAK,iBAAiB,GAAG;IACvB,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACnC,CAAA;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,iBAAiB,qBA+oBnE;AAED,wBAAgB,eAAe,wBAE9B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/BulkUpload/FormsManager/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,IAAI,EACJ,aAAa,EACb,SAAS,EAET,4BAA4B,EAC5B,WAAW,EACZ,MAAM,SAAS,CAAA;AAKhB,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAkBzC,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IAC1C,QAAQ,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3D,QAAQ,CAAC,cAAc,EAAE,CACvB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,gBAAgB,CAAC,EAAE,MAAM,IAAI,KAC1B,OAAO,CAAC,IAAI,CAAC,CAAA;IAClB,QAAQ,CAAC,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IACrD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,cAAc,CAAC,EAAE,4BAA4B,CAAA;IACtD,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAA;IACrC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAC9B,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,CAAA;IAC3C,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;IACtC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAA;IACnC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAA;IACtC,QAAQ,CAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAChG,QAAQ,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAChD,QAAQ,CAAC,sBAAsB,EAAE,CAAC,EAChC,UAAU,EACV,KAAK,GACN,EAAE;QACD,UAAU,EAAE,MAAM,CAAA;QAClB,KAAK,EAAE,MAAM,CAAA;KACd,KAAK,IAAI,CAAA;IACV,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAA;CACxD,CAAA;AA8BD,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC;IAC/B,IAAI,EAAE,IAAI,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;CAChC,CAAC,CAAA;AAEF,KAAK,iBAAiB,GAAG;IACvB,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACnC,CAAA;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,iBAAiB,qBAiyBnE;AAED,wBAAgB,eAAe,wBAE9B"}

package/dist/elements/BulkUpload/FormsManager/index.js

@@ -2,12 +2,13 @@
 
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useModal } from '@faceless-ui/modal';
-import { formatAdminURL } from 'payload/shared';
+import { formatAdminURL, validateMimeType } from 'payload/shared';
 import * as qs from 'qs-esm';
 import React from 'react';
 import { toast } from 'sonner';
 import { fieldReducer } from '../../../forms/Form/fieldReducer.js';
 import { useEffectEvent } from '../../../hooks/useEffectEvent.js';
+import { useBranchParam } from '../../../providers/Branch/index.js';
 import { useConfig } from '../../../providers/Config/index.js';
 import { useLocale } from '../../../providers/Locale/index.js';
 import { useServerFunctions } from '../../../providers/ServerFunctions/index.js';
@@ -22,8 +23,9 @@ import { createFormData } from './createFormData.js';
 import { formsManagementReducer } from './reducer.js';
 const Context = /*#__PURE__*/React.createContext({
   activeIndex: 0,
-  addFiles: () => Promise.resolve(),
+  addFiles: () => Promise.resolve(false),
   bulkUpdateForm: () => null,
+  changeCollectionSlug: () => null,
   collectionSlug: '',
   docPermissions: undefined,
   documentSlots: {},
@@ -59,9 +61,9 @@ export function FormsManagerProvider({
       api
     }
   } = config;
-  const {
-    code
-  } = useLocale();
+  const locale = useLocale();
+  const code = locale?.code;
+  const branch = useBranchParam();
   const {
     i18n,
     t
@@ -102,6 +104,8 @@ export function FormsManagerProvider({
     modalSlug: drawerSlug,
     onSuccess,
     parentID,
+    selectableCollections,
+    setCollectionSlug,
     setInitialFiles,
     setInitialForms,
     setSuccessfullyUploaded
@@ -114,18 +118,60 @@ export function FormsManagerProvider({
   const [loadingText, setLoadingText] = React.useState('');
   const hasInitializedWithFiles = React.useRef(false);
   const initialStateRef = React.useRef(null);
+  const initializedStateCollectionSlugRef = React.useRef(undefined);
+  const initializedPermissionsCollectionSlugRef = React.useRef(undefined);
+  const currentCollectionSlugRef = React.useRef(collectionSlug);
+  currentCollectionSlugRef.current = collectionSlug;
   const getFormDataRef = React.useRef(() => ({}));
-  const baseAPIPath = formatAdminURL({
+  const pendingCollectionChangeRef = React.useRef(null);
+  const collectionFormsCacheRef = React.useRef({});
+  const changeCollectionSlug = React.useCallback(slug => {
+    if (slug === collectionSlug || isInitializing || !selectableCollections?.includes(slug)) {
+      return;
+    }
+    const mimeTypes = getEntityConfig({
+      collectionSlug: slug
+    })?.upload?.mimeTypes;
+    if (mimeTypes?.length && forms.some(({
+      formState
+    }) => {
+      const file = formState?.file?.value;
+      return file instanceof File && !validateMimeType(file.type, mimeTypes);
+    })) {
+      toast.error(t('error:invalidFileType'));
+      return;
+    }
+    const activeFormState = getFormDataRef.current();
+    const currentForms = forms.map((form, index) => index === activeIndex ? {
+      ...form,
+      formState: activeFormState
+    } : form);
+    collectionFormsCacheRef.current[collectionSlug] = currentForms;
+    pendingCollectionChangeRef.current = {
+      slug,
+      forms: currentForms
+    };
+    setIsInitializing(true);
+    setHasInitializedState(false);
+    setHasInitializedDocPermissions(false);
+    setHasSavePermission(false);
+    setHasPublishPermission(false);
+    setCollectionSlug(slug);
+  }, [activeIndex, collectionSlug, forms, getEntityConfig, isInitializing, selectableCollections, setCollectionSlug, t]);
+  const actionURL = formatAdminURL({
     apiRoute: api,
-    path: ''
+    path: `/${collectionSlug}`
   });
-  const actionURL = `${baseAPIPath}/${collectionSlug}`;
   const initializeSharedDocPermissions = React.useCallback(async () => {
     const params = {
+      branch,
       locale: code || undefined
     };
-    const docAccessURL = `/${collectionSlug}/access`;
-    const res = await fetch(`${baseAPIPath}${docAccessURL}?${qs.stringify(params)}`, {
+    const docAccessPath = `/${collectionSlug}/access?${qs.stringify(params)}`;
+    const res = await fetch(formatAdminURL({
+      apiRoute: api,
+      path: docAccessPath
+    }), {
       credentials: 'include',
       headers: {
         'Accept-Language': i18n.language,
@@ -134,7 +180,10 @@ export function FormsManagerProvider({
       method: 'POST'
     });
     const json = await res.json();
-    const publishedAccessJSON = await fetch(`${baseAPIPath}${docAccessURL}?${qs.stringify(params)}`, {
+    const publishedAccessJSON = await fetch(formatAdminURL({
+      apiRoute: api,
+      path: docAccessPath
+    }), {
       body: JSON.stringify({
         _status: 'published'
       }),
@@ -145,6 +194,9 @@ export function FormsManagerProvider({
       },
       method: 'POST'
     }).then(res_0 => res_0.json());
+    if (currentCollectionSlugRef.current !== collectionSlug) {
+      return;
+    }
     setDocPermissions(json);
     setHasSavePermission(getHasSavePermission({
       collectionSlug,
@@ -152,8 +204,9 @@ export function FormsManagerProvider({
       isEditing: false
     }));
     setHasPublishPermission(publishedAccessJSON?.update);
+    initializedPermissionsCollectionSlugRef.current = collectionSlug;
     setHasInitializedDocPermissions(true);
-  }, [baseAPIPath, code, collectionSlug, i18n.language]);
+  }, [api, branch, code, collectionSlug, i18n.language]);
   const initializeSharedFormState = React.useCallback(async abortController => {
     if (abortController?.signal) {
       abortController.abort('aborting previous fetch for initial form state without files');
@@ -162,13 +215,12 @@ export function FormsManagerProvider({
     const documentSlots_0 = await getDocumentSlots({
       collectionSlug
     });
-    setDocumentSlots(documentSlots_0);
     try {
       const {
         state: formStateWithoutFiles
       } = await getFormState({
         collectionSlug,
-        docPermissions,
+        docPermissions: initializedPermissionsCollectionSlugRef.current === collectionSlug ? docPermissions : undefined,
         docPreferences: {
           fields: {}
         },
@@ -187,28 +239,35 @@ export function FormsManagerProvider({
           }
         };
       }
+      if (currentCollectionSlugRef.current !== collectionSlug) {
+        return null;
+      }
+      setDocumentSlots(documentSlots_0);
       initialStateRef.current = formStateWithoutFiles;
+      initializedStateCollectionSlugRef.current = collectionSlug;
       setHasInitializedState(true);
+      return formStateWithoutFiles;
     } catch (_err) {
       // swallow error
+      return null;
     }
   }, [getDocumentSlots, collectionSlug, getFormState, docPermissions, code, folderFieldName]);
-  const setActiveIndex = React.useCallback(index => {
+  const setActiveIndex = React.useCallback(index_0 => {
     const currentFormsData = getFormDataRef.current();
     dispatch({
       type: 'REPLACE',
       state: {
-        activeIndex: index,
-        forms: forms.map((form, i) => {
+        activeIndex: index_0,
+        forms: forms.map((form_0, i) => {
           if (i === activeIndex) {
             return {
-              errorCount: form.errorCount,
-              formID: form.formID,
+              errorCount: form_0.errorCount,
+              formID: form_0.formID,
               formState: currentFormsData,
-              uploadEdits: form.uploadEdits
+              uploadEdits: form_0.uploadEdits
             };
           }
-          return form;
+          return form_0;
         })
       }
     });
@@ -227,6 +286,16 @@ export function FormsManagerProvider({
     return baseState;
   }, [parentID, folderFieldName]);
   const addFiles = React.useCallback(async files => {
+    const mimeTypes_0 = getEntityConfig({
+      collectionSlug
+    })?.upload?.mimeTypes;
+    const acceptedFiles = Array.from(files).filter(file_0 => !mimeTypes_0?.length || validateMimeType(file_0.type, mimeTypes_0));
+    if (acceptedFiles.length !== files.length) {
+      toast.error(t('error:invalidFileType'));
+    }
+    if (!acceptedFiles.length) {
+      return false;
+    }
     if (forms.length) {
       // save the state of the current form before adding new files
       dispatch({
@@ -240,35 +309,52 @@ export function FormsManagerProvider({
       isLoading: true,
       key: 'addingDocs'
     });
-    if (!hasInitializedState) {
-      await initializeSharedFormState();
+    let initialFormState = initialStateRef.current;
+    if (initializedStateCollectionSlugRef.current !== collectionSlug) {
+      initialFormState = await initializeSharedFormState();
+    }
+    if (currentCollectionSlugRef.current !== collectionSlug || !initialFormState) {
+      toggleLoadingOverlay({
+        isLoading: false,
+        key: 'addingDocs'
+      });
+      return false;
     }
     dispatch({
       type: 'ADD_FORMS',
-      forms: Array.from(files).map(file => ({
-        file,
-        initialState: applyFolderToState(initialStateRef.current)
+      forms: acceptedFiles.map(file_1 => ({
+        file: file_1,
+        initialState: applyFolderToState(initialFormState)
       }))
     });
     toggleLoadingOverlay({
       isLoading: false,
       key: 'addingDocs'
     });
-  }, [initializeSharedFormState, hasInitializedState, toggleLoadingOverlay, activeIndex, forms, applyFolderToState]);
+    return true;
+  }, [initializeSharedFormState, collectionSlug, toggleLoadingOverlay, activeIndex, forms, applyFolderToState, getEntityConfig, t]);
   const addFilesEffectEvent = useEffectEvent(addFiles);
   const addInitialForms = useEffectEvent(async initialForms_0 => {
     toggleLoadingOverlay({
       isLoading: true,
       key: 'addingDocs'
     });
-    if (!hasInitializedState) {
-      await initializeSharedFormState();
+    let initialFormState_0 = initialStateRef.current;
+    if (initializedStateCollectionSlugRef.current !== collectionSlug) {
+      initialFormState_0 = await initializeSharedFormState();
+    }
+    if (currentCollectionSlugRef.current !== collectionSlug || !initialFormState_0) {
+      toggleLoadingOverlay({
+        isLoading: false,
+        key: 'addingDocs'
+      });
+      return;
     }
     dispatch({
       type: 'ADD_FORMS',
-      forms: initialForms_0.map(form_0 => ({
-        ...form_0,
-        initialState: applyFolderToState(form_0?.initialState || initialStateRef.current)
+      forms: initialForms_0.map(form_1 => ({
+        ...form_1,
+        initialState: applyFolderToState(form_1?.initialState || initialFormState_0)
       }))
     });
     toggleLoadingOverlay({
@@ -276,54 +362,57 @@ export function FormsManagerProvider({
       key: 'addingDocs'
     });
   });
-  const removeFile = React.useCallback(index_0 => {
+  const removeFile = React.useCallback(index_1 => {
     dispatch({
       type: 'REMOVE_FORM',
-      index: index_0
+      index: index_1
     });
   }, []);
   const setFormTotalErrorCount = React.useCallback(({
     errorCount,
-    index: index_1
+    index: index_2
   }) => {
     dispatch({
       type: 'UPDATE_ERROR_COUNT',
       count: errorCount,
-      index: index_1
+      index: index_2
     });
   }, []);
   const saveAllDocs = React.useCallback(async ({
     overrides
   } = {}) => {
     const currentFormsData_0 = getFormDataRef.current();
-    const currentForms = [...forms];
-    currentForms[activeIndex] = {
-      errorCount: currentForms[activeIndex].errorCount,
-      formID: currentForms[activeIndex].formID,
+    const currentForms_0 = [...forms];
+    currentForms_0[activeIndex] = {
+      errorCount: currentForms_0[activeIndex].errorCount,
+      formID: currentForms_0[activeIndex].formID,
       formState: currentFormsData_0,
-      uploadEdits: currentForms[activeIndex].uploadEdits
+      uploadEdits: currentForms_0[activeIndex].uploadEdits
     };
-    const activeFormID = currentForms[activeIndex]?.formID;
+    const activeFormID = currentForms_0[activeIndex]?.formID;
     const newDocs = [];
     setIsUploading(true);
-    for (let i_0 = 0; i_0 < currentForms.length; i_0++) {
+    for (let i_0 = 0; i_0 < currentForms_0.length; i_0++) {
       try {
-        const form_1 = currentForms[i_0];
-        const fileValue = form_1.formState?.file?.value;
+        const form_2 = currentForms_0[i_0];
+        const fileValue = form_2.formState?.file?.value;
         setLoadingText(t('general:uploadingBulk', {
           current: i_0 + 1,
-          total: currentForms.length
+          total: currentForms_0.length
         }));
         const actionURLWithParams = `${actionURL}${qs.stringify({
+          branch,
           locale: code,
-          uploadEdits: form_1?.uploadEdits || undefined
+          uploadEdits: form_2?.uploadEdits || undefined
         }, {
           addQueryPrefix: true
         })}`;
         const req = await fetch(actionURLWithParams, {
-          body: await createFormData(form_1.formState, overrides, getUploadHandler({
+          body: await createFormData(form_2.formState, overrides, getUploadHandler({
             collectionSlug
-          })),
+          }), config.collections.find(({
+            slug: slug_0
+          }) => slug_0 === collectionSlug)?.upload?.allowRestrictedFileTypes),
           credentials: 'include',
           method: 'POST'
         });
@@ -333,7 +422,7 @@ export function FormsManagerProvider({
           newDocs.push({
             collectionSlug,
             doc: json_0.doc,
-            formID: form_1.formID
+            formID: form_2.formID
           });
         }
         // should expose some sort of helper for this
@@ -358,12 +447,12 @@ export function FormsManagerProvider({
         const exceedsLimit = fileValue && req.status === 413;
         const missingFilename = fileValue && typeof fileValue === 'object' && 'name' in fileValue && (!fileValue.name || fileValue.name === '');
         if (missingFile || exceedsLimit || missingFilename) {
-          currentForms[i_0].formState.file.valid = false;
+          currentForms_0[i_0].formState.file.valid = false;
           // File/Blob objects cannot be serialized via the RSC flight protocol,
           // so replace with a plain object before calling the server function.
-          const originalFileValue = currentForms[i_0].formState.file?.value;
+          const originalFileValue = currentForms_0[i_0].formState.file?.value;
           const formStateForServer = {
-            ...currentForms[i_0].formState
+            ...currentForms_0[i_0].formState
           };
           if (originalFileValue instanceof File) {
             formStateForServer.file = {
@@ -392,9 +481,9 @@ export function FormsManagerProvider({
                 value: originalFileValue
               };
             }
-            currentForms[i_0] = {
+            currentForms_0[i_0] = {
               errorCount: Object.values(newState).reduce((acc, value) => value?.valid === false ? acc + 1 : acc, 0),
-              formID: currentForms[i_0].formID,
+              formID: currentForms_0[i_0].formID,
               formState: newState
             };
           }
@@ -406,10 +495,10 @@ export function FormsManagerProvider({
           if (!wasSuccessful && errorCount_0 === 0) {
             errorCount_0 = nonFieldErrors.length || 1;
           }
-          currentForms[i_0] = {
+          currentForms_0[i_0] = {
             errorCount: errorCount_0,
-            formID: currentForms[i_0].formID,
-            formState: fieldReducer(currentForms[i_0].formState, {
+            formID: currentForms_0[i_0].formID,
+            formState: fieldReducer(currentForms_0[i_0].formState, {
               type: 'ADD_SERVER_ERRORS',
               errors: fieldErrors
             })
@@ -431,15 +520,15 @@ export function FormsManagerProvider({
     setLoadingText('');
     setIsUploading(false);
     const remainingForms = [];
-    currentForms.forEach(({
+    currentForms_0.forEach(({
       errorCount: errorCount_1
     }, i_1) => {
       if (errorCount_1) {
-        remainingForms.push(currentForms[i_1]);
+        remainingForms.push(currentForms_0[i_1]);
       }
     });
-    const successCount = Math.max(0, currentForms.length - remainingForms.length);
-    const errorCount_2 = currentForms.length - successCount;
+    const successCount = Math.max(0, currentForms_0.length - remainingForms.length);
+    const errorCount_2 = currentForms_0.length - successCount;
     if (successCount) {
       toast.success(`Successfully saved ${successCount} files`);
       setSuccessfullyUploaded(true);
@@ -473,7 +562,7 @@ export function FormsManagerProvider({
       setInitialFiles(undefined);
       setInitialForms(undefined);
     }
-  }, [forms, activeIndex, t, actionURL, code, collectionSlug, getUploadHandler, getFormState, docPermissions, setSuccessfullyUploaded, onSuccess, closeModal, drawerSlug, setInitialFiles, setInitialForms]);
+  }, [branch, forms, activeIndex, t, actionURL, code, collectionSlug, config.collections, getUploadHandler, getFormState, docPermissions, setSuccessfullyUploaded, onSuccess, closeModal, drawerSlug, setInitialFiles, setInitialForms]);
   const bulkUpdateForm = React.useCallback(async (updatedFields, afterStateUpdate) => {
     for (let i_3 = 0; i_3 < forms.length; i_3++) {
       Object.entries(updatedFields).forEach(([path, value_0]) => {
@@ -537,8 +626,8 @@ export function FormsManagerProvider({
     dispatch({
       type: 'REPLACE',
       state: {
-        forms: forms.map(form_2 => ({
-          ...form_2,
+        forms: forms.map(form_3 => ({
+          ...form_3,
           uploadEdits: {}
         }))
       }
@@ -548,20 +637,55 @@ export function FormsManagerProvider({
     if (!collectionSlug) {
       return;
     }
-    if (!hasInitializedState) {
+    if (initializedStateCollectionSlugRef.current !== collectionSlug) {
       void initializeSharedFormState();
     }
-    if (!hasInitializedDocPermissions) {
+    if (initializedPermissionsCollectionSlugRef.current !== collectionSlug) {
       void initializeSharedDocPermissions();
     }
     if (initialFiles || initialForms) {
-      if (!hasInitializedState || !hasInitializedDocPermissions) {
+      if (initializedStateCollectionSlugRef.current !== collectionSlug || initializedPermissionsCollectionSlugRef.current !== collectionSlug) {
         setIsInitializing(true);
       } else {
         setIsInitializing(false);
       }
     }
-    if (hasInitializedState && (initialForms?.length || initialFiles?.length) && !hasInitializedWithFiles.current) {
+    if (hasInitializedState && hasInitializedDocPermissions && initializedStateCollectionSlugRef.current === collectionSlug && initializedPermissionsCollectionSlugRef.current === collectionSlug && pendingCollectionChangeRef.current?.slug === collectionSlug) {
+      const previousForms = pendingCollectionChangeRef.current.forms;
+      const nextTemplate = applyFolderToState(initialStateRef.current);
+      const cachedForms = collectionFormsCacheRef.current[collectionSlug];
+      dispatch({
+        type: 'REPLACE',
+        state: {
+          forms: previousForms.map(form_4 => {
+            const formState_0 = {};
+            const cachedForm = cachedForms?.find(({
+              formID: formID_0
+            }) => formID_0 === form_4.formID);
+            for (const [path_0, field] of Object.entries(nextTemplate)) {
+              const previousField = path_0 === folderFieldName && parentID ? undefined : cachedForm?.formState[path_0] ?? form_4.formState[path_0];
+              formState_0[path_0] = previousField ? {
+                ...field,
+                initialValue: previousField.value,
+                value: previousField.value
+              } : field;
+            }
+            formState_0.file = form_4.formState.file;
+            return {
+              ...form_4,
+              errorCount: 0,
+              formState: formState_0,
+              uploadEdits: {}
+            };
+          }),
+          totalErrorCount: 0
+        }
+      });
+      pendingCollectionChangeRef.current = null;
+      setHasSubmitted(false);
+      setIsInitializing(false);
+    }
+    if (hasInitializedState && hasInitializedDocPermissions && initializedStateCollectionSlugRef.current === collectionSlug && initializedPermissionsCollectionSlugRef.current === collectionSlug && (initialForms?.length || initialFiles?.length) && !hasInitializedWithFiles.current) {
       if (initialForms?.length) {
         void addInitialForms(initialForms);
       }
@@ -571,12 +695,13 @@ export function FormsManagerProvider({
       hasInitializedWithFiles.current = true;
     }
     return;
-  }, [initialFiles, initializeSharedFormState, initializeSharedDocPermissions, collectionSlug, hasInitializedState, hasInitializedDocPermissions, initialForms]);
+  }, [initialFiles, initializeSharedFormState, initializeSharedDocPermissions, collectionSlug, hasInitializedState, hasInitializedDocPermissions, initialForms, applyFolderToState]);
   return /*#__PURE__*/_jsxs(Context, {
     value: {
       activeIndex: state.activeIndex,
       addFiles,
       bulkUpdateForm,
+      changeCollectionSlug,
       collectionSlug,
       docPermissions,
       documentSlots,