strapi-plugin-navigation 3.0.0-beta.2 → 3.0.0-beta.3

package/dist/admin/src/pages/HomePage/components/NavigationItemForm/index.d.ts

@@ -17,6 +17,6 @@ type NavigationItemFormProps = {
     permissions?: Partial<{
         canUpdate: boolean;
     }>;
-    currentNavigation: Pick<NavigationSchema, 'id' | 'documentId' | 'localeCode'>;
+    currentNavigation: Pick<NavigationSchema, 'id' | 'documentId' | 'locale'>;
 };
 export declare const NavigationItemForm: React.FC<NavigationItemFormProps>;

package/dist/admin/src/pages/HomePage/components/NavigationItemPopup/index.d.ts

@@ -13,7 +13,7 @@ interface Props {
     permissions?: {
         canUpdate?: boolean;
     };
-    currentNavigation: Pick<NavigationSchema, 'id' | 'documentId' | 'localeCode'>;
+    currentNavigation: Pick<NavigationSchema, 'id' | 'documentId' | 'locale'>;
 }
 declare const NavigationItemPopUp: FC<Props>;
 export default NavigationItemPopUp;

package/dist/admin/src/pages/HomePage/components/NavigationManager/types.d.ts

@@ -1,6 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
 import { NavigationSchema } from '../../../../api/validators';
-export type Navigation = Pick<NavigationSchema, 'id' | 'items' | 'name' | 'localeCode' | 'visible' | 'documentId' | 'slug'>;
+export type Navigation = Pick<NavigationSchema, 'id' | 'items' | 'name' | 'locale' | 'visible' | 'documentId' | 'slug'>;
 export type NewNavigation = Omit<Navigation, 'id' | 'documentId' | 'slug'>;
 export type State = InitialState | ListState | EditState | CreateState | DeleteState | PurgeCacheState | ErrorState;
 export type SetState = Dispatch<SetStateAction<State>>;

package/dist/admin/src/pages/HomePage/hooks/index.d.ts

@@ -35,7 +35,7 @@ export declare const useNavigations: () => import("@tanstack/react-query").UseQu
     documentId: string;
     items: NavigationItemSchema[];
     slug: string;
-    localeCode: string;
+    locale: string;
     visible: boolean;
 }[], Error>;
 export declare const useHardReset: () => () => void;
@@ -63,7 +63,7 @@ export declare const useCreateNavigation: () => import("@tanstack/react-query").
     documentId: string;
     items: NavigationItemSchema[];
     slug: string;
-    localeCode: string;
+    locale: string;
     visible: boolean;
 }, "id" | "documentId" | "slug">, unknown>;
 export declare const useUpdateNavigation: (onSuccess?: Effect<void>) => import("@tanstack/react-query").UseMutationResult<import("@strapi/strapi/admin").FetchResponse<any>, Error, {
@@ -72,7 +72,7 @@ export declare const useUpdateNavigation: (onSuccess?: Effect<void>) => import("
     documentId: string;
     items: NavigationItemSchema[];
     slug: string;
-    localeCode: string;
+    locale: string;
     visible: boolean;
 }, unknown>;
 export declare const usePurgeNavigation: () => import("@tanstack/react-query").UseMutationResult<unknown, Error, string[] | undefined, unknown>;

package/dist/admin/src/pages/SettingsPage/hooks/index.d.ts

@@ -46,7 +46,7 @@ export declare const useConfig: () => import("@tanstack/react-query").UseQueryRe
     isCacheEnabled?: boolean | undefined;
     isCachePluginEnabled?: boolean | undefined;
 }, Error>;
