fix: single types selectable for related

VirtusLab-Open-Source · Oct 12, 2024 · 9e99195 · 9e99195
1 parent 85d505b
commit 9e99195
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/admin/src/pages/SettingsPage/index.tsx b/admin/src/pages/SettingsPage/index.tsx
@@ -94,7 +94,6 @@ const Inner = () => {
 
   const handleChange = (eventOrPath: FormChangeEvent, value?: any, nativeOnChange?: (eventOrPath: FormChangeEvent, value?: any) => void) => {
     if (nativeOnChange) {
-
       let fieldName = eventOrPath;
       let fieldValue = value;
 
@@ -108,15 +107,20 @@ const Inner = () => {
         setFormValueItem(fieldName, fieldValue);
       }
 
-
       return nativeOnChange(eventOrPath as FormChangeEvent, fieldValue);
     }
   };
 
   const setFormValueItem = (path: string, value: any) => {
-    setFormValue(set({
-      ...formValue,
-    }, path, value));
+    setFormValue((current) =>
+      set(
+        {
+          ...current,
+        },
+        path,
+        value
+      )
+    );
   };
 
   const renderError = (error: string): string | undefined => {

diff --git a/server/src/services/admin/admin.ts b/server/src/services/admin/admin.ts
@@ -161,11 +161,7 @@ const adminService = (context: { strapi: Core.Strapi }) => ({
 
             if (isSingleTypeWithPublishFlow) {
               const itemsCountOrBypass = isSingleTypeWithPublishFlow
-                ? await repository.count({
-                    publishedAt: {
-                      $notNull: true,
-                    },
-                  })
+                ? await repository.count({}, 'published')
                 : true;
 
               return returnType(itemsCountOrBypass !== 0);
@@ -550,6 +546,8 @@ const adminService = (context: { strapi: Core.Strapi }) => ({
 
     validateAdditionalFields(newConfig.additionalFields);
 
+    console.log({ newConfig });
+
     await pluginStore.set({ key: 'config', value: newConfig });
 
     const removedFields = differenceBy(