strapi-plugin-navigation 2.0.0 → 2.0.1

package/README.md

@@ -16,6 +16,12 @@
   <a href="https://codecov.io/gh/VirtusLab/strapi-plugin-navigation">
     <img src="https://codecov.io/gh/VirtusLab/strapi-plugin-navigation/coverage.svg?branch=master" alt="codecov.io" />
   </a>
+  <a href="https://sharing.clickup.com/tl/xhcmx-43/strapiv-4-navigation-roadmap">
+    <img src="https://img.shields.io/website?down_message=roadmap&label=product&up_message=roadmap&url=https%3A%2F%2Fsharing.clickup.com%2Ftl%2Fxhcmx-43%2Fstrapiv-4-navigation-roadmap" />
+  </a>
+  <a href="https://sharing.clickup.com/b/6-169004201-2/strapiv-4-navigation-board">
+    <img src="https://img.shields.io/website?down_message=board&label=product&up_color=blue&up_message=board&url=https%3A%2F%2Fsharing.clickup.com%2Fb%2F6-169004201-2%2Fstrapiv-4-navigation-board" />
+  </a>
 </div>
 
 ---
@@ -35,10 +41,10 @@ Strapi Navigation Plugin provides a website navigation / menu builder feature fo
 - **Navigation Public API:** Simple and ready for use API endpoint for consuming the navigation structure you've created
 - **Visual builder:** Elegant and easy to use visual builder
 - **Any Content Type relation:** Navigation can by linked to any of your Content Types by default. Simply, you're controlling it and also limiting available content types by configuration props
+- **Multiple navigations:** Create as many Navigation containers as you want, setup them and use in the consumer application
 - **Customizable:** Possibility to customize the options like: available Content Types, Maximum level for "attach to menu", Additional fields (audience)
 - **[Audit log](https://github.com/VirtusLab/strapi-molecules/tree/master/packages/strapi-plugin-audit-log):** integration with Strapi Molecules Audit Log plugin that provides changes track record
 
-
 ## ⚙️ Versions
 
 - **Strapi v4** - (current) - [v2.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-navigation)
@@ -389,6 +395,15 @@ Live example of plugin usage can be found in the [VirtusLab Strapi Examples](htt
 
 ## 🤝 Contributing
 
+<div>
+  <a href="https://sharing.clickup.com/tl/xhcmx-43/strapiv-4-navigation-roadmap">
+    <img src="https://img.shields.io/website?down_message=roadmap&label=product&up_message=roadmap&url=https%3A%2F%2Fsharing.clickup.com%2Ftl%2Fxhcmx-43%2Fstrapiv-4-navigation-roadmap" />
+  </a>
+  <a href="https://sharing.clickup.com/b/6-169004201-2/strapiv-4-navigation-board">
+    <img src="https://img.shields.io/website?down_message=board&label=product&up_color=blue&up_message=board&url=https%3A%2F%2Fsharing.clickup.com%2Fb%2F6-169004201-2%2Fstrapiv-4-navigation-board" />
+  </a>
+</div>
+
 Feel free to fork and make a Pull Request to this plugin project. All the input is warmly welcome!
 
 ## 👨‍💻 Community support

package/admin/src/components/Item/ItemCardBadge/index.js

@@ -5,7 +5,7 @@ const ItemCardBadge = styled(Badge)`
 		border: 1px solid ${({ theme, borderColor }) => theme.colors[borderColor]};
 
 		${ props => props.small && `
-			padding: 0 4px;
+			padding: ${props.theme.spaces[1]};
 			margin: 0px ${props.theme.spaces[3]};
 			vertical-align: middle;
 

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

@@ -150,7 +150,6 @@ Item.propTypes = {
     uiRouterKey: PropTypes.string,
     path: PropTypes.string,
     externalPath: PropTypes.string,
-    audience: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])),
     related: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     menuAttached: PropTypes.bool
   }).isRequired,

package/admin/src/pages/View/components/NavigationItemForm/index.js

