Merge pull request #8 from DennisSnijder/bugfix/invalid-type

ListControl import fix
DennisSnijder · Jan 6, 2024 · 635f000 · 635f000
2 parents b363ea5 + c33589a
commit 635f000
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 53 deletions.
diff --git a/dev/package.json b/dev/package.json
@@ -16,12 +16,12 @@
     "generate:graphQLSchema": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:graphQLSchema"
   },
   "dependencies": {
-    "@payloadcms/bundler-webpack": "^1.0.2",
-    "@payloadcms/db-mongodb": "^1.0.2",
-    "@payloadcms/richtext-slate": "^1.0.1",
+    "@payloadcms/bundler-webpack": "^1.0.5",
+    "@payloadcms/db-mongodb": "^1.2.0",
+    "@payloadcms/richtext-slate": "^1.3.1",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "payload": "^2.0.0"
+    "payload": "^2.6.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "@types/react-beautiful-dnd": "^13.1.4",
     "@types/react-router-dom": "^5.3.3",
     "copyfiles": "^2.4.1",
-    "payload": "^2.0.0",
+    "payload": "^2.6.0",
     "typescript": "^4.9.5"
   },
   "dependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/WorkflowView/WorkflowView.tsx b/src/components/WorkflowView/WorkflowView.tsx
@@ -13,12 +13,12 @@ import { requests } from "payload/dist/admin/api";
 import { PluginCollectionConfig } from "../../index";
 import { useConfig } from "payload/components/utilities";
 import { SelectionProvider } from "payload/dist/admin/components/views/collections/List/SelectionProvider";
-import ListControls from "payload/dist/admin/components/elements/ListControls";
+import { ListControls } from 'payload/dist/admin/components/elements/ListControls'
 import DefaultList from "payload/dist/admin/components/views/collections/List/Default";
 
 const baseClass = 'scrumboard';
 
-export const WorkflowView = (config: PluginCollectionConfig) => (props: ListProps) => {
+const WorkflowView = (config: PluginCollectionConfig) => (props: ListProps) => {
 
   const {
     collection,
@@ -37,6 +37,8 @@ export const WorkflowView = (config: PluginCollectionConfig) => (props: ListProp
     handleSortChange,
     resetParams,
     data,
+    titleField,
+    handleSearchChange
   } = props;
 
   const {i18n} = useTranslation('general');
@@ -91,11 +93,13 @@ export const WorkflowView = (config: PluginCollectionConfig) => (props: ListProp
         />
 
         <ListControls
-          collection={ collection }
-          modifySearchQuery={ modifySearchParams }
-          handleSortChange={ handleSortChange }
-          handleWhereChange={ handleWhereChange }
-          resetParams={ resetParams }
+          collection={collection}
+          handleSearchChange={handleSearchChange}
+          handleSortChange={handleSortChange}
+          handleWhereChange={handleWhereChange}
+          modifySearchQuery={modifySearchParams}
+          resetParams={resetParams}
+          titleField={titleField}
         />
 
         <Board
@@ -109,3 +113,6 @@ export const WorkflowView = (config: PluginCollectionConfig) => (props: ListProp
     </SelectionProvider>
   </div>
 }
+
+
+export default WorkflowView;
diff --git a/src/components/WorkflowView/styles.scss b/src/components/WorkflowView/styles.scss
@@ -18,4 +18,5 @@
   overflow-x: auto;
   max-width: 100%;
   height: 100%;
+  min-height: base(10);
 }
diff --git a/src/hooks/generateOrderRank.ts b/src/hooks/generateOrderRank.ts
@@ -5,7 +5,7 @@ import { CollectionBeforeChangeHook } from "payload/types";
 /**
  * Generates the initial 'Lexorank'/orderRank based on the last known document in the same status.
  */
-export const generateOrderRank: CollectionBeforeChangeHook = async ({data, req}) => {
+const generateOrderRank: CollectionBeforeChangeHook = async ({data, req}) => {
   const {payload, collection,} = req;
 
   if (!collection || !!data.workflowOrderRank || !data.workflowStatus) {
@@ -33,3 +33,6 @@ export const generateOrderRank: CollectionBeforeChangeHook = async ({data, req})
 
   return data;
 }
+
+
+export default generateOrderRank;
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
 import { Config, Plugin } from "payload/config";
 import { CollectionConfig, OptionObject } from "payload/types";
-import { generateOrderRank } from "./hooks/generateOrderRank";
-import { WorkflowView } from "./components/WorkflowView/WorkflowView";
+import generateOrderRank from "./hooks/generateOrderRank";
+import WorkflowView from "./components/WorkflowView/WorkflowView";
 
 export interface PluginCollectionConfig {
   statuses: OptionObject[],

diff --git a/tsconfig.json b/tsconfig.json
@@ -15,9 +15,9 @@
     "declaration": true,
     "declarationDir": "./dist",
     "skipLibCheck": true,
-    "strict": true,
+    "strict": false,
   },
   "include": [
     "src/**/*"
   ],
-}
+}