Merge pull request #94 from pluginpal/feature/security-updates

Feature/security updates
pluginpal · Jan 22, 2024 · 5065098 · 5065098
2 parents 7797970 + de5fb5c
commit 5065098
Show file tree

Hide file tree

Showing 8 changed files with 571 additions and 1,311 deletions.
diff --git a/.changeset/happy-shirts-act.md b/.changeset/happy-shirts-act.md
@@ -0,0 +1,5 @@
+---
+"@pluginpal/webtools-core": patch
+---
+
+Remove strapi-typed from the devDependencies
diff --git a/package.json b/package.json
@@ -20,13 +20,14 @@
     "test:integration": "ENV_PATH=./playground/.env jest --verbose --runInBand --forceExit --testMatch '**/healthcheck.test.js'"
   },
   "dependencies": {
-    "@strapi/strapi": "^4",
+    "@strapi/strapi": "^4.17.1",
     "react": "^18"
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.1",
     "@types/copyfiles": "^2",
     "@types/jest": "^29.4.0",
+    "@types/koa": "^2.14.0",
     "@types/react-router-dom": "^5.3.3",
     "@types/styled-components": "^5.1.32",
     "@uncinc/eslint-config": "^1.1.2",

diff --git a/packages/core/admin/components/EditForm/index.tsx b/packages/core/admin/components/EditForm/index.tsx
@@ -20,7 +20,7 @@ const EditForm = () => {
   const { formatMessage } = useIntl();
 
   const updateValue = (name: string, value: string | number) => {
-    onChange({ target: { name: `url_alias.${name}`, value } });
+    onChange({ target: { name: `url_alias.${name}`, value, type: 'text' } });
   };
 
   return (

diff --git a/packages/core/admin/components/EditView/index.tsx b/packages/core/admin/components/EditView/index.tsx
@@ -23,11 +23,12 @@ const EditView = () => {
 
   if (!isContentTypeEnabled(allLayoutData.contentType)) return null;
   const modifiedUrlAlias = modifiedData.url_alias as UrlAliasEntity;
+  const initialUrlAlias = initialData.url_alias as UrlAliasEntity;
 
   const onSubmit = async () => {
-    if (!initialData.url_alias) {
+    if (!initialUrlAlias) {
       const urlAlias = await createUrlAlias(modifiedUrlAlias, slug);
-      onChange({ target: { name: 'url_alias', value: urlAlias } });
+      onChange({ target: { name: 'url_alias', value: urlAlias, type: 'text' } });
     } else {
       await updateUrlAlias(modifiedUrlAlias, slug);
     }
@@ -41,7 +42,13 @@ const EditView = () => {
           defaultMessage: 'URL alias',
         })}
         onSubmit={onSubmit}
-        onCancel={() => onChange({ target: { name: 'url_alias', value: initialData.url_alias } })}
+        onCancel={() => {
+          if (initialUrlAlias) {
+            onChange({ target: { name: 'url_alias', value: initialUrlAlias, type: 'text' } });
+          } else {
+            onChange({ target: { name: 'url_alias', value: null, type: 'text' } });
+          }
+        }}
       >
         <EditForm />
       </SidebarModal>

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,9 +26,6 @@
     "@pluginpal/webtools-helper-plugin": "1.0.0-beta.1",
     "react-copy-to-clipboard": "^5.1.0"
   },
-  "devDependencies": {
-    "strapi-typed": "^1.0.16"
-  },
   "author": {
     "name": "TODO"
   },

diff --git a/playground/package.json b/playground/package.json
@@ -10,9 +10,9 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/plugin-i18n": "^4.14.6",
-    "@strapi/plugin-users-permissions": "^4.14.6",
-    "@strapi/strapi": "^4.14.6",
+    "@strapi/plugin-i18n": "^4.17.1",
+    "@strapi/plugin-users-permissions": "^4.17.1",
+    "@strapi/strapi": "^4.17.1",
     "better-sqlite3": "8.6.0",
     "pg": "^8.10.0",
     "react": "^18.0.0",