@strapi/content-type-builder 5.54.0 → 5.55.0

package/dist/admin/components/FolderSelect.mjs

@@ -0,0 +1,198 @@
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import { ComboboxOption, Field, Combobox } from '@strapi/design-system';
+import { useIntl } from 'react-intl';
+import { useDataManager } from './DataManager/useDataManager.mjs';
+import { sectionKeyForKind, findSiblingFolderByName } from './DataManager/utils/contentStructure.mjs';
+import { useFormModalNavigation } from './FormModalNavigation/useFormModalNavigation.mjs';
+
+/**
+ * Flatten a section's (flat) folder groups into a list of full folder path strings.
+ */ const buildFolderOptions = (groups)=>{
+    const groupById = new Map(groups.map((group)=>[
+            group.id,
+            group
+        ]));
+    const childGroupIds = new Set();
+    for (const group of groups){
+        for (const child of group.children){
+            if (child.type === 'group') {
+                childGroupIds.add(child.id);
+            }
+        }
+    }
+    const options = [];
+    const walk = (group, ancestors)=>{
+        const path = [
+            ...ancestors,
+            group.name
+        ];
+        options.push({
+            id: group.id,
+            label: path.join(' / ')
+        });
+        for (const child of group.children){
+            if (child.type !== 'group') {
+                continue;
+            }
+            const subGroup = groupById.get(child.id);
+            if (subGroup) {
+                walk(subGroup, path);
+            }
+        }
+    };
+    groups.filter((group)=>{
+        return !childGroupIds.has(group.id);
+    }).forEach((root)=>{
+        return walk(root, []);
+    });
+    return options;
+};
+const FolderSelect = ({ error = null, modifiedData, placeholder, isCreating, intlLabel, targetUid, onChange, value, name })=>{
+    const { kind: modalKind } = useFormModalNavigation();
+    const { contentStructure } = useDataManager();
+    const { formatMessage } = useIntl();
+    const kind = modifiedData?.kind ?? modalKind ?? 'collectionType';
+    const section = sectionKeyForKind(kind);
+    const groups = contentStructure.sections[section].groups;
+    const folderOptions = useMemo(()=>{
+        return buildFolderOptions(groups);
+    }, [
+        groups
+    ]);
+    const knownFolderIds = useMemo(()=>{
+        return new Set(folderOptions.map((option)=>option.id));
+    }, [
+        folderOptions
+    ]);
+    const currentFolderId = useMemo(()=>{
+        if (isCreating || !targetUid) {
+            return null;
+        }
+        const owner = groups.find((group)=>{
+            return group.children.some((child)=>{
+                return child.type === 'contentType' && child.uid === targetUid;
+            });
+        });
+        return owner?.id ?? null;
+    }, [
+        groups,
+        isCreating,
+        targetUid
+    ]);
+    const change = (next)=>{
+        onChange({
+            target: {
+                name,
+                value: next,
+                type: 'content-type-folder-select'
+            }
+        });
+    };
+    const changeToFolderId = (id)=>{
+        change(id === currentFolderId ? undefined : {
+            targetGroupId: id
+        });
+    };
+    const selectTypedName = (typed)=>{
+        const trimmed = typed.trim();
+        if (!trimmed) {
+            return;
+        }
+        const existing = findSiblingFolderByName(groups, null, trimmed);
+        if (existing) {
+            changeToFolderId(existing.id);
+            return;
+        }
+        change({
+            newFolderName: trimmed
+        });
+    };
+    const selectedValue = (()=>{
+        if (value === undefined) {
+            return currentFolderId ?? '';
+        }
+        if ('newFolderName' in value) {
+            return value.newFolderName;
+        }
+        return value.targetGroupId ?? '';
+    })();
+    const selectedLabel = (()=>{
+        if (value && 'newFolderName' in value) {
+            return value.newFolderName;
+        }
+        return folderOptions.find(({ id })=>id === selectedValue)?.label ?? '';
+    })();
+    const handleChange = (nextValue)=>{
+        if (!nextValue) {
+            return;
+        }
+        if (knownFolderIds.has(nextValue)) {
+            changeToFolderId(nextValue);
+            return;
+        }
+        selectTypedName(nextValue);
+    };
+    const handleCreateOption = (nextValue)=>{
+        if (!nextValue) {
+            return;
+        }
+        selectTypedName(nextValue);
+    };
+    const handleClear = ()=>{
+        // In edit an explicit clear ungroups the content type. In create it just returns the field to its "no folder" default.
+        change(isCreating ? undefined : {
+            targetGroupId: null
+        });
+    };
+    const errorMessage = error ? formatMessage({
+        id: error,
+        defaultMessage: error
+    }) : '';
+    const placeholderText = placeholder ? formatMessage(placeholder) : undefined;
+    const label = formatMessage(intlLabel);
+    const comboboxOptions = useMemo(()=>{
+        const options = [];
+        for (const option of folderOptions){
+            options.push(/*#__PURE__*/ jsx(ComboboxOption, {
+                value: option.id,
+                children: option.label
+            }, option.id));
+        }
+        // A new folder name typed into the combobox doesn't exist as a group yet, so we append it as its own option value.
+        if (selectedValue && !knownFolderIds.has(selectedValue)) {
+            options.push(/*#__PURE__*/ jsx(ComboboxOption, {
+                value: selectedValue,
+                children: selectedValue
+            }, `new:${selectedValue}`));
+        }
+        return options;
+    }, [
+        folderOptions,
+        knownFolderIds,
+        selectedValue
+    ]);
+    return /*#__PURE__*/ jsxs(Field.Root, {
+        error: errorMessage,
+        name: name,
+        children: [
+            /*#__PURE__*/ jsx(Field.Label, {
+                children: label
+            }),
+            /*#__PURE__*/ jsx(Combobox, {
+                defaultTextValue: selectedLabel || undefined,
+                onCreateOption: handleCreateOption,
+                value: selectedValue || undefined,
+                placeholder: placeholderText,
+                onChange: handleChange,
+                onClear: handleClear,
+                creatable: true,
+                children: comboboxOptions
+            }, section),
+            /*#__PURE__*/ jsx(Field.Error, {})
+        ]
+    });
+};
+
+export { FolderSelect };
+//# sourceMappingURL=FolderSelect.mjs.map

