strapi-plugin-navigation 3.0.2 → 3.0.3

package/README.md

@@ -571,16 +571,14 @@ query {
     path
     related {
       id
-      attributes {
-        __typename
+      __typename
 
-        ... on Page {
-          Title
-        }
+      ... on Page {
+        Title
+      }
 
-        ... on WithFlowType {
-          Name
-        }
+      ... on WithFlowType {
+        Name
       }
     }
     items {
@@ -589,16 +587,14 @@ query {
       path
       related {
         id
-        attributes {
-          __typename
+        __typename
 
-          ... on Page {
-            Title
-          }
+        ... on Page {
+          Title
+        }
 
-          ... on WithFlowType {
-            Name
-          }
+        ... on WithFlowType {
+          Name
         }
       }
     }
@@ -618,10 +614,8 @@ query {
         "path": "/test-path",
         "related": {
           "id": 3,
-          "attributes": {
-            "__typename": "WithFlowType",
-            "Name": "Test"
-          }
+          "__typename": "WithFlowType",
+          "Name": "Test"
         },
         "items": [
           {
@@ -630,10 +624,8 @@ query {
             "path": "/test-path/nested-one",
             "related": {
               "id": 1,
-              "attributes": {
-                  "__typename": "Page",
-                "Title": "Eg. Page title"
-              }
+              "__typename": "Page",
+              "Title": "Eg. Page title"
             }
           }
         ]

package/dist/admin/index.js

@@ -53557,7 +53557,8 @@ const NavigationItemForm = ({
     },
     [contentTypeItemsQuery.data, configQuery.data, contentTypes]
   );
-  const navigationItemTypeOptions = ["INTERNAL", "EXTERNAL", "WRAPPER"].map((key) => {
+  const availableNavigationItemTypeOptions = !configQuery.data?.contentTypes.length ? ["EXTERNAL", "WRAPPER"] : ["INTERNAL", "EXTERNAL", "WRAPPER"];
+  const navigationItemTypeOptions = availableNavigationItemTypeOptions.map((key) => {
     return {
       key,
       value: key,
@@ -53739,7 +53740,7 @@ const NavigationItemForm = ({
                   onChange: (eventOrPath) => handleChange("type", eventOrPath, onChange),
                   value: values.type,
                   name: "type",
-                  disabled: !configQuery.data?.contentTypes.length || !canUpdate,
+                  disabled: !canUpdate,
                   width: "100%",
                   children: navigationItemTypeOptions.map(({ key, label, value }) => /* @__PURE__ */ jsxRuntime.jsx(SingleSelectOption, { value, children: label }, key))
                 }
@@ -54957,24 +54958,25 @@ const CustomFieldTable = ({
                   children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { textColor: "neutral800", children: customField.required ? /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$4x, {}) : /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$1Z, {}) })
                 }
               ) }),
-              /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsxs(Flex, { direction: "row", size: 1, children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Td, { children: /* @__PURE__ */ jsxRuntime.jsx(Flex, { width: "100%", justifyContent: "flex-end", alignItems: "center", children: /* @__PURE__ */ jsxRuntime.jsxs(IconButtonGroup, { children: [
                 /* @__PURE__ */ jsxRuntime.jsx(
                   IconButton$1,
                   {
-                    onClick: () => onOpenModal(customField),
-                    label: formatMessage(getTrad(`${tradPrefix}edit`)),
-                    children: /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$1r, {}),
+                    onClick: () => onToggleCustomField(customField),
+                    label: formatMessage(
+                      getTrad(`${tradPrefix}${customField.enabled ? "disable" : "enable"}`)
+                    ),
+                    variant: customField.enabled ? "success-light" : "tertiary",
+                    children: customField.enabled ? /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$3x, {}) : /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$3v, {}),
                     style: { minWidth: 50 }
                   }
                 ),
                 /* @__PURE__ */ jsxRuntime.jsx(
                   IconButton$1,
                   {
-                    onClick: () => onToggleCustomField(customField),
-                    label: formatMessage(
-                      getTrad(`${tradPrefix}${customField.enabled ? "disable" : "enable"}`)
-                    ),
-                    children: customField.enabled ? /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$3x, {}) : /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$3v, {}),
+                    onClick: () => onOpenModal(customField),
+                    label: formatMessage(getTrad(`${tradPrefix}edit`)),
+                    children: /* @__PURE__ */ jsxRuntime.jsx(ForwardRef$1r, {}),
                     style: { minWidth: 50 }
                   }
                 ),
@@ -54987,7 +54989,7 @@ const CustomFieldTable = ({
                     style: { minWidth: 50 }
                   }
                 )
-              ] }) })
+              ] }) }) })
             ] }, customField.name) : null
           ) })
         ]

