strapi-plugin-navigation 1.1.3 → 2.0.0-beta.4

package/{services → server/services}/utils/constant.js

@@ -1,10 +1,12 @@
 module.exports = {
     TEMPLATE_DEFAULT: 'Generic',
+
     KIND_TYPES: {
         SINGLE: 'singleType',
         COLLECTION: 'collectionType'
     },
+
     MODEL_TYPES: {
         CONTENT_TYPE: 'contentType'
-    },
+    }
 };

package/server/services/utils/functions.js

@@ -0,0 +1,185 @@
+const {
+  last,
+  isObject,
+  isEmpty,
+  flatten,
+  find,
+  isString,
+  get,
+} = require('lodash');
+
+const { type: itemType } = require('../../content-types/navigation-item/lifecycle');
+const { NavigationError } = require('../../../utils/NavigationError');
+const { TEMPLATE_DEFAULT } = require('./constant');
+
+module.exports = ({ strapi }) => {
+  return {
+    singularize(value = '') {
+      return last(value) === 's' ? value.substr(0, value.length - 1) : value;
+    },
+
+    extractMeta(plugins) {
+      const { navigation: plugin } = plugins;
+      const { navigation: service } = plugin.services;
+      const {
+        navigation: masterModel,
+        'navigation-item': itemModel,
+        audience: audienceModel,
+        'navigations-items-related': relatedModel,
+      } = plugin.contentTypes;
+      return {
+        masterModel,
+        itemModel,
+        relatedModel,
+        audienceModel,
+        service,
+        plugin,
+        pluginName: 'navigation',
+      };
+    },
+
+    buildNestedStructure(entities, id = null, field = 'parent') {
+      return entities
+        .filter(entity => {
+          if (entity[field] == null && id === null) {
+            return true;
+          }
+          let data = entity[field];
+          if (data && typeof id === 'string') {
+            data = data.toString();
+          }
+          return (data && data === id) || (isObject(entity[field]) && (entity[field].id === id));
+        })
+        .map(entity => {
+          return ({
+            ...entity,
+            related: !isEmpty(entity.related) ? [last(entity.related)] : entity.related,
+            items: this.buildNestedStructure(entities, entity.id, field),
+          });
+        });
+    },
+
+    prepareAuditLog(actions) {
+      return [
+        ...new Set(
+          actions
+            .filter(_ => !!_)
+            .flatMap(({ remove, create, update }) => {
+              return [create ? 'CREATE' : '', update ? 'UPDATE' : '', remove ? 'REMOVE' : '']
+                .filter(_ => !!_);
+            }),
+        ),
+      ]
+        .join('_');
+    },
+
+    sendAuditLog(auditLogInstance, event, data) {
+      if (auditLogInstance && auditLogInstance.emit) {
+        auditLogInstance.emit(event, data);
+      }
+    },
+
+    checkDuplicatePath(parentItem, checkData) {
+      return new Promise((resolve, reject) => {
+        if (parentItem && parentItem.items) {
+          for (let item of checkData) {
+            for (let _ of parentItem.items) {
+              if (_.path === item.path && (_.id !== item.id) && (item.type === itemType.INTERNAL)) {
+                return reject(
+                  new NavigationError(
+                    `Duplicate path:${item.path} in parent: ${parentItem.title || 'root'} for ${item.title} and ${_.title} items`,
+                    {
+                      parentTitle: parentItem.title,
+                      parentId: parentItem.id,
+                      path: item.path,
+                      errorTitles: [item.title, _.title],
+                    },
+                  ),
+                );
+              }
+            }
+          }
+        }
+        return resolve();
+      });
+    },
+
+    async templateNameFactory(items, strapi, contentTypes = []) {
+      const flatRelated = flatten(items.map(i => i.related)).filter(_ => !!_);
+      const relatedMap = flatRelated.reduce((acc, curr) => {
+        if (!acc[curr.__contentType]) {
+          acc[curr.__contentType] = [];
+        }
+        acc[curr.__contentType].push(curr.id);
+        return acc;
+      }, {});
+      const responses = await Promise.all(
+        Object.entries(relatedMap)
+          .map(
+            ([contentType, ids]) => {
+              const contentTypeUid = get(find(contentTypes, cnt => cnt.uid === contentType), 'uid');
+              return strapi.query(contentTypeUid)
+                .findMany({ id_in: ids, _limit: -1 })
+                .then(res => ({ [contentType]: res }))
+            }),
+      );
+      const relatedResponseMap = responses.reduce((acc, curr) => ({ ...acc, ...curr }), {});
+      const singleTypes = new Map(
+        contentTypes
+          .filter(x => x.isSingle)
+          .map(({ contentTypeName, templateName }) => [contentTypeName, templateName || contentTypeName])
+      );
+
+      return (contentType, id) => {
+        const template = get(relatedResponseMap[contentType].find(data => data.id === id), 'template');
+
+        if (template) {
+          const templateComponent = this.getTemplateComponentFromTemplate(template);
+          return get(templateComponent, 'options.templateName', TEMPLATE_DEFAULT);
+        }
+
+        if (singleTypes.get(contentType)) {
+          return singleTypes.get(contentType);
+        }
+
+        return TEMPLATE_DEFAULT;
+      };
+    },
+
+    getTemplateComponentFromTemplate(template = []) {
+      const componentName = get(first(template), '__component');
+      return componentName ? strapi.components[componentName] : null;
+    },
+
+    composeItemTitle(item = {}, fields = {}, contentTypes = []) {
+      const { title, related } = item;
+      if (title) {
+        return isString(title) && !isEmpty(title) ? title : undefined;
+      } else if (related) {
+        const relationTitle = this.extractItemRelationTitle(isArray(related) ? last(related) : related, fields, { contentTypes });
+        return isString(relationTitle) && !isEmpty(relationTitle) ? relationTitle : undefined;
+      }
+      return undefined;
+    },
+
+    extractItemRelationTitle(relatedItem = {}, fields = {}, contentTypes = []) {
+      const { __contentType } = relatedItem;
+      const contentType = find(contentTypes, _ => _.contentTypeName === __contentType);
+      const { default: defaultFields = [] } = fields;
+      return get(fields, `${contentType ? contentType.collectionName : ''}`, defaultFields).map((_) => relatedItem[_]).filter((_) => _)[0] || '';
+    },
+
+    filterOutUnpublished(item) {
+      const relatedItem = item.related && last(item.related);
+      const isHandledByPublshFlow = relatedItem ? 'published_at' in relatedItem : false;
+
+      if (isHandledByPublshFlow) {
+        const isRelatedDefinedAndPublished = relatedItem ?
+          isHandledByPublshFlow && get(relatedItem, 'published_at') :
+          false;
+        return item.type === itemType.INTERNAL ? isRelatedDefinedAndPublished : true;
+      }
+      return (item.type === itemType.EXTERNAL) || relatedItem;
+    },
+  };
+}

