Cleanup plugin, Move config to pluginOptions

Freyb · Jun 5, 2023 · 7c048ae · 7c048ae
1 parent 1a60a5b
commit 7c048ae
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 213 deletions.
diff --git a/admin/src/components/SelectorField/index.js b/admin/src/components/SelectorField/index.js
@@ -1,17 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { useCMEditViewDataManager } from '@strapi/helper-plugin';
+import { get } from 'lodash';
 import {
   Field,
   FieldLabel,
   FieldError,
   FieldHint,
   Select,
   Option,
-  Loader,
   Stack,
+  Typography,
 } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
-import useConfig from '../../hooks/useConfig';
+import pluginId from '../../pluginId';
 
 const SelectorField = ({
   value,
@@ -26,12 +28,13 @@ const SelectorField = ({
   disabled,
   error,
 }) => {
-  // const { options = {} } = attribute;
-  const { config, isLoading: configIsLoading } = useConfig();
-
   const { formatMessage } = useIntl();
-
-  console.log('Tags', config);
+  const { allLayoutData } = useCMEditViewDataManager();
+  const pluginOptions = get(
+    allLayoutData,
+    `contentType.pluginOptions.${pluginId}`,
+  );
+  const tagsEnabled = !!pluginOptions;
 
   return (
     <Field
@@ -44,15 +47,17 @@ const SelectorField = ({
       <Stack spacing={1}>
         <FieldLabel action={labelAction}>{formatMessage(intlLabel)}</FieldLabel>
 
-        {configIsLoading ? (
-          <Loader small>Loading content...</Loader>
+        {!tagsEnabled ? (
+          <Typography fontWeight="bold">
+            Invalid scheme configuration
+          </Typography>
         ) : (
           <Select
             placeholder={placeholder && formatMessage(placeholder)}
             aria-label={formatMessage(intlLabel)}
             aria-disabled={disabled}
             disabled={disabled}
-            value={value || config.defaultTag}
+            value={value || pluginOptions.defaultTag}
             onChange={(newValue) => {
               onChange({
                 target: {
@@ -63,7 +68,7 @@ const SelectorField = ({
               });
             }}
           >
-            {Object.keys(config.tags).map((tagKey) => (
+            {Object.keys(pluginOptions.tags).map((tagKey) => (
               <Option key={tagKey} value={tagKey}>
                 {tagKey}
               </Option>

diff --git a/admin/src/hooks/contentManagerHooks/addColumnToTable.js b/admin/src/hooks/contentManagerHooks/addColumnToTable.js
@@ -1,9 +1,8 @@
 import React from 'react';
 import get from 'lodash/get';
 import styled from 'styled-components';
-import { Status, Typography, Loader } from '@strapi/design-system';
+import { Status, Typography } from '@strapi/design-system';
 import pluginId from '../../pluginId';
-import useConfig from '../useConfig';
 
 const StyledStatus = styled(Status)`
   width: min-content;
@@ -28,15 +27,13 @@ const addColumnToTableHook = ({ displayedHeaders, layout }) => {
           searchable: true,
           sortable: true,
         },
-        name: 'content-tags',
+        name: pluginOptions.fieldName,
         cellFormatter(cellData) {
-          const { config, isLoading: configIsLoading } = useConfig();
-
-          if (configIsLoading) return <Loader small>Loading content...</Loader>;
-
-          const tagKey = cellData[pluginOptions.fieldName] ?? config.defaultTag;
+          const tagKey =
+            cellData[pluginOptions.fieldName] ?? pluginOptions.defaultTag;
           const tagProperties =
-            config.tags[tagKey] || config.tags[config.defaultTag];
+            pluginOptions.tags[tagKey] ||
+            pluginOptions.tags[pluginOptions.defaultTag];
           const tagColor = tagProperties.color;
 
           return (

diff --git a/admin/src/hooks/useConfig/index.js b/admin/src/hooks/useConfig/index.js
diff --git a/admin/src/pages/App/index.js b/admin/src/pages/App/index.js
diff --git a/server/bootstrap.js b/server/bootstrap.js
diff --git a/server/config/index.js b/server/config/index.js
diff --git a/server/content-types/index.js b/server/content-types/index.js
diff --git a/server/controllers/config-controller.js b/server/controllers/config-controller.js
diff --git a/server/controllers/index.js b/server/controllers/index.js
diff --git a/server/destroy.js b/server/destroy.js
diff --git a/server/index.js b/server/index.js
@@ -1,25 +1,7 @@
 'use strict';
 
 const register = require('./register');
-const bootstrap = require('./bootstrap');
-const destroy = require('./destroy');
-const config = require('./config');
-const contentTypes = require('./content-types');
-const controllers = require('./controllers');
-const routes = require('./routes');
-const middlewares = require('./middlewares');
-const policies = require('./policies');
-const services = require('./services');
 
 module.exports = {
   register,
-  bootstrap,
-  destroy,
-  config,
-  controllers,
-  routes,
-  services,
-  contentTypes,
-  policies,
-  middlewares,
 };
diff --git a/server/middlewares/index.js b/server/middlewares/index.js
diff --git a/server/policies/index.js b/server/policies/index.js
diff --git a/server/routes/index.js b/server/routes/index.js
diff --git a/server/services/config-service.js b/server/services/config-service.js
diff --git a/server/services/index.js b/server/services/index.js