package/dist/admin/components/FolderSelect.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"FolderSelect.mjs","sources":["../../../admin/src/components/FolderSelect.tsx"],"sourcesContent":["import { ReactNode, useMemo } from 'react';\n\nimport { Combobox, ComboboxOption, Field } from '@strapi/design-system';\nimport { useIntl } from 'react-intl';\n\nimport { useDataManager } from './DataManager/useDataManager';\nimport { findSiblingFolderByName, sectionKeyForKind } from './DataManager/utils/contentStructure';\nimport { useFormModalNavigation } from './FormModalNavigation/useFormModalNavigation';\n\nimport type { FormChangeHandler, IntlLabel } from '../types';\nimport type { ContentStructureGroup, FolderSelection } from './DataManager/utils/contentStructure';\nimport type { Struct } from '@strapi/types';\n\ninterface FolderSelectProps {\n  onChange: FormChangeHandler<FolderSelection | undefined, 'content-type-folder-select'>;\n  modifiedData?: { kind?: Struct.ContentTypeKind };\n  value?: FolderSelection;\n  placeholder?: IntlLabel;\n  error?: string | null;\n  isCreating?: boolean;\n  intlLabel: IntlLabel;\n  targetUid?: string;\n  name: string;\n}\n\ntype FolderOption = { id: string; label: string };\n\n/**\n * Flatten a section's (flat) folder groups into a list of full folder path strings.\n */\nconst buildFolderOptions = (groups: ContentStructureGroup[]): FolderOption[] => {\n  const groupById = new Map(groups.map((group) => [group.id, group]));\n\n  const childGroupIds = new Set<string>();\n\n  for (const group of groups) {\n    for (const child of group.children) {\n      if (child.type === 'group') {\n        childGroupIds.add(child.id);\n      }\n    }\n  }\n\n  const options: FolderOption[] = [];\n\n  const walk = (group: ContentStructureGroup, ancestors: string[]) => {\n    const path = [...ancestors, group.name];\n    options.push({ id: group.id, label: path.join(' / ') });\n\n    for (const child of group.children) {\n      if (child.type !== 'group') {\n        continue;\n      }\n\n      const subGroup = groupById.get(child.id);\n\n      if (subGroup) {\n        walk(subGroup, path);\n      }\n    }\n  };\n\n  groups\n    .filter((group) => {\n      return !childGroupIds.has(group.id);\n    })\n    .forEach((root) => {\n      return walk(root, []);\n    });\n\n  return options;\n};\n\nexport const FolderSelect = ({\n  error = null,\n  modifiedData,\n  placeholder,\n  isCreating,\n  intlLabel,\n  targetUid,\n  onChange,\n  value,\n  name,\n}: FolderSelectProps) => {\n  const { kind: modalKind } = useFormModalNavigation();\n  const { contentStructure } = useDataManager();\n  const { formatMessage } = useIntl();\n\n  const kind = (modifiedData?.kind ?? modalKind ?? 'collectionType') as Struct.ContentTypeKind;\n  const section = sectionKeyForKind(kind);\n  const groups = contentStructure.sections[section].groups;\n\n  const folderOptions = useMemo(() => {\n    return buildFolderOptions(groups);\n  }, [groups]);\n  const knownFolderIds = useMemo(() => {\n    return new Set(folderOptions.map((option) => option.id));\n  }, [folderOptions]);\n\n  const currentFolderId = useMemo(() => {\n    if (isCreating || !targetUid) {\n      return null;\n    }\n\n    const owner = groups.find((group) => {\n      return group.children.some((child) => {\n        return child.type === 'contentType' && child.uid === targetUid;\n      });\n    });\n\n    return owner?.id ?? null;\n  }, [groups, isCreating, targetUid]);\n\n  const change = (next: FolderSelection | undefined) => {\n    onChange({ target: { name, value: next, type: 'content-type-folder-select' } });\n  };\n\n  const changeToFolderId = (id: string) => {\n    change(id === currentFolderId ? undefined : { targetGroupId: id });\n  };\n\n  const selectTypedName = (typed: string) => {\n    const trimmed = typed.trim();\n\n    if (!trimmed) {\n      return;\n    }\n\n    const existing = findSiblingFolderByName(groups, null, trimmed);\n\n    if (existing) {\n      changeToFolderId(existing.id);\n      return;\n    }\n\n    change({ newFolderName: trimmed });\n  };\n\n  const selectedValue = (() => {\n    if (value === undefined) {\n      return currentFolderId ?? '';\n    }\n\n    if ('newFolderName' in value) {\n      return value.newFolderName;\n    }\n\n    return value.targetGroupId ?? '';\n  })();\n\n  const selectedLabel = (() => {\n    if (value && 'newFolderName' in value) {\n      return value.newFolderName;\n    }\n    return folderOptions.find(({ id }) => id === selectedValue)?.label ?? '';\n  })();\n\n  const handleChange = (nextValue?: string) => {\n    if (!nextValue) {\n      return;\n    }\n\n    if (knownFolderIds.has(nextValue)) {\n      changeToFolderId(nextValue);\n      return;\n    }\n\n    selectTypedName(nextValue);\n  };\n\n  const handleCreateOption = (nextValue?: string) => {\n    if (!nextValue) {\n      return;\n    }\n\n    selectTypedName(nextValue);\n  };\n\n  const handleClear = () => {\n    // In edit an explicit clear ungroups the content type. In create it just returns the field to its \"no folder\" default.\n    change(isCreating ? undefined : { targetGroupId: null });\n  };\n\n  const errorMessage = error ? formatMessage({ id: error, defaultMessage: error }) : '';\n  const placeholderText = placeholder ? formatMessage(placeholder) : undefined;\n  const label = formatMessage(intlLabel);\n\n  const comboboxOptions = useMemo(() => {\n    const options: ReactNode[] = [];\n\n    for (const option of folderOptions) {\n      options.push(\n        <ComboboxOption key={option.id} value={option.id}>\n          {option.label}\n        </ComboboxOption>\n      );\n    }\n\n    // A new folder name typed into the combobox doesn't exist as a group yet, so we append it as its own option value.\n    if (selectedValue && !knownFolderIds.has(selectedValue)) {\n      options.push(\n        <ComboboxOption key={`new:${selectedValue}`} value={selectedValue}>\n          {selectedValue}\n        </ComboboxOption>\n      );\n    }\n\n    return options;\n  }, [folderOptions, knownFolderIds, selectedValue]);\n\n  return (\n    <Field.Root error={errorMessage} name={name}>\n      <Field.Label>{label}</Field.Label>\n      <Combobox\n        key={section} // This forces the input to regenerate its defaultTextValue when the kind changes.\n        defaultTextValue={selectedLabel || undefined}\n        onCreateOption={handleCreateOption}\n        value={selectedValue || undefined}\n        placeholder={placeholderText}\n        onChange={handleChange}\n        onClear={handleClear}\n        creatable\n      >\n        {comboboxOptions}\n      </Combobox>\n      <Field.Error />\n    </Field.Root>\n  );\n};\n"],"names":["buildFolderOptions","groups","groupById","Map","map","group","id","childGroupIds","Set","child","children","type","add","options","walk","ancestors","path","name","push","label","join","subGroup","get","filter","has","forEach","root","FolderSelect","error","modifiedData","placeholder","isCreating","intlLabel","targetUid","onChange","value","kind","modalKind","useFormModalNavigation","contentStructure","useDataManager","formatMessage","useIntl","section","sectionKeyForKind","sections","folderOptions","useMemo","knownFolderIds","option","currentFolderId","owner","find","some","uid","change","next","target","changeToFolderId","undefined","targetGroupId","selectTypedName","typed","trimmed","trim","existing","findSiblingFolderByName","newFolderName","selectedValue","selectedLabel","handleChange","nextValue","handleCreateOption","handleClear","errorMessage","defaultMessage","placeholderText","comboboxOptions","_jsx","ComboboxOption","_jsxs","Field","Root","Label","Combobox","defaultTextValue","onCreateOption","onClear","creatable","Error"],"mappings":";;;;;;;;AA2BA;;IAGA,MAAMA,qBAAqB,CAACC,MAAAA,GAAAA;AAC1B,IAAA,MAAMC,YAAY,IAAIC,GAAAA,CAAIF,OAAOG,GAAG,CAAC,CAACC,KAAAA,GAAU;AAACA,YAAAA,KAAAA,CAAMC,EAAE;AAAED,YAAAA;AAAM,SAAA,CAAA,CAAA;AAEjE,IAAA,MAAME,gBAAgB,IAAIC,GAAAA,EAAAA;IAE1B,KAAK,MAAMH,SAASJ,MAAAA,CAAQ;AAC1B,QAAA,KAAK,MAAMQ,KAAAA,IAASJ,KAAAA,CAAMK,QAAQ,CAAE;YAClC,IAAID,KAAAA,CAAME,IAAI,KAAK,OAAA,EAAS;gBAC1BJ,aAAAA,CAAcK,GAAG,CAACH,KAAAA,CAAMH,EAAE,CAAA;AAC5B,YAAA;AACF,QAAA;AACF,IAAA;AAEA,IAAA,MAAMO,UAA0B,EAAE;IAElC,MAAMC,IAAAA,GAAO,CAACT,KAAAA,EAA8BU,SAAAA,GAAAA;AAC1C,QAAA,MAAMC,IAAAA,GAAO;AAAID,YAAAA,GAAAA,SAAAA;AAAWV,YAAAA,KAAAA,CAAMY;AAAK,SAAA;AACvCJ,QAAAA,OAAAA,CAAQK,IAAI,CAAC;AAAEZ,YAAAA,EAAAA,EAAID,MAAMC,EAAE;YAAEa,KAAAA,EAAOH,IAAAA,CAAKI,IAAI,CAAC,KAAA;AAAO,SAAA,CAAA;AAErD,QAAA,KAAK,MAAMX,KAAAA,IAASJ,KAAAA,CAAMK,QAAQ,CAAE;YAClC,IAAID,KAAAA,CAAME,IAAI,KAAK,OAAA,EAAS;AAC1B,gBAAA;AACF,YAAA;AAEA,YAAA,MAAMU,QAAAA,GAAWnB,SAAAA,CAAUoB,GAAG,CAACb,MAAMH,EAAE,CAAA;AAEvC,YAAA,IAAIe,QAAAA,EAAU;AACZP,gBAAAA,IAAAA,CAAKO,QAAAA,EAAUL,IAAAA,CAAAA;AACjB,YAAA;AACF,QAAA;AACF,IAAA,CAAA;IAEAf,MAAAA,CACGsB,MAAM,CAAC,CAAClB,KAAAA,GAAAA;AACP,QAAA,OAAO,CAACE,aAAAA,CAAciB,GAAG,CAACnB,MAAMC,EAAE,CAAA;IACpC,CAAA,CAAA,CACCmB,OAAO,CAAC,CAACC,IAAAA,GAAAA;QACR,OAAOZ,IAAAA,CAAKY,MAAM,EAAE,CAAA;AACtB,IAAA,CAAA,CAAA;IAEF,OAAOb,OAAAA;AACT,CAAA;AAEO,MAAMc,eAAe,CAAC,EAC3BC,QAAQ,IAAI,EACZC,YAAY,EACZC,WAAW,EACXC,UAAU,EACVC,SAAS,EACTC,SAAS,EACTC,QAAQ,EACRC,KAAK,EACLlB,IAAI,EACc,GAAA;AAClB,IAAA,MAAM,EAAEmB,IAAAA,EAAMC,SAAS,EAAE,GAAGC,sBAAAA,EAAAA;IAC5B,MAAM,EAAEC,gBAAgB,EAAE,GAAGC,cAAAA,EAAAA;IAC7B,MAAM,EAAEC,aAAa,EAAE,GAAGC,OAAAA,EAAAA;IAE1B,MAAMN,IAAAA,GAAQP,YAAAA,EAAcO,IAAAA,IAAQC,SAAAA,IAAa,gBAAA;AACjD,IAAA,MAAMM,UAAUC,iBAAAA,CAAkBR,IAAAA,CAAAA;AAClC,IAAA,MAAMnC,SAASsC,gBAAAA,CAAiBM,QAAQ,CAACF,OAAAA,CAAQ,CAAC1C,MAAM;AAExD,IAAA,MAAM6C,gBAAgBC,OAAAA,CAAQ,IAAA;AAC5B,QAAA,OAAO/C,kBAAAA,CAAmBC,MAAAA,CAAAA;IAC5B,CAAA,EAAG;AAACA,QAAAA;AAAO,KAAA,CAAA;AACX,IAAA,MAAM+C,iBAAiBD,OAAAA,CAAQ,IAAA;QAC7B,OAAO,IAAIvC,IAAIsC,aAAAA,CAAc1C,GAAG,CAAC,CAAC6C,MAAAA,GAAWA,OAAO3C,EAAE,CAAA,CAAA;IACxD,CAAA,EAAG;AAACwC,QAAAA;AAAc,KAAA,CAAA;AAElB,IAAA,MAAMI,kBAAkBH,OAAAA,CAAQ,IAAA;QAC9B,IAAIhB,UAAAA,IAAc,CAACE,SAAAA,EAAW;YAC5B,OAAO,IAAA;AACT,QAAA;AAEA,QAAA,MAAMkB,KAAAA,GAAQlD,MAAAA,CAAOmD,IAAI,CAAC,CAAC/C,KAAAA,GAAAA;AACzB,YAAA,OAAOA,KAAAA,CAAMK,QAAQ,CAAC2C,IAAI,CAAC,CAAC5C,KAAAA,GAAAA;AAC1B,gBAAA,OAAOA,MAAME,IAAI,KAAK,aAAA,IAAiBF,KAAAA,CAAM6C,GAAG,KAAKrB,SAAAA;AACvD,YAAA,CAAA,CAAA;AACF,QAAA,CAAA,CAAA;AAEA,QAAA,OAAOkB,OAAO7C,EAAAA,IAAM,IAAA;IACtB,CAAA,EAAG;AAACL,QAAAA,MAAAA;AAAQ8B,QAAAA,UAAAA;AAAYE,QAAAA;AAAU,KAAA,CAAA;AAElC,IAAA,MAAMsB,SAAS,CAACC,IAAAA,GAAAA;QACdtB,QAAAA,CAAS;YAAEuB,MAAAA,EAAQ;AAAExC,gBAAAA,IAAAA;gBAAMkB,KAAAA,EAAOqB,IAAAA;gBAAM7C,IAAAA,EAAM;AAA6B;AAAE,SAAA,CAAA;AAC/E,IAAA,CAAA;AAEA,IAAA,MAAM+C,mBAAmB,CAACpD,EAAAA,GAAAA;QACxBiD,MAAAA,CAAOjD,EAAAA,KAAO4C,kBAAkBS,SAAAA,GAAY;YAAEC,aAAAA,EAAetD;AAAG,SAAA,CAAA;AAClE,IAAA,CAAA;AAEA,IAAA,MAAMuD,kBAAkB,CAACC,KAAAA,GAAAA;QACvB,MAAMC,OAAAA,GAAUD,MAAME,IAAI,EAAA;AAE1B,QAAA,IAAI,CAACD,OAAAA,EAAS;AACZ,YAAA;AACF,QAAA;QAEA,MAAME,QAAAA,GAAWC,uBAAAA,CAAwBjE,MAAAA,EAAQ,IAAA,EAAM8D,OAAAA,CAAAA;AAEvD,QAAA,IAAIE,QAAAA,EAAU;AACZP,YAAAA,gBAAAA,CAAiBO,SAAS3D,EAAE,CAAA;AAC5B,YAAA;AACF,QAAA;QAEAiD,MAAAA,CAAO;YAAEY,aAAAA,EAAeJ;AAAQ,SAAA,CAAA;AAClC,IAAA,CAAA;IAEA,MAAMK,aAAAA,GAAgB,CAAC,IAAA;AACrB,QAAA,IAAIjC,UAAUwB,SAAAA,EAAW;AACvB,YAAA,OAAOT,eAAAA,IAAmB,EAAA;AAC5B,QAAA;AAEA,QAAA,IAAI,mBAAmBf,KAAAA,EAAO;AAC5B,YAAA,OAAOA,MAAMgC,aAAa;AAC5B,QAAA;QAEA,OAAOhC,KAAAA,CAAMyB,aAAa,IAAI,EAAA;IAChC,CAAA,GAAA;IAEA,MAAMS,aAAAA,GAAgB,CAAC,IAAA;QACrB,IAAIlC,KAAAA,IAAS,mBAAmBA,KAAAA,EAAO;AACrC,YAAA,OAAOA,MAAMgC,aAAa;AAC5B,QAAA;QACA,OAAOrB,aAAAA,CAAcM,IAAI,CAAC,CAAC,EAAE9C,EAAE,EAAE,GAAKA,EAAAA,KAAO8D,aAAAA,CAAAA,EAAgBjD,KAAAA,IAAS,EAAA;IACxE,CAAA,GAAA;AAEA,IAAA,MAAMmD,eAAe,CAACC,SAAAA,GAAAA;AACpB,QAAA,IAAI,CAACA,SAAAA,EAAW;AACd,YAAA;AACF,QAAA;QAEA,IAAIvB,cAAAA,CAAexB,GAAG,CAAC+C,SAAAA,CAAAA,EAAY;YACjCb,gBAAAA,CAAiBa,SAAAA,CAAAA;AACjB,YAAA;AACF,QAAA;QAEAV,eAAAA,CAAgBU,SAAAA,CAAAA;AAClB,IAAA,CAAA;AAEA,IAAA,MAAMC,qBAAqB,CAACD,SAAAA,GAAAA;AAC1B,QAAA,IAAI,CAACA,SAAAA,EAAW;AACd,YAAA;AACF,QAAA;QAEAV,eAAAA,CAAgBU,SAAAA,CAAAA;AAClB,IAAA,CAAA;AAEA,IAAA,MAAME,WAAAA,GAAc,IAAA;;AAElBlB,QAAAA,MAAAA,CAAOxB,aAAa4B,SAAAA,GAAY;YAAEC,aAAAA,EAAe;AAAK,SAAA,CAAA;AACxD,IAAA,CAAA;IAEA,MAAMc,YAAAA,GAAe9C,QAAQa,aAAAA,CAAc;QAAEnC,EAAAA,EAAIsB,KAAAA;QAAO+C,cAAAA,EAAgB/C;KAAM,CAAA,GAAK,EAAA;IACnF,MAAMgD,eAAAA,GAAkB9C,WAAAA,GAAcW,aAAAA,CAAcX,WAAAA,CAAAA,GAAe6B,SAAAA;AACnE,IAAA,MAAMxC,QAAQsB,aAAAA,CAAcT,SAAAA,CAAAA;AAE5B,IAAA,MAAM6C,kBAAkB9B,OAAAA,CAAQ,IAAA;AAC9B,QAAA,MAAMlC,UAAuB,EAAE;QAE/B,KAAK,MAAMoC,UAAUH,aAAAA,CAAe;YAClCjC,OAAAA,CAAQK,IAAI,eACV4D,GAAA,CAACC,cAAAA,EAAAA;AAA+B5C,gBAAAA,KAAAA,EAAOc,OAAO3C,EAAE;AAC7C2C,gBAAAA,QAAAA,EAAAA,MAAAA,CAAO9B;AADW8B,aAAAA,EAAAA,MAAAA,CAAO3C,EAAE,CAAA,CAAA;AAIlC,QAAA;;AAGA,QAAA,IAAI8D,aAAAA,IAAiB,CAACpB,cAAAA,CAAexB,GAAG,CAAC4C,aAAAA,CAAAA,EAAgB;YACvDvD,OAAAA,CAAQK,IAAI,eACV4D,GAAA,CAACC,cAAAA,EAAAA;gBAA4C5C,KAAAA,EAAOiC,aAAAA;AACjDA,gBAAAA,QAAAA,EAAAA;eADkB,CAAC,IAAI,EAAEA,aAAAA,CAAAA,CAAe,CAAA,CAAA;AAI/C,QAAA;QAEA,OAAOvD,OAAAA;IACT,CAAA,EAAG;AAACiC,QAAAA,aAAAA;AAAeE,QAAAA,cAAAA;AAAgBoB,QAAAA;AAAc,KAAA,CAAA;IAEjD,qBACEY,IAAA,CAACC,MAAMC,IAAI,EAAA;QAACtD,KAAAA,EAAO8C,YAAAA;QAAczD,IAAAA,EAAMA,IAAAA;;AACrC,0BAAA6D,GAAA,CAACG,MAAME,KAAK,EAAA;AAAEhE,gBAAAA,QAAAA,EAAAA;;0BACd2D,GAAA,CAACM,QAAAA,EAAAA;AAECC,gBAAAA,gBAAAA,EAAkBhB,aAAAA,IAAiBV,SAAAA;gBACnC2B,cAAAA,EAAgBd,kBAAAA;AAChBrC,gBAAAA,KAAAA,EAAOiC,aAAAA,IAAiBT,SAAAA;gBACxB7B,WAAAA,EAAa8C,eAAAA;gBACb1C,QAAAA,EAAUoC,YAAAA;gBACViB,OAAAA,EAASd,WAAAA;gBACTe,SAAS,EAAA,IAAA;AAERX,gBAAAA,QAAAA,EAAAA;AATIlC,aAAAA,EAAAA,OAAAA,CAAAA;AAWP,0BAAAmC,GAAA,CAACG,MAAMQ,KAAK,EAAA,EAAA;;;AAGlB;;;;"}

