fix: issue VirtusLab-Open-Source#220, issue VirtusLab-Open-Source#221 (…

…VirtusLab-Open-Source#222)
zrp · Jul 25, 2023 · 03d504a · 03d504a
1 parent a22cd23
commit 03d504a
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 104 deletions.
diff --git a/admin/src/custom-fields/comments/components/input/__tests__/utils.test.ts b/admin/src/custom-fields/comments/components/input/__tests__/utils.test.ts
@@ -369,10 +369,6 @@ describe("Custom fields", () => {
         expect(getSortByDateOptions(({ id }) => `translated.${id}`))
           .toMatchInlineSnapshot(`
           [
-            {
-              "label": "",
-              "value": undefined,
-            },
             {
               "label": "translated.customField.comments.input.sortByDate.option.asc.label",
               "value": "ASC",
@@ -390,10 +386,6 @@ describe("Custom fields", () => {
         expect(getFilterByOptions(({ id }) => `translated.${id}`))
           .toMatchInlineSnapshot(`
           [
-            {
-              "label": "",
-              "value": undefined,
-            },
             {
               "label": "translated.customField.comments.input.filterBy.option.dateCreated.label",
               "value": "DATE_CREATED",
@@ -411,10 +403,6 @@ describe("Custom fields", () => {
         expect(getApprovalStatusOptions(({ id }) => `translated.${id}`))
           .toMatchInlineSnapshot(`
           [
-            {
-              "label": "",
-              "value": undefined,
-            },
             {
               "label": "translated.customField.comments.input.filterBy.option.approvalStatus.option.approved.label",
               "value": "APPROVED",

diff --git a/admin/src/custom-fields/comments/components/input/input.tsx b/admin/src/custom-fields/comments/components/input/input.tsx
@@ -154,7 +154,7 @@ export const CustomFieldInput: React.FC<CustomFieldInputProps> = ({
                 onChange={onRenderTypeChange}
               >
                 {getRenderTypeOptions(getMessage).map(({ value, label }) => (
-                  <Option key={value} value={value}>
+                  <Option key={`renderTypeOptions-${value}`} value={value}>
                     {label}
                   </Option>
                 ))}
@@ -170,9 +170,10 @@ export const CustomFieldInput: React.FC<CustomFieldInputProps> = ({
                 )}
                 value={currentState.sortByDate}
                 onChange={onSortByDateChange}
+                onClear={() => onSortByDateChange(undefined)}
               >
                 {getSortByDateOptions(getMessage).map(({ value, label }) => (
-                  <Option key={value} value={value}>
+                  <Option key={`sortByDataOptions-${value}`} value={value}>
                     {label}
                   </Option>
                 ))}
@@ -190,9 +191,10 @@ export const CustomFieldInput: React.FC<CustomFieldInputProps> = ({
                 )}
                 value={currentState.filterBy}
                 onChange={onFilterByChange}
+                onClear={() => onFilterByChange(undefined)}
               >
                 {getFilterByOptions(getMessage).map(({ value, label }) => (
-                  <Option key={value} value={value}>
+                  <Option key={`filterByOptions-${value}`} value={value}>
                     {label}
                   </Option>
                 ))}
@@ -208,10 +210,11 @@ export const CustomFieldInput: React.FC<CustomFieldInputProps> = ({
                     name={`${name}.filterBy.approvalStatus`}
                     value={currentState.filterByValue}
                     onChange={onFilterByValueChange}
+                    onClear={() => onFilterByValueChange(undefined)}
                   >
                     {getApprovalStatusOptions(getMessage).map(
                       ({ value, label }) => (
-                        <Option key={value} value={value}>
+                        <Option key={`approvalStatusOptions-${value}`} value={value}>
                           {label}
                         </Option>
                       )
@@ -227,6 +230,7 @@ export const CustomFieldInput: React.FC<CustomFieldInputProps> = ({
                     disabled={disabled}
                     name={`${name}.filterBy.dateCreated`}
                     onChange={onFilterByValueChange}
+                    onClear={() => onFilterByValueChange(undefined)}
                     selectedDate={currentState.filterByValue}
                     selectedDateLabel={asString}
                   />

diff --git a/admin/src/custom-fields/comments/components/input/utils.ts b/admin/src/custom-fields/comments/components/input/utils.ts
@@ -83,7 +83,7 @@ export const handlePopulateChange =
     });
   };
 
-export const getRenderTypeOptions = (translate: typeof getMessage) => [
+export const getRenderTypeOptions = (translate: typeof getMessage) => ([
   {
     value: "TREE",
     label: translate({
@@ -98,13 +98,9 @@ export const getRenderTypeOptions = (translate: typeof getMessage) => [
       defaultMessage: "Flat list",
     }),
   },
-];
+]);
 
-export const getSortByDateOptions = (translate: typeof getMessage) => [
-  {
-    value: undefined,
-    label: "",
-  },
+export const getSortByDateOptions = (translate: typeof getMessage) => ([
   {
     value: "ASC",
     label: translate({
@@ -119,13 +115,9 @@ export const getSortByDateOptions = (translate: typeof getMessage) => [
       defaultMessage: "Descending",
     }),
   },
-];
+]);
 
-export const getFilterByOptions = (translate: typeof getMessage) => [
-  {
-    value: undefined,
-    label: "",
-  },
+export const getFilterByOptions = (translate: typeof getMessage) => ([
   {
     value: "DATE_CREATED",
     label: translate({
@@ -140,13 +132,9 @@ export const getFilterByOptions = (translate: typeof getMessage) => [
       defaultMessage: "Approval Status",
     }),
   },
-];
+]);
 
-export const getApprovalStatusOptions = (translate: typeof getMessage) => [
-  {
-    value: undefined,
-    label: "",
-  },
+export const getApprovalStatusOptions = (translate: typeof getMessage) => ([
   {
     value: APPROVAL_STATUS.APPROVED,
     label: translate({
@@ -168,7 +156,7 @@ export const getApprovalStatusOptions = (translate: typeof getMessage) => [
       defaultMessage: "Rejected",
     }),
   },
-];
+]);
 
 const stringFields = [
   "renderType",

diff --git a/package.json b/package.json
@@ -27,8 +27,8 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
-    "@strapi/plugin-graphql": "^4.10.7",
-    "@strapi/utils": "^4.10.7",
+    "@strapi/plugin-graphql": "^4.11.7",
+    "@strapi/utils": "^4.11.7",
     "@types/axios": "^0.14.0",
     "@types/react-intl": "^3.0.0",
     "@types/react-query": "^1.2.9",
@@ -39,7 +39,7 @@
     "codemirror5": "npm:codemirror@^5.65.11"
   },
   "devDependencies": {
-    "@strapi/helper-plugin": "^4.10.7",
+    "@strapi/helper-plugin": "^4.11.7",
     "@types/bad-words": "^3.0.1",
     "@types/jest": "^29.4.0",
     "codecov": "^3.7.2",

diff --git a/server/services/admin.ts b/server/services/admin.ts
@@ -776,6 +776,6 @@ export = ({ strapi }: StrapiContext): IServiceAdmin => ({
       };
     }
 
-    return undefined;
+    return true;
   },
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -776,6 +776,6 @@ export = ({ strapi }: StrapiContext): IServiceAdmin => ({ @@
           };
         }
-        return undefined;
+        return true;
       },
     });