package/strapi-admin.js

@@ -0,0 +1 @@
+module.exports = require('./admin/src').default;

package/strapi-server.js

@@ -0,0 +1,20 @@
+const bootstrap = require('./server/bootstrap');
+const services = require('./server/services');
+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 = () => {
+  return {
+    bootstrap,
+    config,
+    routes,
+    controllers,
+    services,
+    contentTypes,
+    register,
+  };
+};

package/__mocks__/helpers/another-plugin/blog-post.settings.json

@@ -1,31 +0,0 @@
-{
-  "uid": "plugins::another-plugin.blog-post",
-  "plugin": "another-plugin",
-  "kind": "collectionType",
-  "collectionName": "blog_posts",
-  "info": {
-    "name": "Blog post"
-  },
-  "options": {
-    "increments": true,
-    "timestamps": true,
-    "searchable": true,
-    "previewable": true
-  },
-  "attributes": {
-    "title": {
-      "type": "string",
-      "required": true
-    },
-    "altTitle": {
-      "type": "string"
-    },
-    "navigation": {
-      "model": "navigationitem",
-      "plugin": "navigation",
-      "via": "related",
-      "configurable": false,
-      "hidden": true
-    }
-  }
-}

package/__mocks__/helpers/another-plugin/pages.settings.json