package/dist/admin/index.mjs

@@ -53537,7 +53537,8 @@ const NavigationItemForm = ({
     },
     [contentTypeItemsQuery.data, configQuery.data, contentTypes]
   );
-  const navigationItemTypeOptions = ["INTERNAL", "EXTERNAL", "WRAPPER"].map((key) => {
+  const availableNavigationItemTypeOptions = !configQuery.data?.contentTypes.length ? ["EXTERNAL", "WRAPPER"] : ["INTERNAL", "EXTERNAL", "WRAPPER"];
+  const navigationItemTypeOptions = availableNavigationItemTypeOptions.map((key) => {
     return {
       key,
       value: key,
@@ -53719,7 +53720,7 @@ const NavigationItemForm = ({
                   onChange: (eventOrPath) => handleChange("type", eventOrPath, onChange),
                   value: values.type,
                   name: "type",
-                  disabled: !configQuery.data?.contentTypes.length || !canUpdate,
+                  disabled: !canUpdate,
                   width: "100%",
                   children: navigationItemTypeOptions.map(({ key, label, value }) => /* @__PURE__ */ jsx(SingleSelectOption, { value, children: label }, key))
                 }
@@ -54937,24 +54938,25 @@ const CustomFieldTable = ({
                   children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", children: customField.required ? /* @__PURE__ */ jsx(ForwardRef$4x, {}) : /* @__PURE__ */ jsx(ForwardRef$1Z, {}) })
                 }
               ) }),
-              /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsxs(Flex, { direction: "row", size: 1, children: [
+              /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Flex, { width: "100%", justifyContent: "flex-end", alignItems: "center", children: /* @__PURE__ */ jsxs(IconButtonGroup, { children: [
                 /* @__PURE__ */ jsx(
                   IconButton$1,
                   {
-                    onClick: () => onOpenModal(customField),
-                    label: formatMessage(getTrad(`${tradPrefix}edit`)),
-                    children: /* @__PURE__ */ jsx(ForwardRef$1r, {}),
+                    onClick: () => onToggleCustomField(customField),
+                    label: formatMessage(
+                      getTrad(`${tradPrefix}${customField.enabled ? "disable" : "enable"}`)
+                    ),
+                    variant: customField.enabled ? "success-light" : "tertiary",
+                    children: customField.enabled ? /* @__PURE__ */ jsx(ForwardRef$3x, {}) : /* @__PURE__ */ jsx(ForwardRef$3v, {}),
                     style: { minWidth: 50 }
                   }
                 ),
                 /* @__PURE__ */ jsx(
                   IconButton$1,
                   {
-                    onClick: () => onToggleCustomField(customField),
-                    label: formatMessage(
-                      getTrad(`${tradPrefix}${customField.enabled ? "disable" : "enable"}`)
-                    ),
-                    children: customField.enabled ? /* @__PURE__ */ jsx(ForwardRef$3x, {}) : /* @__PURE__ */ jsx(ForwardRef$3v, {}),
+                    onClick: () => onOpenModal(customField),
+                    label: formatMessage(getTrad(`${tradPrefix}edit`)),
+                    children: /* @__PURE__ */ jsx(ForwardRef$1r, {}),
                     style: { minWidth: 50 }
                   }
                 ),
@@ -54967,7 +54969,7 @@ const CustomFieldTable = ({
                     style: { minWidth: 50 }
                   }
                 )
-              ] }) })
+              ] }) }) })
             ] }, customField.name) : null
           ) })
         ]

package/dist/server/index.js

