From 40961936d0ac2f198de4a484d862b33728b98da6 Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Tue, 2 Apr 2024 11:54:03 +0530
Subject: [PATCH 1/2] fix: sorting issue by name in open-sign drive

---
 apps/OpenSign/src/components/opensigndrive/DriveBody.js | 5 +++--
 apps/OpenSign/src/pages/Opensigndrive.js                | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/OpenSign/src/components/opensigndrive/DriveBody.js b/apps/OpenSign/src/components/opensigndrive/DriveBody.js
index b8c2bdd56..213d3eac4 100644
--- a/apps/OpenSign/src/components/opensigndrive/DriveBody.js
+++ b/apps/OpenSign/src/components/opensigndrive/DriveBody.js
@@ -70,6 +70,7 @@ function DriveBody(props) {
         return item;
       });
       props.setPdfData(updatedData);
+      props.sortingData(null, null, updatedData);
       await axios
         .put(
           `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
@@ -214,8 +215,8 @@ function DriveBody(props) {
         ? true
         : false
       : selecFolderId
-      ? false
-      : true;
+        ? false
+        : true;
     if (!checkExist) {
       if (moveFolderId) {
         updateData = {
diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js
index 192a9d766..f4a30bd67 100644
--- a/apps/OpenSign/src/pages/Opensigndrive.js
+++ b/apps/OpenSign/src/pages/Opensigndrive.js
@@ -203,6 +203,7 @@ function Opensigndrive() {
             const result = JSON.parse(JSON.stringify(res));
 
             setPdfData((prev) => [...prev, result]);
+            sortingData(null, null, [result], true);
             setNewFolderName();
             setIsFolderLoader(false);
             setIsFolder(false);
@@ -223,7 +224,10 @@ function Opensigndrive() {
   const sortedBy = (appInfo, type, order) => {
     if (type === orderName.Name) {
       if (order === orderName.Ascending) {
-        return appInfo.sort((a, b) => (a.Name > b.Name ? 1 : -1));
+        appInfo.sort((a, b) => (a.Name > b.Name ? 1 : -1));
+        return appInfo.sort((a, b) =>
+          a.Name.toLowerCase() < b.Name.toLowerCase() ? -1 : 1
+        );
       } else if (order === orderName.Descending) {
         return appInfo.sort((a, b) => (a.Name > b.Name ? -1 : 1));
       }
@@ -724,6 +728,7 @@ function Opensigndrive() {
                   isList={isList}
                   setIsAlert={setIsAlert}
                   setSkip={setSkip}
+                  sortingData={sortingData}
                 />
                 {loading && (
                   <div style={{ textAlign: "center" }}>Loading...</div>

From 155a3eee14b649a74b13ef19a82c83cc6b9be553 Mon Sep 17 00:00:00 2001
From: RaktimaNXG <raktima.c@nxglabs.com>
Date: Tue, 2 Apr 2024 12:25:02 +0530
Subject: [PATCH 2/2] fix: remove unnecessary code

---
 apps/OpenSign/src/pages/Opensigndrive.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js
index f4a30bd67..8c248f6cf 100644
--- a/apps/OpenSign/src/pages/Opensigndrive.js
+++ b/apps/OpenSign/src/pages/Opensigndrive.js
@@ -224,12 +224,13 @@ function Opensigndrive() {
   const sortedBy = (appInfo, type, order) => {
     if (type === orderName.Name) {
       if (order === orderName.Ascending) {
-        appInfo.sort((a, b) => (a.Name > b.Name ? 1 : -1));
         return appInfo.sort((a, b) =>
           a.Name.toLowerCase() < b.Name.toLowerCase() ? -1 : 1
         );
       } else if (order === orderName.Descending) {
-        return appInfo.sort((a, b) => (a.Name > b.Name ? -1 : 1));
+        return appInfo.sort((a, b) =>
+          a.Name.toLowerCase() < b.Name.toLowerCase() ? 1 : -1
+        );
       }
     } else if (type === orderName.Date) {
       if (order === orderName.Ascending) {