@@ -1,28 +0,0 @@
-{
-  "uid": "plugins::another-plugin.pages",
-  "plugin": "another-plugin",
-  "kind": "collectionType",
-  "collectionName": "pages",
-  "info": {
-    "name": "Pages"
-  },
-  "options": {
-    "increments": true,
-    "timestamps": true,
-    "searchable": true,
-    "previewable": true
-  },
-  "attributes": {
-    "title": {
-      "type": "string",
-      "required": true
-    },
-    "navigation": {
-      "model": "navigationitem",
-      "plugin": "navigation",
-      "via": "related",
-      "configurable": false,
-      "hidden": true
-    }
-  }
-}

package/__mocks__/helpers/blog-post.settings.json

@@ -1,31 +0,0 @@
-{
-  "uid": "application::blog-post.blog-post",
-  "kind": "collectionType",
-  "collectionName": "blog_posts",
-  "info": {
-    "name": "Blog post"
-  },
-  "options": {
-    "increments": true,
-    "timestamps": true,
-    "searchable": true,
-    "previewable": true,
-    "draftAndPublish": true
-  },
-  "attributes": {
-    "title": {
-      "type": "string",
-      "required": true
-    },
-    "altTitle": {
-      "type": "string"
-    },
-    "navigation": {
-      "model": "navigationitem",
-      "plugin": "navigation",
-      "via": "related",
-      "configurable": false,
-      "hidden": true
-    }
-  }
-}

package/__mocks__/helpers/home-page.settings.json

@@ -1,4 +0,0 @@
-{ 
-    
-  "uid": "application::page-homes.home-page",
-  "kind": "singleType", "collectionName": "page_homes", "info": { "name": "Page Home" }, "options": { "increments": true, "timestamps": true, "draftAndPublish": true }, "attributes": { "Subtitle": { "type": "string" }, "Title": { "type": "string" }, "Summary": { "type": "text" }, "Image": { "model": "file", "via": "related", "allowedTypes": [ "images" ], "plugin": "upload", "required": false }, "Components": { "type": "dynamiczone", "components": [] }, "navigation": { "model": "navigationitem", "plugin": "navigation", "via": "related", "configurable": false, "hidden": true } } }

package/__mocks__/helpers/my-homepage.settings.json

@@ -1,27 +0,0 @@
-{
-  "uid": "application::my-homepages.my-homepage",
-  "kind": "singleType",
-  "collectionName": "my-homepages",
-  "info": {
-    "name": "My Homepage",
-    "description": ""
-  },
-  "options": {
-    "increments": true,
-    "timestamps": true,
-    "draftAndPublish": true,
-    "templateName": "AwesomeTemplate"
-  },
-  "attributes": {
-    "Welcome": {
-      "type": "string"
-    },
-    "navigation": {
-      "model": "navigationitem",
-      "plugin": "navigation",
-      "via": "related",
-      "configurable": false,
-      "hidden": true
-    }
-  }
-}

package/__mocks__/helpers/pages.settings.json

@@ -1,27 +0,0 @@
-{
-  "uid": "application::pages.pages",
-  "kind": "collectionType",
-  "collectionName": "pages",
-  "info": {
-    "name": "Pages"
-  },
-  "options": {
-    "increments": true,
-    "timestamps": true,
-    "searchable": true,
-    "previewable": true
-  },
-  "attributes": {
-    "title": {
-      "type": "string",
-      "required": true
-    },
-    "navigation": {
-      "model": "navigationitem",
-      "plugin": "navigation",
-      "via": "related",
-      "configurable": false,
-      "hidden": true
-    }
-  }
-}

package/__mocks__/helpers/strapi.js