-export declare const useRestart: () => import("@tanstack/react-query").UseMutationResult<void, Error, void, unknown>;
+export declare const useRestart: () => import("@tanstack/react-query").UseMutationResult<import("@tanstack/react-query").QueryObserverResult<import("@strapi/strapi/admin").FetchResponse<any>, Error>, Error, void, unknown>;
 export declare const useRestoreConfig: () => import("@tanstack/react-query").UseMutationResult<void, Error, void, unknown>;
 export declare const useContentTypes: () => import("@tanstack/react-query").UseQueryResult<{
     kind: "collectionType" | "singleType";

package/dist/admin/src/translations/ca.d.ts

@@ -432,6 +432,10 @@ declare const ca: {
         };
     };
     components: {
+        toggle: {
+            enabled: string;
+            disabled: string;
+        };
         navigationItem: {
             action: {
                 newItem: string;

package/dist/server/index.js

@@ -1,7 +1,6 @@
 "use strict";
 const z = require("zod");
 const ___default = require("lodash");
-const cuid2 = require("@paralleldrive/cuid2");
 const fp = require("lodash/fp");
 const require$$1 = require("crypto");
 const require$$0$1 = require("child_process");
@@ -260,7 +259,7 @@ const navigationDBSchema = (withItems) => z__namespace.object({
   documentId: z__namespace.string(),
   name: z__namespace.string(),
   slug: z__namespace.string(),
-  localeCode: z__namespace.string(),
+  locale: z__namespace.string(),
   visible: z__namespace.boolean(),
   items: withItems ? z__namespace.array(navigationItemDBSchema) : navigationItemDBSchema.array().optional()
 });
@@ -269,7 +268,7 @@ const createNavigationSchema = navigationDBSchema(false).omit({
   id: true,
   documentId: true,
   slug: true,
-  localeCode: true
+  locale: true
 }).extend({
   documentId: z__namespace.string().optional(),
   id: z__namespace.undefined().optional()
@@ -527,15 +526,15 @@ const getNavigationItemRepository = ___default.once((context) => ({
   save(item) {
     const { itemModel } = getPluginModels(context);
     if (typeof item.documentId === "string") {
-      const { documentId, id, ...rest } = item;
-      return context.strapi.query(itemModel.uid).update({ where: { documentId: item.documentId }, data: { ...rest } });
+      const { documentId, ...rest } = item;
+      return context.strapi.documents(itemModel.uid).update({ documentId: item.documentId, data: { ...rest } });
     } else {
-      return context.strapi.query(itemModel.uid).create({ data: item });
+      return context.strapi.documents(itemModel.uid).create({ data: item });
     }
   },
-  find({ where, limit, order, populate: populate2 }) {
+  find({ filters: filters2, locale: locale2, limit, order, populate: populate2 }) {
     const { itemModel } = getPluginModels(context);
-    return context.strapi.query(itemModel.uid).findMany({ where, limit, populate: populate2, orderBy: order }).then(navigationItemsDBSchema.parse);
+    return context.strapi.documents(itemModel.uid).findMany({ filters: filters2, locale: locale2, limit, populate: populate2, orderBy: order }).then(navigationItemsDBSchema.parse);
   },
   count(where) {
     const { itemModel } = getPluginModels(context);
@@ -584,31 +583,33 @@ const calculateItemsRequirement = (populate2) => {
   return populate2 === true ? true : Array.isArray(populate2) ? populate2.includes("items") : false;
 };
 const getNavigationRepository = ___default.once((context) => ({
-  find({ where, limit, orderBy, populate: populate2 }) {
+  find({ filters: filters2, locale: locale2, limit, orderBy, populate: populate2 }) {
     const { masterModel } = getPluginModels(context);
-    return context.strapi.query(masterModel.uid).findMany({ where, limit, populate: populate2, orderBy }).then((data) => {
+    return context.strapi.documents(masterModel.uid).findMany({ filters: filters2, locale: locale2, limit, populate: populate2, orderBy }).then((data) => {
       return navigationDBSchema(calculateItemsRequirement(populate2)).array().parse(data);
     });
   },
-  findOne({ where, populate: populate2 }) {
+  findOne({ locale: locale2, filters: filters2, populate: populate2 }) {
     const { masterModel } = getPluginModels(context);
-    return context.strapi.query(masterModel.uid).findOne({ where, populate: populate2 }).then((data) => {
+    return context.strapi.documents(masterModel.uid).findOne({ documentId: filters2.documentId, locale: locale2, populate: populate2 }).then((data) => {
       return navigationDBSchema(calculateItemsRequirement(populate2)).parse(data);
     });
   },
-  save(navigation2) {
+  async save(navigation2) {
     const { masterModel } = getPluginModels(context);
-    if (navigation2.documentId) {
-      return context.strapi.query(masterModel.uid).update({
-        where: { documentId: navigation2.documentId },
-        data: ___default.omit(navigation2, ["id", "documentId"]),
+    const { documentId, locale: locale2, ...rest } = navigation2;
+    if (documentId) {
+      return context.strapi.documents(masterModel.uid).update({
+        locale: locale2,
+        documentId,
+        data: ___default.omit(rest, ["id", "documentId"]),
         populate: ["items"]
       }).then(navigationDBSchema(false).parse);
     } else {
-      return context.strapi.query(masterModel.uid).create({
+      return context.strapi.documents(masterModel.uid).create({
+        locale: locale2,
         data: {
-          ...navigation2,
-          documentId: navigation2.documentId ?? cuid2.createId(),
+          ...rest,
           populate: ["items"]
         }
       }).then((x) => {
@@ -632,31 +633,32 @@ const navigationSetup = async (context) => {
   const navigationRepository = getNavigationRepository(context);
   const navigations = await navigationRepository.find({
     limit: Number.MAX_SAFE_INTEGER,
-    where: {}
+    filters: {},
+    locale: "*"
   });
   if (navigations.length === 0) {
     navigations.push(
       await navigationRepository.save({
         name: DEFAULT_NAVIGATION_NAME,
-        localeCode: defaultLocale,
         visible: true,
+        locale: defaultLocale,
         slug: `${DEFAULT_NAVIGATION_SLUG}-${defaultLocale}`
       })
     );
   }
   const defaultLocaleNavigations = navigations.filter(
-    ({ localeCode }) => localeCode === defaultLocale
+    ({ locale: locale2 }) => locale2 === defaultLocale
   );
   for (const defaultLocaleNavigation of defaultLocaleNavigations) {
     for (const otherLocale of restLocale) {
       const otherLocaleMissing = !navigations.find(
-        ({ localeCode, documentId }) => documentId === defaultLocaleNavigation.documentId && otherLocale === localeCode
+        ({ locale: locale2, documentId }) => documentId === defaultLocaleNavigation.documentId && otherLocale === locale2
       );
       if (otherLocaleMissing) {
         await navigationRepository.save({
           documentId: defaultLocaleNavigation.documentId,
           name: defaultLocaleNavigation.name,
-          localeCode: otherLocale,
+          locale: otherLocale,
           visible: defaultLocaleNavigation.visible,
           slug: `${defaultLocaleNavigation.slug.replace(`-${defaultLocale}`, "")}-${otherLocale}`
         });
@@ -1090,10 +1092,6 @@ const schema$2 = {
       target: "plugin::navigation.navigation-item",
       configurable: false,
       mappedBy: "master"
-    },
-    localeCode: {
-      type: "string",
-      configurable: false
     }
   }
 };
@@ -14773,7 +14771,7 @@ const processItems = (context) => async (item) => {
     const entity = context.entities.get(related);
     const localeVersion = await strapi.documents(entity.uid).findOne({
       documentId: entity.documentId,
-      locale: context.localeCode,
+      locale: context.locale,
       status: "published"
     });
     if (localeVersion) {
@@ -14961,16 +14959,14 @@ const adminService = (context) => ({
       return acc;
     }, []);
   },
-  async get({ ids, localeCode }) {
-    let where = {};
+  async get({ ids, locale: locale2 }) {
+    let filters2 = {};
     if (ids && ids.length) {
-      where.id = { $in: ids };
-    }
-    if (localeCode) {
-      where.localeCode = localeCode;
+      filters2.id = { $in: ids };
     }
     const dbResults = await getNavigationRepository(context).find({
-      where,
+      filters: filters2,
+      locale: locale2 || "*",
       limit: Number.MAX_SAFE_INTEGER,
       populate: ["items", "items.parent", "items.audience"]
     });
@@ -14979,7 +14975,7 @@ const adminService = (context) => ({
       item,
       parent
     }) => {
-      const children = allItems.filter((child) => child.parent?.id === item.id);
+      const children = allItems.filter((child) => child.parent?.documentId === item.documentId);
       return {
         ...item,
         parent,
@@ -14999,22 +14995,22 @@ const adminService = (context) => ({
           allItems: navigation2.items ?? [],
           item
         })
-      )
+      ).sort((a, b) => a.order - b.order)
     }));
   },
-  async getById({ documentId, localeCode }) {
+  async getById({ documentId, locale: locale2 }) {
     const commonService2 = getPluginService(context, "common");
-    const where = {
+    const { defaultLocale } = await commonService2.readLocale();
+    const filters2 = {
       documentId
     };
-    if (localeCode) {
-      where.localeCode = localeCode;
-    }
     const navigation2 = await getNavigationRepository(context).findOne({
-      where
+      filters: filters2,
+      locale: locale2 || defaultLocale
     });
     const dbNavigationItems = await getNavigationItemRepository(context).find({
-      where: { master: navigation2.id },
+      filters: { master: navigation2.id },
+      locale: locale2 || defaultLocale,
       limit: Number.MAX_SAFE_INTEGER,
       order: [{ order: "asc" }],
       populate: ["parent", "audience"]
@@ -15037,15 +15033,15 @@ const adminService = (context) => ({
     const mainNavigation = await repository.save({
       name,
       visible,
-      localeCode: defaultLocale,
-      slug
+      locale: defaultLocale,
+      slug: `${slug}-${defaultLocale}`
     });
     navigationSummary.push(await this.getById({ documentId: mainNavigation.documentId }));
     for (const localeCode of restLocale) {
       const newLocaleNavigation = await repository.save({
         name,
         visible,
-        localeCode,
+        locale: localeCode,
         slug: `${slug}-${localeCode}`,
         documentId: mainNavigation.documentId
       });
@@ -15075,26 +15071,28 @@ const adminService = (context) => ({
     const repository = getNavigationRepository(context);
     const { name, visible, items } = payload;
     const currentNavigation = await repository.findOne({
-      where: { documentId: payload.documentId, localeCode: payload.localeCode },
-      populate: true
+      filters: { documentId: payload.documentId },
+      locale: payload.locale,
+      populate: "*"
     });
     const currentNavigationAsDTO = await this.getById({
       documentId: payload.documentId,
-      localeCode: payload.localeCode
+      locale: payload.locale
     });
     const detailsHaveChanged = currentNavigation.name !== name || currentNavigation.visible !== visible;
     if (detailsHaveChanged) {
       const allNavigations = await repository.find({
-        where: { documentId: currentNavigation.documentId }
+        filters: { documentId: currentNavigation.documentId }
       });
       for (const navigation2 of allNavigations) {
         const newSlug = name ? await commonService2.getSlug({
-          query: `${name}${navigation2.localeCode !== defaultLocale ? ` ${navigation2.localeCode}` : ""}`
+          query: `${name}${navigation2.locale !== defaultLocale ? ` ${navigation2.locale}` : ""}`
         }) : currentNavigation.slug;
         await repository.save({
           documentId: navigation2.documentId,
           id: navigation2.id,
           slug: newSlug,
+          locale: navigation2.locale,
           name,
           visible
         });
@@ -15115,8 +15113,8 @@ const adminService = (context) => ({
     });
     await commonService2.emitEvent({
       entity: await repository.findOne({
-        where: { documentId: payload.documentId },
-        populate: true
+        filters: { documentId: payload.documentId },
+        populate: "*"
       }),
       event: "entry.update",
       uid: masterModel.uid
@@ -15143,12 +15141,12 @@ const adminService = (context) => ({
       );
     };
     const navigation2 = await navigationRepository.findOne({
-      where: { documentId },
-      populate: true
+      filters: { documentId },
+      populate: "*"
     });
     const allNavigations = await navigationRepository.find({
-      where: { documentId: navigation2.documentId },
-      populate: true
+      filters: { documentId: navigation2.documentId },
+      populate: "*"
     });
     await cleanNavigationItems(
       allNavigations.map(({ documentId: documentId2 }) => documentId2)
@@ -15175,7 +15173,6 @@ const adminService = (context) => ({
       key: "config"
     }).then(configSchema.parse);
     validateAdditionalFields(newConfig.additionalFields);
-    console.log({ newConfig });
     await pluginStore.set({ key: "config", value: newConfig });
     const removedFields = ___default.differenceBy(
       config2.additionalFields,
@@ -15198,11 +15195,11 @@ const adminService = (context) => ({
     target,
     documentId
   }) {
-    const targetEntity = await this.getById({ documentId, localeCode: target });
+    const targetEntity = await this.getById({ documentId, locale: target });
     return await this.i18nNavigationContentsCopy({
-      source: await this.getById({ documentId, localeCode: source }),
+      source: await this.getById({ documentId, locale: source }),
       target: targetEntity
-    }).then(() => this.getById({ documentId, localeCode: target })).then((newEntity) => {
+    }).then(() => this.getById({ documentId, locale: target })).then((newEntity) => {
       sendAuditLog(auditLog, "onChangeNavigation", {
         actionType: "UPDATE",
         oldEntity: targetEntity,
@@ -15221,7 +15218,7 @@ const adminService = (context) => ({
     if (target.items?.length) {
       throw new FillNavigationError("Current navigation is non-empty");
     }
-    if (!target.localeCode) {
+    if (!target.locale) {
       throw new FillNavigationError("Current navigation does not have specified locale");
     }
     if (!sourceItems.length) {
@@ -15230,15 +15227,16 @@ const adminService = (context) => ({
     const entities = /* @__PURE__ */ new Map();
     const itemProcessor = processItems({
       master: target,
-      localeCode: target.localeCode,
+      locale: target.locale,
       strapi,
       entities
     });
     await commonService2.createBranch({
       action: { create: true },
       masterEntity: await navigationRepository.findOne({
-        where: { documentId: target.documentId, localeCode: target.localeCode },
-        populate: true
+        filters: { documentId: target.documentId },
+        locale: target.locale,
+        populate: "*"
       }),
       navigationItems: await Promise.all(sourceItems.map(itemProcessor)),
       parentItem: void 0
@@ -15311,7 +15309,7 @@ const adminService = (context) => ({
   },
   async purgeNavigationCache(documentId, clearLocalisations) {
     const navigationRepository = getNavigationRepository(context);
-    const entity = await navigationRepository.findOne({ where: { documentId } });
+    const entity = await navigationRepository.findOne({ filters: { documentId } });
     if (!entity) {
       throw new errors.NotFoundError("Navigation is not defined");
     }
@@ -15319,7 +15317,7 @@ const adminService = (context) => ({
     let regexps = [mapToRegExp(entity.documentId)];
     if (clearLocalisations) {
       const navigations = await navigationRepository.find({
-        where: {
+        filters: {
           documentId: entity.documentId
         }
       });
@@ -15410,9 +15408,7 @@ const clientService = (context) => ({
   async readAll({ locale: locale2, orderBy = "createdAt", orderDirection = "DESC" }) {
     const repository = getNavigationRepository(context);
     const navigations = repository.find({
-      where: locale2 ? {
-        localeCode: locale2
-      } : {},
+      locale: locale2,
       orderBy: { [orderBy]: orderDirection }
     });
     return navigations;
@@ -15589,26 +15585,34 @@ const clientService = (context) => ({
     };
     const navigationRepository = getNavigationRepository(context);
     const navigationItemRepository = getNavigationItemRepository(context);
-    let navigation2 = await navigationRepository.findOne({
-      where: entityWhereClause
-    });
-    if (locale2 && locale2 !== navigation2.localeCode) {
-      navigation2 = await navigationRepository.findOne({
-        where: {
-          ...entityWhereClause,
-          localeCode: locale2
-        }
+    let navigation2;
+    if (locale2) {
+      navigation2 = await navigationRepository.find({
+        filters: {
+          ...entityWhereClause
+        },
+        locale: locale2,
+        limit: 1
       });
+    } else {
+      navigation2 = await navigationRepository.find({
+        filters: entityWhereClause,
+        limit: 1
+      });
+    }
+    if (___default.isArray(navigation2)) {
+      navigation2 = ___default.first(navigation2);
     }
     if (navigation2 && navigation2.documentId) {
       const navigationItems = await navigationItemRepository.find({
-        where: {
+        filters: {
           master: navigation2,
           ...itemCriteria
         },
+        locale: locale2,
         limit: Number.MAX_SAFE_INTEGER,
         order: [{ order: "asc" }],
-        populate: ["related", "audience", "parent"]
+        populate: ["audience", "parent"]
       });
       const mappedItems = await commonService2.mapToNavigationItemDTO({
         navigationItems,
@@ -15838,7 +15842,7 @@ const commonService = (context) => ({
             documentId,
             ___default.isNil(populate2) ? config2.contentTypesPopulate[uid] || [] : parsePopulateQuery(populate2),
             "published",
-            { locale: master?.localeCode }
+            { locale: master?.locale }
           );
           if (relatedItem) {
             entities.set(related, {
@@ -15935,7 +15939,7 @@ const commonService = (context) => ({
   }) {
     const navigationActions = [];
     for (const navigationItem2 of navigationItems) {
-      if (!navigationItem2.id) {
+      if (!navigationItem2.documentId) {
         continue;
       }
       action.remove = true;
@@ -15961,14 +15965,16 @@ const commonService = (context) => ({
     let navigationActions = [];
     for (const navigationItem2 of navigationItems) {
       action.create = true;
-      const { parent, master, items, id, ...params } = navigationItem2;
-      const insertDetails = id ? {
+      const { parent, master, items, documentId, id, ...params } = navigationItem2;
+      const insertDetails = documentId && id ? {
         ...params,
+        documentId,
         id,
         master: masterEntity ? masterEntity.id : void 0,
         parent: parentItem ? parentItem.id : void 0
       } : {
         ...params,
+        documentId: void 0,
         id: void 0,
         master: masterEntity ? masterEntity.id : void 0,
         parent: parentItem ? parentItem.id : void 0
@@ -15997,11 +16003,11 @@ const commonService = (context) => ({
     const result = [];
     for (const updateDetails of navigationItems) {
       action.update = true;
-      const { id, updated, parent, master, items, ...params } = updateDetails;
+      const { documentId, updated, parent, master, items, ...params } = updateDetails;
       let currentItem;
       if (updated) {
         currentItem = await getNavigationItemRepository(context).save({
-          id,
+          documentId,
           ...params
         });
       } else {
@@ -16046,7 +16052,7 @@ const commonService = (context) => ({
     const removedFieldsKeys = removedFields.map(({ name }) => `additionalFields.${name}`);
     const removedFieldsNames = removedFields.map(({ name }) => name);
     const navigationItems = await getNavigationItemRepository(context).find({
-      where: {
+      filters: {
         additionalFields: {
           $contains: [removedFieldsNames]
         }
@@ -16130,7 +16136,7 @@ const migrationService = (context) => ({
   async migrateRelatedIdToDocumentId() {
     console.log("Navigation plugin :: Migrations :: Relared id to document id - START");
     const navigationItemRepository = getNavigationItemRepository(context);
-    const all = await navigationItemRepository.find({ where: {}, limit: Number.MAX_SAFE_INTEGER });
+    const all = await navigationItemRepository.find({ filters: {}, limit: Number.MAX_SAFE_INTEGER });
     await Promise.all(
       all.map(async (item) => {
         if (item.related) {