fix(app-aco): add support for titleFieldId defined in the content m…

…odel (#3554)
webiny · Oct 3, 2023 · 115653b · 115653b
1 parent 770a185
commit 115653b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/app-aco/src/contexts/acoList.tsx b/packages/app-aco/src/contexts/acoList.tsx
@@ -98,6 +98,7 @@ const getCurrentRecordList = <T = GenericSearchData,>(
 export interface AcoListProviderProps {
     children: React.ReactNode;
     own?: boolean;
+    titleFieldId: string | null;
 }
 
 export const AcoListProvider: React.VFC<AcoListProviderProps> = ({ children, ...props }) => {
@@ -208,7 +209,10 @@ export const AcoListProvider: React.VFC<AcoListProviderProps> = ({ children, ...
      */
     useEffect(() => {
         setFolders(prev => {
-            return sortTableItems(prev, state.listSort);
+            const titleField = props?.titleFieldId || "id";
+            return sortTableItems(prev, state.listSort, {
+                [titleField]: "title"
+            });
         });
     }, [state.listSort]);
 

diff --git a/packages/app-aco/src/contexts/app.tsx b/packages/app-aco/src/contexts/app.tsx
@@ -252,7 +252,7 @@ export const AcoAppProvider: React.VFC<AcoAppProviderProps> = ({
                         createListLink={createNavigateFolderListLink}
                         createStorageKey={createNavigateFolderStorageKey}
                     >
-                        <AcoListProvider own={own}>
+                        <AcoListProvider own={own} titleFieldId={model.titleFieldId}>
                             <DialogsContextProvider>{children}</DialogsContextProvider>
                         </AcoListProvider>
                     </NavigateFolderWithRouterProvider>

diff --git a/packages/app-headless-cms/src/admin/components/ContentEntries/Table/index.tsx b/packages/app-headless-cms/src/admin/components/ContentEntries/Table/index.tsx
@@ -75,8 +75,10 @@ export const Table = forwardRef<HTMLDivElement, Props>((props, ref) => {
     );
 
     const columns: Columns<Entry> = useMemo(() => {
+        const titleColumnId = model.titleFieldId || "id";
+
         return {
-            title: {
+            [titleColumnId]: {
                 header: "Name",
                 className: "cms-aco-list-title",
                 cell: (record: Entry) => {