Fix/error on default sort (#11364)

* Fix error when resetting on default sort * Lint * Fix error on default sort (2) * Lint
pymedusa · Jun 27, 2023 · 7d4d600 · 7d4d600
1 parent 4f2adbc
commit 7d4d600
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/themes-default/slim/src/components/history-compact.vue b/themes-default/slim/src/components/history-compact.vue
@@ -218,6 +218,9 @@ export default {
             const { getCookie } = this;
             const sort = getCookie('sort'); // From manage-cookie.js mixin
             if (sort) {
+                if (sort[0].type === 'none') {
+                    sort[0].type = 'desc';
+                }
                 return sort;
             }
             return [{ field: 'date', type: 'desc' }];

diff --git a/themes-default/slim/src/components/history-detailed.vue b/themes-default/slim/src/components/history-detailed.vue
@@ -283,6 +283,9 @@ export default {
             const { getCookie } = this;
             const sort = getCookie('sort'); // From manage-cookie.js mixin
             if (sort) {
+                if (sort[0].type === 'none') {
+                    sort[0].type = 'desc';
+                }
                 return sort;
             }
             return [{ field: 'date', type: 'desc' }];

diff --git a/themes-default/slim/src/mixins/manage-cookie.js b/themes-default/slim/src/mixins/manage-cookie.js
@@ -15,7 +15,7 @@ export const manageCookieMixin = cookiePrefix => {
                 try {
                     return JSON.parse(cookie);
                 } catch {
-                    return cookie === 'none' ? null : cookie;
+                    return cookie;
                 }
             },
             setCookie(key, value) {

diff --git a/themes/dark/assets/js/medusa-runtime.js b/themes/dark/assets/js/medusa-runtime.js
diff --git a/themes/light/assets/js/medusa-runtime.js b/themes/light/assets/js/medusa-runtime.js