@@ -1,101 +0,0 @@
-const {get} = require('lodash');
-function setupStrapi() {
-    Object.defineProperty(global, 'strapi', {
-        value: {
-          query: jest.fn().mockImplementation(() => ({
-              count: jest.fn().mockImplementation(),
-          })),
-          config: {
-              custom: {
-                  plugins: {
-                      navigation: {
-                          contentTypesNameFields: {
-                              'blog_posts': ['altTitle'],
-                          },
-                      },
-                  },
-              },
-            get(path, defaultValue) {
-              return get(strapi, path, defaultValue);
-            },
-          },
-          api: {
-              'home-page': {
-                  config: {
-                      routes: [
-                        {
-                          method: 'GET',
-                          path: '/custom-api',
-                          handler: 'home-page.find',
-                        },
-                        {
-                          method: 'PUT',
-                          path: '/custom-api',
-                          handler: 'home-page.update',
-                        },
-                      ]
-                  }
-              }
-          },
-          contentTypes: {
-            'pages': {
-                ...require('./pages.settings.json'),
-                apiName: 'pages',
-                modelName: 'pages',
-                associations: [{ model: 'navigationitem' }],
-            },
-            'application::blog-post.blog-post': {
-                ...require('./blog-post.settings.json'),
-                apiName: 'blog-posts',
-                modelName: 'blog-posts',
-                associations: [{ model: 'navigationitem' }],
-            },
-            'application::my-homepages.my-homepage': {
-                ...require('./my-homepage.settings.json'),
-                apiName: 'my-homepage',
-                modelName: 'my-homepage',
-                associations: [{ model: 'navigationitem' }],
-            },
-            'application::page-homes.home-page': {
-                ...require('./home-page.settings.json'),
-                apiName: 'custom-api',
-                modelName: 'home-page',
-                associations: [{ model: 'navigationitem' }],
-            },
-            'plugins::another-plugin.pages': {
-                ...require('./another-plugin/pages.settings.json'),
-                modelName: 'plugin-pages',
-                associations: [{ model: 'navigationitem' }],
-            },
-            'plugins::another-plugin.blog-post': {
-                ...require('./another-plugin/blog-post.settings.json'),
-                modelName: 'plugin-blog-posts',
-                associations: [{ model: 'navigationitem' }],
-            }
-          },
-          plugins: {
-              navigation: {
-                  services: {
-                      navigation: jest.fn().mockImplementation(),
-                  },
-                relatedContentTypes: [
-                  'application::pages.pages',
-                  'application::blog-post.blog-post',
-                  'application::my-homepages.my-homepage',
-                  'application::page-homes.home-page',
-                  'plugins::another-plugin.pages',
-                  'plugins::another-plugin.blog-post'
-                ]
-              },
-              anotherPlugin: {
-                  models: {
-                      'plugin-pages': require('./another-plugin/pages.settings.json'),
-                      'plugin-blog-post': require('./another-plugin/blog-post.settings.json'),
-                  }
-              }
-          },
-      },
-      writable: true,
-    })
-}
-module.exports = { setupStrapi };

package/admin/src/assets/images/icon-cross-blue.svg

@@ -1 +0,0 @@
-<svg width="8" height="8" xmlns="http://www.w3.org/2000/svg"><path d="M7.78 6.72L5.06 4l2.72-2.72a.748.748 0 0 0 0-1.06.748.748 0 0 0-1.06 0L4 2.94 1.28.22a.748.748 0 0 0-1.06 0 .748.748 0 0 0 0 1.06L2.94 4 .22 6.72a.748.748 0 0 0 0 1.06.748.748 0 0 0 1.06 0L4 5.06l2.72 2.72a.748.748 0 0 0 1.06 0 .752.752 0 0 0 0-1.06z" fill="#007EFF" fill-rule="evenodd"/></svg>

package/admin/src/assets/images/icon_remove.svg

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
-    <title>Icon remove</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Pages" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Content-Manager---List-view" transform="translate(-279.000000, -165.000000)">
-            <g id="Container" transform="translate(234.000000, 0.000000)">
-                <g id="Add-filters" transform="translate(0.000000, 60.000000)">
-                    <g id="Icon-remove" transform="translate(45.000000, 105.000000)">
-                        <rect id="Rectangle-12" stroke="#E3E9F3" x="0.5" y="0.5" width="19" height="19" rx="9.5"></rect>
-                        <path d="M6,10 L14,10" id="Line-4" stroke="#007EFF" stroke-width="2" stroke-linecap="round"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

package/admin/src/components/Container/index.js

@@ -1,7 +0,0 @@
-import styled from "styled-components";
-
-const Container = styled.div`
-  padding: 0 30px;
-`;
-
-export default Container;

package/admin/src/components/Input/index.js