package/dist/admin/components/FormModal/FormModal.js

@@ -18,6 +18,7 @@ var getTrad = require('../../utils/getTrad.js');
 var isAllowedContentTypesForRelations = require('../../utils/isAllowedContentTypesForRelations.js');
 var conditions = require('../../utils/conditions.js');
 var findAttribute = require('../../utils/findAttribute.js');
+var folderTelemetry = require('../../utils/folderTelemetry.js');
 var getYupInnerErrors = require('../../utils/getYupInnerErrors.js');
 var AllowedTypesSelect = require('../AllowedTypesSelect.js');
 var AttributeOptions = require('../AttributeOptions/AttributeOptions.js');
@@ -30,6 +31,7 @@ var useCTBTracking = require('../CTBSession/useCTBTracking.js');
 var CustomRadioGroup = require('../CustomRadioGroup/CustomRadioGroup.js');
 var useDataManager = require('../DataManager/useDataManager.js');
 var DraftAndPublishToggle = require('../DraftAndPublishToggle.js');
+var FolderSelect = require('../FolderSelect.js');
 var FormModalEndActions = require('../FormModalEndActions.js');
 var FormModalHeader = require('../FormModalHeader.js');
 var useFormModalNavigation = require('../FormModalNavigation/useFormModalNavigation.js');
