Merge pull request #287 from jorrit/tscheck

Fix Typescript failures and introduce step in GitHub action

Author: boazpoolman

.changeset/silent-paws-battle.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+Fixes several Typescript issues and adds lint check

.github/workflows/tests.yml

@@ -37,6 +37,8 @@ jobs:
         run: yarn run build
       - name: Run eslint
         run: yarn run eslint
+      - name: Run Typescript checks
+        run: yarn run tscheck
   test:
     name: 'test'
     needs: [lint]

package.json

@@ -11,6 +11,7 @@
     "develop": "FORCE_COLOR=1 turbo run watch:link",
     "eslint": "turbo run eslint",
     "eslint:fix": "turbo run eslint:fix",
+    "tscheck": "tsc --noEmit",
     "release:publish": "turbo run build && changeset publish",
     "release:prepare": "changeset version && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install",
     "playground:install": "cd playground && yarn dlx yalc add --link strapi-plugin-webtools webtools-addon-sitemap && yarn install",

packages/core/admin/components/PatternField/index.tsx

@@ -31,8 +31,8 @@ const PatternField: FC<Props> = ({
   const { get } = getFetchClient();
   const fields = useQuery('fields', async () => get<Record<string, string[]>>('/webtools/url-pattern/allowed-fields'));
   const { formatMessage } = useIntl();
-  const inputRef = useRef<HTMLInputElement>();
-  const popoverRef = useRef();
+  const inputRef = useRef<HTMLInputElement>(undefined);
+  const popoverRef = useRef(undefined);
 
   const HoverBox = styled(Box)`
     cursor: pointer;

packages/core/server/middlewares/delete-url-alias.ts

@@ -2,8 +2,10 @@ import { Modules } from '@strapi/strapi';
 import { isContentTypeEnabled } from '../util/enabledContentTypes';
 
 const deleteUrlAliasMiddleware: Modules.Documents.Middleware.Middleware = async (context, next) => {
-  const { uid, action, params } = context;
-  const hasWT = isContentTypeEnabled(uid);
+  const {
+    uid, action, params, contentType,
+  } = context;
+  const hasWT = isContentTypeEnabled(contentType);
 
   // If Webtools isn't enabled, do nothing.
   if (!hasWT) {

packages/core/server/middlewares/generate-url-alias.ts

@@ -4,8 +4,8 @@ import { getPluginService } from '../util/getPluginService';
 
 // eslint-disable-next-line max-len
 const generateUrlAliasMiddleware: Modules.Documents.Middleware.Middleware = async (context, next) => {
-  const { uid, action } = context;
-  const hasWT = isContentTypeEnabled(uid);
+  const { uid, action, contentType } = context;
+  const hasWT = isContentTypeEnabled(contentType);
 
   // If Webtools isn't enabled, do nothing.
   if (!hasWT) {

packages/core/server/register.ts

@@ -22,7 +22,7 @@ export default ({ strapi }: { strapi: Core.Strapi }) => {
 
     // Add a relation field to the url_alias content type, only
     // when webtools is explicitly enabled using pluginOptions.
-    if (isContentTypeEnabled(contentType.uid)) {
+    if (isContentTypeEnabled(contentType)) {
       set(attributes, 'url_alias', {
         writable: true,
         private: false,