@@ -1,41 +0,0 @@
-import React from "react";
-import { Inputs } from "@buffetjs/custom";
-import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
-
-const Input = ({ error, label, placeholder, ...rest }) => {
-  const { formatMessage } = useIntl();
-  const labelMessage = formatMessage({ id: label });
-  const placeholderMessage = placeholder
-    ? formatMessage({ id: placeholder })
-    : "";
-  let errorMessage = error;
-
-  if (error) {
-    errorMessage = formatMessage(error);
-  }
-
-  return (
-    <Inputs
-      {...rest}
-      error={errorMessage}
-      label={labelMessage}
-      placeholder={placeholderMessage}
-    />
-  );
-};
-
-Input.defaultProps = {
-  error: null,
-  placeholder: null,
-  containerStyle: {},
-};
-
-Input.propTypes = {
-  error: PropTypes.object,
-  label: PropTypes.string.isRequired,
-  placeholder: PropTypes.string,
-  containerStyle: PropTypes.object,
-};
-
-export default Input;

package/admin/src/components/Item/CardItem.js

@@ -1,46 +0,0 @@
-import styled from "styled-components";
-import { Card } from "@buffetjs/styles";
-import { colors } from "strapi-helper-plugin";
-
-export const CartItemWidth = "25vw";
-
-const CardItem = styled(Card)`
-  max-width: ${CartItemWidth};
-  margin-bottom: ${(props) => (props.hasChildren ? 0 : "2rem")};
-  padding: 1rem;
-
-  border-bottom: tranparent;
-
-  position: relative;
-
-  transition: all 0.15s ease-in-out;
-
-  ${({hasError, theme})=> hasError && `
-    border: 1px solid ${theme.main.colors.red};
-  `}
-
-  ${ props => !props.removed && `
-    &:hover {
-      background-color: ${colors.lightGrey};
-
-      padding-left: 1.5rem;
-
-      cursor: pointer;
-    }
-  `}
-
-  ${ props => props.removed && `
-    background-color: ${colors.lightGrey};
-
-    p, small, span {
-      filter: blur(.25rem);
-      -webkit-filter: blur(.25rem);
-    }
-  `}
-
-  p {
-    margin-bottom: 0;
-  }
-`;
-
-export default CardItem;

package/admin/src/components/Item/CardItemLevelAdd.js

@@ -1,41 +0,0 @@
-import styled from "styled-components";
-
-import { Button } from "@buffetjs/core";
-import { sizes } from "strapi-helper-plugin";
-import { CartItemWidth } from "./CardItem";
-
-export const buttonRadius = 1.6 * sizes.margin;
-
-const CardItemLevelAdd = styled(Button)`
-  display: flex;
-  width: ${2 * buttonRadius}px;
-  height: ${2 * buttonRadius}px;
-  margin-left: ${(props) => (props.root ? `${-1 * buttonRadius}px` : "2rem")};
-  align-items: center;
-  justify-content: center;
-
-  position: absolute;
-  top: ${(props) => (props.root ? "-2rem" : `${3.2 * sizes.margin}px`)};
-  bottom: auto;
-  left: ${(props) => (props.root ? "2rem" : CartItemWidth)};
-  z-index: 1;
-
-  border-radius: ${buttonRadius}px;
-
-  ${(props) =>
-    !props.menuLevel &&
-    `
-    background: none;
-
-    &:hover,
-    &:active {
-      background: none;
-    }
-  `}
-
-  svg {
-    margin-right: 0;
-  }
-`;
-
-export default CardItemLevelAdd;

package/admin/src/components/Item/CardItemLevelWrapper.js

@@ -1,27 +0,0 @@
-import styled from "styled-components";
-
-import { sizes } from "strapi-helper-plugin";
-import CardItem from "./CardItem";
-
-const CardItemLevelWrapper = styled.ul`
-  padding: 0;
-  margin: 0;
-
-  list-style: none;
-
-  position: relative;
-  z-index: 1;
-
-  ${CardItemLevelWrapper} {
-    padding-left: ${4 * sizes.margin}px;
-
-    position: relative;
-    z-index: 0;
-
-    ${CardItem} {
-      margin-top: ${2 * sizes.margin}px;
-    }
-  }
-`;
-
-export default CardItemLevelWrapper;

package/admin/src/components/Item/CardItemPath.js

@@ -1,9 +0,0 @@
-import styled from "styled-components";
-
-import { colors } from "strapi-helper-plugin";
-
-const CardItemPath = styled.small`
-  color: ${colors.leftMenu.darkGrey};
-`;
-
-export default CardItemPath;