@@ -418,6 +420,20 @@ const FormModal = ()=>{
             }));
             sendButtonAddMoreFieldEvent(shouldContinue);
             const ctTargetUid = targetUid;
+            const folderSelection = modifiedData.folder;
+            const trackFolderAssignment = ()=>{
+                if (!folderSelection) {
+                    return;
+                }
+                if ('newFolderName' in folderSelection) {
+                    trackUsage(folderTelemetry.DID_ACT_ON_FOLDERS, {
+                        operation: folderTelemetry.folderTelemetryOperation('create')
+                    });
+                }
+                trackUsage(folderTelemetry.DID_ACT_ON_FOLDERS, {
+                    operation: folderTelemetry.folderTelemetryOperation('assign')
+                });
+            };
             if (isCreatingContentType) {
                 // Create the content type schema
                 if (isCreating) {
@@ -430,8 +446,10 @@ const FormModal = ()=>{
                             singularName: toStringValue(modifiedData.singularName),
                             pluralName: toStringValue(modifiedData.pluralName)
                         },
-                        uid
+                        uid,
+                        folder: folderSelection
                     });
+                    trackFolderAssignment();
                     // Redirect the user to the created content type
                     navigate({
                         pathname: `/plugins/${pluginId.pluginId}/content-types/${uid}`
@@ -450,8 +468,10 @@ const FormModal = ()=>{
                                 kind: toContentTypeKind(modifiedData.kind),
                                 draftAndPublish: toBooleanValue(modifiedData.draftAndPublish),
                                 pluginOptions: toRecordValue(modifiedData.pluginOptions)
-                            }
+                            },
+                            folder: folderSelection
                         });
+                        trackFolderAssignment();
                     } else {
                         toggleNotification({
                             type: 'danger',
@@ -837,6 +857,7 @@ const FormModal = ()=>{
             'checkbox-with-number-field': CheckboxWithNumberField.CheckboxWithNumberField,
             'icon-picker': IconPicker.IconPicker,
             'content-type-radio-group': ContentTypeRadioGroup.ContentTypeRadioGroup,
+            'content-type-folder-select': FolderSelect.FolderSelect,
             'radio-group': CustomRadioGroup.CustomRadioGroup,
             relation: Relation.Relation,
             'select-category': SelectCategory.SelectCategory,