strapi-plugin-navigation 2.0.1 → 2.0.2

package/server/controllers/navigation.js

@@ -19,10 +19,34 @@ const errorHandler = (ctx) => (error) => {
   throw error;
 };
 
-module.exports = {
+module.exports = ({strapi}) => ({
   async config() {
     return getService().config();
   },
+
+  async updateConfig(ctx) {
+    await getService().updateConfig(ctx.request.body)
+    return ctx.send({ status: 200 });
+  },
+
+  async restoreConfig(ctx) {
+    await getService().restoreConfig()
+    return ctx.send({ status: 200 })
+  },
+
+  async settingsConfig() {
+    return getService().config(true);
+  },
+
+  async settingsRestart(ctx) {
+    try {
+      await getService().restart();
+      return ctx.send({ status: 200 });
+    } catch (e) {
+      errorHandler(ctx, e);
+    }
+  },
+
   async get() {
     return getService().get();
   },
@@ -69,4 +93,4 @@ module.exports = {
       menuOnly
     );
   },
-};
+});

package/server/graphql/index.js

@@ -2,16 +2,15 @@ const getTypes = require('./types');
 const getQueries = require('./queries');
 const getResolversConfig = require('./resolvers-config');
 
-module.exports = () => {
+module.exports = async ({ strapi, config }) => {
 	const extensionService = strapi.plugin('graphql').service('extension');
-
 	extensionService.shadowCRUD('plugin::navigation.audience').disable();
 	extensionService.shadowCRUD('plugin::navigation.navigation').disable();
 	extensionService.shadowCRUD('plugin::navigation.navigation-item').disable();
 	extensionService.shadowCRUD('plugin::navigation.navigations-items-related').disable();
 
-	extensionService.use(({ nexus }) => {
-		const types = getTypes({ strapi, nexus });
+	extensionService.use(({strapi, nexus}) => {
+		const types = getTypes({ strapi, nexus, config });
 		const queries = getQueries({ strapi, nexus });
 		const resolversConfig = getResolversConfig({ strapi });
 

package/server/graphql/types/content-types-name-fields.js

@@ -1,8 +1,10 @@
 module.exports = ({ nexus }) => nexus.objectType({
   name: "ContentTypesNameFields",
-  definition(t) {
+  async definition(t) {
 		t.nonNull.list.nonNull.string("default")
-		const contentTypesNameFields = strapi.plugin('navigation').config('contentTypesNameFields')
+		const pluginStore = strapi.store({ type: 'plugin', name: 'navigation' });
+		const config = await pluginStore.get({ key: 'config' });
+		const contentTypesNameFields = config.contentTypesNameFields;
 		Object.keys(contentTypesNameFields || {}).forEach(key => t.nonNull.list.string(key))
   }
 })

package/server/graphql/types/navigation-related.js

@@ -1,5 +1,5 @@
-module.exports = ({ strapi, nexus }) => {
-	const related = strapi.plugin('navigation').config('gql')?.navigationItemRelated;
+module.exports = ({ strapi, nexus, config }) => {
+	const related = config.gql?.navigationItemRelated;
 	const name = "NavigationRelated";
 
 	if (related?.length) {

package/server/routes/admin.js

@@ -16,6 +16,16 @@ module.exports = {
       path: '/config',
       handler: 'navigation.config',
     },
+    {
+      method: 'PUT',
+      path: '/config',
+      handler: 'navigation.updateConfig',
+    },
+    {
+      method: 'DELETE',
+      path: '/config',
+      handler: 'navigation.restoreConfig',
+    },
     {
       method: 'GET',
       path: '/:id',
@@ -33,6 +43,19 @@ module.exports = {
       policies: [
         'admin::isAuthenticatedAdmin'
       ]
-    }
+    },
+    {
+      method: 'GET',
+      path: '/settings/config',
+      handler: 'navigation.settingsConfig',
+    },
+    {
+      method: 'GET',
+      path: '/settings/restart',
+      handler: 'navigation.settingsRestart',
+      config: {
+        policies: [],
+      },
+    },
   ]
 }

package/server/services/navigation.js

@@ -19,7 +19,7 @@ const { KIND_TYPES } = require('./utils/constant');
 const utilsFunctionsFactory = require('./utils/functions');
 const { renderType } = require('../content-types/navigation/lifecycle');
 const { type: itemType, additionalFields: configAdditionalFields } = require('../content-types/navigation-item').lifecycle;
-const { NotFoundError } =  require('@strapi/utils').errors
+const { NotFoundError } = require('@strapi/utils').errors
 const excludedContentTypes = ['strapi::'];
 const contentTypesNameFieldsDefaults = ['title', 'subject', 'name'];
 
@@ -65,12 +65,19 @@ module.exports = ({ strapi }) => {
       };
     },
 
+    async restart() {
+        setImmediate(() => strapi.reload());
+    },
+
     // Get plugin config
-    async config() {
-      const { pluginName, audienceModel, service } = utilsFunctions.extractMeta(strapi.plugins);
-      const additionalFields = strapi.plugin(pluginName).config('additionalFields')
-      const contentTypesNameFields = strapi.plugin(pluginName).config('contentTypesNameFields');
-      const allowedLevels = strapi.plugin(pluginName).config('allowedLevels');
+    async config(viaSettingsPage = false) {
+      const { audienceModel, service } = utilsFunctions.extractMeta(strapi.plugins);
+      const pluginStore = await strapi.store({ type: 'plugin', name: 'navigation' });
+      const config = await pluginStore.get({ key: 'config' });
+      const additionalFields = config.additionalFields;
+      const contentTypesNameFields = config.contentTypesNameFields;
+      const allowedLevels = config.allowedLevels;
+      const isGQLPluginEnabled = !isNil(strapi.plugin('graphql'));
 
       let extendedResult = {};
       const result = {
@@ -81,6 +88,7 @@ module.exports = ({ strapi }) => {
         },
         allowedLevels,
         additionalFields,
+        isGQLPluginEnabled: viaSettingsPage ? isGQLPluginEnabled : undefined,
       };
 
       if (additionalFields.includes(configAdditionalFields.AUDIENCE)) {
@@ -102,10 +110,33 @@ module.exports = ({ strapi }) => {
       };
     },
 
+    async updateConfig(newConfig) {
+      const pluginStore = await strapi.store({ type: 'plugin', name: 'navigation' });
+      await pluginStore.set({ key: 'config', value: newConfig });
+    },
+
+    async restoreConfig() {
+      const pluginStore = await strapi.store({ type: 'plugin', name: 'navigation' });
+      const defaultConfig = await strapi.plugin('navigation').config
+
+      await pluginStore.delete({ key: 'config' })
+      await pluginStore.set({
+        key: 'config', value: {
+          additionalFields: defaultConfig('additionalFields'),
+          contentTypes: defaultConfig('contentTypes'),
+          contentTypesNameFields: defaultConfig('contentTypesNameFields'),
+          allowedLevels: defaultConfig('allowedLevels'),
+          gql: defaultConfig('gql'),
+        }
+      });
+    },
+
     async configContentTypes() {
+      const pluginStore = strapi.store({ type: 'plugin', name: 'navigation' });
+      const config = await pluginStore.get({ key: 'config' });
       const eligibleContentTypes =
         await Promise.all(
-          strapi.plugin('navigation').config('contentTypes')
+          config.contentTypes
             .filter(contentType => !!strapi.contentTypes[contentType])
             .map(
               async (key) => {

package/strapi-server.js

@@ -4,7 +4,6 @@ const routes = require('./server/routes');
 const controllers = require('./server/controllers');
 const contentTypes = require('./server/content-types');
 const config = require('./server/config');
-const register = require('./server/register');
 
 
 module.exports = () => {
@@ -15,6 +14,5 @@ module.exports = () => {
     controllers,
     services,
     contentTypes,
-    register,
   };
 };