From 3f3cf23f7679b3a827bf96a4b176889ff68a4898 Mon Sep 17 00:00:00 2001
From: root <dnoga@soldevelo.com>
Date: Mon, 20 May 2024 17:00:11 +0200
Subject: [PATCH 1/2] made fields not handled by BE non sortable fields

---
 .../system-notification-list.controller.js                     | 1 +
 src/admin-user-list/user-list.controller.js                    | 3 ++-
 src/order-fulfillment/order-fulfillment.controller.js          | 1 +
 yarn.lock                                                      | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/admin-system-notification-list/system-notification-list.controller.js b/src/admin-system-notification-list/system-notification-list.controller.js
index 63ae13c..344d1b3 100644
--- a/src/admin-system-notification-list/system-notification-list.controller.js
+++ b/src/admin-system-notification-list/system-notification-list.controller.js
@@ -147,6 +147,7 @@
                     {
                         header: 'adminSystemNotificationList.isDisplayed',
                         propertyPath: 'isDisplayed',
+                        sortable: false,
                         template: function(item) {
                             return '<openlmis-ok-icon show="' + item.isDisplayed + '"></openlmis-ok-icon>';
                         }
diff --git a/src/admin-user-list/user-list.controller.js b/src/admin-user-list/user-list.controller.js
index b782d1f..07a769e 100644
--- a/src/admin-user-list/user-list.controller.js
+++ b/src/admin-user-list/user-list.controller.js
@@ -190,7 +190,8 @@
                     },
                     {
                         header: 'adminUserList.email',
-                        propertyPath: 'email'
+                        propertyPath: 'email',
+                        sortable: false
                     }
                 ],
                 actions: {
diff --git a/src/order-fulfillment/order-fulfillment.controller.js b/src/order-fulfillment/order-fulfillment.controller.js
index a8f08e0..0af941c 100644
--- a/src/order-fulfillment/order-fulfillment.controller.js
+++ b/src/order-fulfillment/order-fulfillment.controller.js
@@ -201,6 +201,7 @@
                     {
                         header: 'orderFulfillment.orderingFacility',
                         propertyPath: 'facility',
+                        sortable: false,
                         template: function(item) {
                             return $filter('facility')(item.facility);
                         }
diff --git a/yarn.lock b/yarn.lock
index b0b7773..22fe4e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -989,4 +989,4 @@ xtend@^4.0.2:
 
 xtend@~4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
\ No newline at end of file

From e2e53d4d08e14f3f695bd1d19042d083a8d004d7 Mon Sep 17 00:00:00 2001
From: root <dnoga@soldevelo.com>
Date: Mon, 20 May 2024 17:03:51 +0200
Subject: [PATCH 2/2] removed yarn.lock change

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 22fe4e7..b0b7773 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -989,4 +989,4 @@ xtend@^4.0.2:
 
 xtend@~4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
\ No newline at end of file
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"