@@ -6,18 +6,19 @@ import { Formik } from 'formik'
 
 // Design System
 import { ModalBody } from '@strapi/design-system/ModalLayout';
+import { Select, Option } from '@strapi/design-system/Select';
 import { Grid, GridItem } from '@strapi/design-system/Grid';
 import { Form, GenericInput } from '@strapi/helper-plugin';
 
 import { NavigationItemPopupFooter } from '../NavigationItemPopup/NavigationItemPopupFooter';
 
 
-import { navigationItemType } from '../../utils/enums';
+import { navigationItemAdditionalFields, navigationItemType } from '../../utils/enums';
 import slugify from 'slugify';
 import { extractRelatedItemLabel } from '../../utils/parsers';
 import { form as formDefinition } from './utils/form';
 import { checkFormValidity } from '../../utils/form';
-import { getTradId } from '../../../../translations';
+import { getTradId, getTrad } from '../../../../translations';
 
 const NavigationItemForm = ({
   isLoading,
@@ -52,22 +53,29 @@ const NavigationItemForm = ({
       ...data,
       type: data.type || navigationItemType.INTERNAL,
       related: data.related?.value,
-      relatedType: data.relatedType?.value
+      relatedType: data.relatedType?.value,
+      audience: data.audience?.map(item => item.id),
     });
   }
 
+  const audience = get(form, `${inputsPrefix}audience`, []);
+  const audienceOptions = availableAudience.map((item) => ({
+    value: get(item, 'id', " "),
+    label: get(item, 'name', " "),
+  }));
+
   const generatePreviewPath = () => {
     if (!isExternal) {
       const value = `${data.levelPath !== '/' ? `${data.levelPath}` : ''}/${form.path !== '/' ? form.path || '' : ''}`;
       return {
         id: getTradId('popup.item.form.type.external.description'),
         defaultMessage: '',
-        values: { value  }
+        values: { value }
       }
     }
     return null;
   };
-  
+
   const sanitizePayload = (payload = {}) => {
     const { onItemClick, onItemLevelAddClick, related, relatedType, menuAttached, ...purePayload } = payload;
     const sanitizedType = purePayload.type || navigationItemType.INTERNAL;
@@ -103,6 +111,10 @@ const NavigationItemForm = ({
   const onTypeChange = ({ target: { name, value } }) =>
     onChange({ target: { name, value: value ? navigationItemType.INTERNAL : navigationItemType.EXTERNAL } });
 
+  const onAudienceChange = (value) => {
+    onChange({target: {name: `${inputsPrefix}audience`, value}});
+  }
+
   const onChange = ({ target: { name, value } }) => {
     setFormState(prevState => ({
       ...prevState,
@@ -139,7 +151,7 @@ const NavigationItemForm = ({
     .filter((item) => {
       const usedContentTypeEntitiesOfSameType = usedContentTypeEntities
         .filter(uctItem => relatedTypeSelectValue === uctItem.__collectionUid);
-      return !find(usedContentTypeEntitiesOfSameType, uctItem => (item.id === uctItem.id && uctItem.id !== form.related)); 
+      return !find(usedContentTypeEntitiesOfSameType, uctItem => (item.id === uctItem.id && uctItem.id !== form.related));
     })
     .map((item) => {
       const label = appendLabelPublicationStatus(
@@ -380,6 +392,22 @@ const NavigationItemForm = ({
                   )}
                 </>
               )}
+
+              {additionalFields.includes(navigationItemAdditionalFields.AUDIENCE) && (
+                <GridItem key={`${inputsPrefix}audience`} col={6} lg={12}>
+                  <Select
+                    id={`${inputsPrefix}audience`}
+                    placeholder={formatMessage(getTrad('popup.item.form.audience.placeholder'))}
+                    label={formatMessage(getTrad('popup.item.form.audience.label'))}
+                    onChange={onAudienceChange}
+                    value={audience}
+                    multi
+                    withTags
+                  >
+                    {audienceOptions.map(({ value, label }) => <Option key={value} value={value}>{label}</Option>)}
+                  </Select>
+                </GridItem>
+              )}
             </Grid>
           </ModalBody>
         </Form>

package/admin/src/translations/en.json

@@ -25,7 +25,7 @@
 	"popup.item.form.type.external.label": "External source",
 	"popup.item.form.type.external.description": "Output path: {value}",
 	"popup.item.form.audience.label": "Audience",
-	"popup.item.form.audience.placeholder": "Type to start searching...",
+	"popup.item.form.audience.placeholder": "Select audience...",
 	"popup.item.form.relatedSection.label": "Relation to",
 	"popup.item.form.relatedType.label": "Content Type",
 	"popup.item.form.relatedType.placeholder": "Select content type...",

package/package.json

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

package/server/services/navigation.js

@@ -56,7 +56,7 @@ module.exports = ({ strapi }) => {
             limit: -1,
           },
           sort: ['order:asc'],
-          populate: ['related', 'parent']
+          populate: ['related', 'parent', 'audience']
         });
       const entities = await this.getRelatedItems(entityItems);
       return {

package/.circleci/config.yml

@@ -1,48 +0,0 @@
-version: 2.1
-orbs:
-  codecov: codecov/codecov@1.1.1
-jobs:
-  build-and-test:
-    environment:
-      CODECOV_TOKEN: a9097475-0b5b-481f-8733-7b84574d583e
-    docker:
-      - image: circleci/node:14.17.2
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          name: set GIT name and email
-          command: |
-            git config --global -l
-            git config --global user.email "$GIT_COMMITTER_EMAIL"
-            git config --global user.name "$GIT_COMMITTER_NAME"
-            git config --global -l
-      - restore_cache:
-          keys:
-            # when lock file changes, use increasingly general patterns to restore cache
-            - strapi-plugin-navigation-v1-{{ checksum "yarn.lock" }}
-            - strapi-plugin-navigation-
-      - run:
-          name: Echo versions
-          command: |
-            node --version
-            yarn --version
-      - run:
-          name: Install
-          command: |
-            yarn install
-      - run:
-          name: Test
-          command: |
-            yarn test:unit
-      - codecov/upload:
-          flags: unittest
-          file:
-      - save_cache:
-          paths:
-            - ./node_modules
-          key: strapi-plugin-navigation-v1-{{ checksum "yarn.lock" }}
-workflows:
-    build-and-test:
-      jobs:
-        - build-and-test

package/.eslintrc

@@ -1,35 +0,0 @@
-{
-  "parserOptions": {
-    "jsx": true,
-    "useJSXTextNode": true,
-    "sourceType": "module"
-  },
-  "plugins": ["react-hooks", "import"],
-  "rules": {
-    "no-console": "warn",
-    "curly": "warn",
-    "prefer-template": "warn",
-
-    "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "error",
-
-    "import/no-default-export": "warn",
-    "import/newline-after-import": "warn",
-    "import/order": [
-      "warn",
-      {
-        "newlines-between": "always",
-        "alphabetize": { "order": "asc" },
-        "pathGroupsExcludedImportTypes": ["builtin"],
-        "groups": [
-          "builtin",
-          "external",
-          "internal",
-          "parent",
-          "sibling",
-          "index"
-        ]
-      }
-    ]
-  }
-}

package/.github/pull_request_template.md

@@ -1,13 +0,0 @@
-## Ticket
-
-https://github.com/VirtusLab/strapi-plugin-navigation/issues/-<your-ticket-#>
-
-## Summary
-
-What does this PR do/solve? 
-
-> PRs should be as small as they need to be, if this section starts becoming a novel you should _seriously_ consider breaking it up into multiple PRs
-
-## Test Plan
-
-How are you testing the work you're submitting?

package/.github/stale.yml

@@ -1,15 +0,0 @@
-daysUntilStale: 30
-daysUntilClose: 7
-exemptLabels:
-  - pinned
-  - security
-  - backlog
-  - enhancement
-  - feature request
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-closeComment: false

package/.nvmrc

@@ -1 +0,0 @@
-v14.17.3

package/codecov.yml

@@ -1,3 +0,0 @@
-comment:
-  branches:
-    - master