Merge pull request #248 from pluginpal/feature/fixes

Fixes

Author: boazpoolman

.changeset/dirty-baths-build.md

@@ -0,0 +1,6 @@
+---
+"webtools-addon-sitemap": patch
+"strapi-plugin-webtools": patch
+---
+
+fix: use generic design-system 'rc' version constraint

.changeset/every-camels-appear.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+fix: show the content type displayName instead of globalId

.changeset/itchy-worlds-shout.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": minor
+---
+
+feat: show the pattern languages in the patterns list

.changeset/nine-breads-attack.md

@@ -0,0 +1,6 @@
+---
+"webtools-addon-sitemap": patch
+"strapi-plugin-webtools": patch
+---
+
+fix: allow & test for node 22

.changeset/quiet-wombats-smoke.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+fix: add some spacing between the table row actions

.changeset/soft-hornets-dream.md

@@ -0,0 +1,6 @@
+---
+"webtools-addon-sitemap": minor
+"strapi-plugin-webtools": minor
+---
+
+feat: create a custom side panel for all Webtools related links

.changeset/tough-sides-scream.md

@@ -0,0 +1,6 @@
+---
+"webtools-addon-sitemap": patch
+"strapi-plugin-webtools": patch
+---
+
+feat: give more feedback about the enabled content types, and add links to the documentation in case no content types have been enabled

.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [18, 20]
+        node: [18, 20, 22]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [18, 20]
+        node: [18, 20, 22]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
@@ -85,9 +85,10 @@ jobs:
           path: cypress/videos
           if-no-files-found: ignore # 'warn' or 'error' are also available, defaults to `warn`
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
-          token: ${{ secrets.CODECOV }}
           flags: unit
           verbose: true
           fail_ci_if_error: true

packages/addons/sitemap/admin/index.js

@@ -18,8 +18,7 @@ export default {
     });
   },
   bootstrap(app) {
-    app.getPlugin('content-manager').injectComponent('editView', 'right-links', {
-      name: 'sitemap-edit-view',
+    app.getPlugin('webtools').injectComponent('webtoolsSidePanel', 'link', {
       Component: EditView,
     });
 

packages/addons/sitemap/admin/tabs/CollectionURLs/index.jsx

@@ -1,6 +1,10 @@
 import React, { useState } from 'react';
+import { Button, EmptyStateLayout } from '@strapi/design-system';
 import { useSelector, useDispatch } from 'react-redux';
 import { Map } from 'immutable';
+import { useIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
+import { ExternalLink } from '@strapi/icons';
 
 import {
   deleteContentType,
@@ -16,6 +20,7 @@ const CollectionURLs = () => {
   const dispatch = useDispatch();
   const [modalOpen, setModalOpen] = useState(false);
   const [uid, setUid] = useState(null);
+  const { formatMessage } = useIntl();
   const [langcode, setLangcode] = useState('und');
 
   const handleModalSubmit = (e) => {
@@ -44,6 +49,33 @@ const CollectionURLs = () => {
     return null;
   }
 
+  if (state.get('contentTypes').size === 0) {
+    return (
+      <EmptyStateLayout
+        content={formatMessage({
+          id: 'webtools.collection-urls.contenttypes.table.empty',
+          defaultMessage: 'Before you can add collections to the sitemap, you need to enable Webtools for at least one content type.',
+        })}
+        action={(
+          <Button
+            variant="secondary"
+            tag={Link}
+            to="https://docs.pluginpal.io/webtools/usage"
+            startIcon={<ExternalLink />}
+            target="_blank"
+          >
+            {formatMessage({
+              id: 'webtools.settings.button.read_docs',
+              defaultMessage: 'Learn how to enable Webtools',
+            })}
+          </Button>
+        )}
+        shadow="tableShadow"
+        hasRadius
+      />
+    );
+  }
+
   return (
     <div>
       <List