From c9a4dfb8a3ed0398d208dea57754b85a9af06a4d Mon Sep 17 00:00:00 2001
From: devanshu052000 <devanshu.rastogi05@gmail.com>
Date: Wed, 23 Apr 2025 22:01:00 +0530
Subject: [PATCH] Fixed position and label of toggle

---
 .../RightSideBar/Inspector/Components/Select.jsx     | 11 +++++++++++
 .../WidgetManager/widgets/multiselectV2.js           | 12 ++++++------
 .../Editor/WidgetManager/configs/multiselectV2.js    | 12 ++++++------
 .../apps/services/widget-config/multiselectV2.js     | 12 ++++++------
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/frontend/src/AppBuilder/RightSideBar/Inspector/Components/Select.jsx b/frontend/src/AppBuilder/RightSideBar/Inspector/Components/Select.jsx
index d250a4342e..71d8f9ead8 100644
--- a/frontend/src/AppBuilder/RightSideBar/Inspector/Components/Select.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/Inspector/Components/Select.jsx
@@ -539,6 +539,17 @@ export function Select({ componentMeta, darkMode, ...restProps }) {
             currentState,
             allComponents
           )}
+        {isMultiSelect &&
+          renderElement(
+            component,
+            componentMeta,
+            paramUpdated,
+            dataQueries,
+            'showAllSelectedLabel',
+            'properties',
+            currentState,
+            allComponents
+          )}
         {isSortingEnabled &&
           renderElement(
             component,
diff --git a/frontend/src/AppBuilder/WidgetManager/widgets/multiselectV2.js b/frontend/src/AppBuilder/WidgetManager/widgets/multiselectV2.js
index 6ad8e6f7b5..0f130aa130 100644
--- a/frontend/src/AppBuilder/WidgetManager/widgets/multiselectV2.js
+++ b/frontend/src/AppBuilder/WidgetManager/widgets/multiselectV2.js
@@ -121,6 +121,12 @@ export const multiselectV2Config = {
       },
       accordian: 'Options',
     },
+    showAllSelectedLabel: {
+      type: 'toggle',
+      displayName: "Show 'All items are selected.'",
+      validation: { schema: { type: 'boolean' }, defaultValue: true },
+      accordian: 'Options',
+    },
     optionsLoadingState: {
       type: 'toggle',
       displayName: 'Options loading state',
@@ -142,12 +148,6 @@ export const multiselectV2Config = {
       accordian: 'Options',
       isFxNotRequired: true,
     },
-    showAllSelectedLabel: {
-      type: 'toggle',
-      displayName: 'Show all options selected label',
-      validation: { schema: { type: 'boolean' }, defaultValue: true },
-      section: 'additionalActions',
-    },
     loadingState: {
       type: 'toggle',
       displayName: 'Loading state',
diff --git a/frontend/src/Editor/WidgetManager/configs/multiselectV2.js b/frontend/src/Editor/WidgetManager/configs/multiselectV2.js
index 5bff71c29a..c811bc7c65 100644
--- a/frontend/src/Editor/WidgetManager/configs/multiselectV2.js
+++ b/frontend/src/Editor/WidgetManager/configs/multiselectV2.js
@@ -121,6 +121,12 @@ export const multiselectV2Config = {
       },
       accordian: 'Options',
     },
+    showAllSelectedLabel: {
+      type: 'toggle',
+      displayName: "Show 'All items are selected.'",
+      validation: { schema: { type: 'boolean' }, defaultValue: true },
+      accordian: 'Options',
+    },
     optionsLoadingState: {
       type: 'toggle',
       displayName: 'Options loading state',
@@ -142,12 +148,6 @@ export const multiselectV2Config = {
       accordian: 'Options',
       isFxNotRequired: true,
     },
-    showAllSelectedLabel: {
-      type: 'toggle',
-      displayName: 'Show all options selected label',
-      validation: { schema: { type: 'boolean' }, defaultValue: true },
-      section: 'additionalActions',
-    },
     loadingState: {
       type: 'toggle',
       displayName: 'Loading state',
diff --git a/server/src/modules/apps/services/widget-config/multiselectV2.js b/server/src/modules/apps/services/widget-config/multiselectV2.js
index 6ad8e6f7b5..0f130aa130 100644
--- a/server/src/modules/apps/services/widget-config/multiselectV2.js
+++ b/server/src/modules/apps/services/widget-config/multiselectV2.js
@@ -121,6 +121,12 @@ export const multiselectV2Config = {
       },
       accordian: 'Options',
     },
+    showAllSelectedLabel: {
+      type: 'toggle',
+      displayName: "Show 'All items are selected.'",
+      validation: { schema: { type: 'boolean' }, defaultValue: true },
+      accordian: 'Options',
+    },
     optionsLoadingState: {
       type: 'toggle',
       displayName: 'Options loading state',
@@ -142,12 +148,6 @@ export const multiselectV2Config = {
       accordian: 'Options',
       isFxNotRequired: true,
     },
-    showAllSelectedLabel: {
-      type: 'toggle',
-      displayName: 'Show all options selected label',
-      validation: { schema: { type: 'boolean' }, defaultValue: true },
-      section: 'additionalActions',
-    },
     loadingState: {
       type: 'toggle',
       displayName: 'Loading state',