@@ -846,7 +846,7 @@ const navigationItem$1 = ({ nexus, config: config2 }) => nexus.objectType({
     t.field("parent", { type: "NavigationItem" });
     t.string("master");
     t.list.field("items", { type: "NavigationItem" });
-    t.field("related", { type: "NavigationItemRelatedData" });
+    t.field("related", { type: "NavigationItemRelated" });
     if (config2.additionalFields.find((field) => field === "audience")) {
       t.list.string("audience");
     }
@@ -912,7 +912,7 @@ const navigationItemRelated = ({ strapi: strapi2, nexus, config: config2 }) => {
         t.members(...related);
       },
       resolveType: (item) => {
-        return strapi2.contentTypes[item.uid]?.globalId;
+        return strapi2.contentTypes[item.__type]?.globalId;
       }
     });
   }
@@ -926,14 +926,6 @@ const navigationItemRelated = ({ strapi: strapi2, nexus, config: config2 }) => {
     }
   });
 };
-const navigationItemRelatedData = ({ nexus }) => nexus.objectType({
-  name: "NavigationItemRelatedData",
-  definition(t) {
-    t.int("id");
-    t.nonNull.string("documentId");
-    t.field("attributes", { type: "NavigationItemRelated" });
-  }
-});
 const renderType = ({ nexus }) => nexus.enumType({
   name: "NavigationRenderType",
   members: ["FLAT", "TREE"]
@@ -942,7 +934,6 @@ const typesFactories = [
   navigationItemAdditionalFieldMedia,
   navigationItemAdditionalFields,
   navigationItemRelated,
-  navigationItemRelatedData,
   navigationItem$1,
   renderType,
   navigation$1,

package/dist/server/index.mjs

@@ -808,7 +808,7 @@ const navigationItem$1 = ({ nexus, config: config2 }) => nexus.objectType({
     t.field("parent", { type: "NavigationItem" });
     t.string("master");
     t.list.field("items", { type: "NavigationItem" });
-    t.field("related", { type: "NavigationItemRelatedData" });
+    t.field("related", { type: "NavigationItemRelated" });
     if (config2.additionalFields.find((field) => field === "audience")) {
       t.list.string("audience");
     }
@@ -874,7 +874,7 @@ const navigationItemRelated = ({ strapi: strapi2, nexus, config: config2 }) => {
         t.members(...related);
       },
       resolveType: (item) => {
-        return strapi2.contentTypes[item.uid]?.globalId;
+        return strapi2.contentTypes[item.__type]?.globalId;
       }
     });
   }
@@ -888,14 +888,6 @@ const navigationItemRelated = ({ strapi: strapi2, nexus, config: config2 }) => {
     }
   });
 };
-const navigationItemRelatedData = ({ nexus }) => nexus.objectType({
-  name: "NavigationItemRelatedData",
-  definition(t) {
-    t.int("id");
-    t.nonNull.string("documentId");
-    t.field("attributes", { type: "NavigationItemRelated" });
-  }
-});
 const renderType = ({ nexus }) => nexus.enumType({
   name: "NavigationRenderType",
   members: ["FLAT", "TREE"]
@@ -904,7 +896,6 @@ const typesFactories = [
   navigationItemAdditionalFieldMedia,
   navigationItemAdditionalFields,
   navigationItemRelated,
-  navigationItemRelatedData,
   navigationItem$1,
   renderType,
   navigation$1,

package/dist/server/src/dtos/navigation-item.d.ts

@@ -1,15 +1,16 @@
 import { NavigationItemDBSchema, NavigationItemType } from '../schemas';
 import { NavigationDTO } from './navigation';
 export type NavigationItemDTO = Omit<NavigationItemDBSchema, 'related' | 'items' | 'master' | 'parent'> & {
-    related?: {
-        __type: string;
-        documentId: string;
-    } | null;
+    related?: NavigationItemRelatedDTO | null;
     items?: NavigationItemDTO[];
     master?: NavigationDTO;
     parent?: NavigationItemDTO | null;
     order?: number;
 };
+export type NavigationItemRelatedDTO = {
+    __type: string;
+    documentId: string;
+};
 export type CreateBranchNavigationItemDTO = Omit<NavigationItemDBSchema, 'id' | 'documentId' | 'items'> & {
     id?: number;
     documentId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-navigation",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Strapi - Navigation plugin",
   "strapi": {
     "name": "navigation",

package/dist/server/src/graphql/types/navigation-item-related-data.d.ts

@@ -1,2 +0,0 @@
-declare const _default: ({ nexus }: any) => any;
-export default _default;