@iankibetsh/shframework 1.4.6 → 1.4.8

package/dist/dist/library.mjs.css

@@ -1,36 +1,4 @@
 
-.colored-toast.swal2-icon-success {
-  background-color: #a5dc86 !important;
-}
-
-.colored-toast.swal2-icon-error {
-  background-color: #f27474 !important;
-}
-
-.colored-toast.swal2-icon-warning {
-  background-color: #f8bb86 !important;
-}
-
-.colored-toast.swal2-icon-info {
-  background-color: #3fc3ee !important;
-}
-
-.colored-toast.swal2-icon-question {
-  background-color: #87adbd !important;
-}
-
-.colored-toast .swal2-title {
-  color: white;
-}
-
-.colored-toast .swal2-close {
-  color: white;
-}
-
-.colored-toast .swal2-html-container {
-  color: white;
-}
-
 .sh-phone{
   display: flex;
   width: 100%;
@@ -63,6 +31,38 @@
   opacity: 0.5;
 }
 
+.colored-toast.swal2-icon-success {
+  background-color: #a5dc86 !important;
+}
+
+.colored-toast.swal2-icon-error {
+  background-color: #f27474 !important;
+}
+
+.colored-toast.swal2-icon-warning {
+  background-color: #f8bb86 !important;
+}
+
+.colored-toast.swal2-icon-info {
+  background-color: #3fc3ee !important;
+}
+
+.colored-toast.swal2-icon-question {
+  background-color: #87adbd !important;
+}
+
+.colored-toast .swal2-title {
+  color: white;
+}
+
+.colored-toast .swal2-close {
+  color: white;
+}
+
+.colored-toast .swal2-html-container {
+  color: white;
+}
+
 .permissions-main {
   background: #edeff2;
 }
@@ -79,8 +79,8 @@
   position: relative;
   top: 0;
   left: 0;
-  background: white;
-  border-radius: 10px 0 0 10px;
+  background: #88b3b370;
+  border-radius: 10px;
 }
 .permissions-main div#permissions-nav ul li {
   list-style: none;
@@ -95,6 +95,21 @@
   flex-grow: 1;
 }
 
+.sh-selected-item{
+  line-height: unset!important;
+}
+.sh-suggestion-input{
+  padding: 0.375rem 0.75rem;
+}
+.sh-suggest{
+  margin-bottom: 1rem;
+}
+.sh-suggest-control::after{
+  margin-top: auto;
+  margin-bottom: auto;
+  margin-right: 0.255em;
+}
+
 :root {
   --ck-z-default: 10555 !important;
   --ck-z-modal: calc(var(--ck-z-default) + 999) !important;
@@ -116,21 +131,6 @@
   }
 }
 
-.sh-selected-item{
-  line-height: unset!important;
-}
-.sh-suggestion-input{
-  padding: 0.375rem 0.75rem;
-}
-.sh-suggest{
-  margin-bottom: 1rem;
-}
-.sh-suggest-control::after{
-  margin-top: auto;
-  margin-bottom: auto;
-  margin-right: 0.255em;
-}
-
 .sh-forgot-link, .sh-register-link{
   cursor: pointer;
 }

package/dist/library.js

@@ -2559,7 +2559,7 @@ const _hoisted_11$3 = ["data-cy", "placeholder", "name", "onFocus", "onUpdate:mo
 const _hoisted_12$3 = ["data-cy", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_13$3 = ["data-cy", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_14$3 = ["data-cy", "name", "onFocus", "onUpdate:modelValue"];
-const _hoisted_15$2 = ["disabled", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
+const _hoisted_15$3 = ["disabled", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_16$2 = ["name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_17$2 = ["name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_18$2 = ["value"];
@@ -2753,7 +2753,7 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     class: vue.normalizeClass([_ctx.form_errors[field] == null ? ' field_' + field:'is-invalid ' + field, "form-control"]),
                     "onUpdate:modelValue": $event => ((_ctx.form_elements[field]) = $event),
                     type: "text"
-                  }, null, 42 /* CLASS, PROPS, HYDRATE_EVENTS */, _hoisted_15$2)), [
+                  }, null, 42 /* CLASS, PROPS, HYDRATE_EVENTS */, _hoisted_15$3)), [
                     [vue.vModelText, _ctx.form_elements[field]]
                   ])
                 : vue.createCommentVNode("v-if", true),
@@ -3629,7 +3629,7 @@ const _hoisted_14$2 = {
   key: 1,
   class: "page-link"
 };
-const _hoisted_15$1 = ["onClick"];
+const _hoisted_15$2 = ["onClick"];
 const _hoisted_16$1 = { key: 1 };
 const _hoisted_17$1 = {
   key: 0,
@@ -3691,7 +3691,7 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
                             key: 2,
                             onClick: $event => ($options.changeTableKey('page',page)),
                             class: "page-link"
-                          }, vue.toDisplayString(page), 9 /* TEXT, PROPS */, _hoisted_15$1))
+                          }, vue.toDisplayString(page), 9 /* TEXT, PROPS */, _hoisted_15$2))
                   ], 2 /* CLASS */))
                 }), 128 /* KEYED_FRAGMENT */)),
                 vue.createElementVNode("li", {
@@ -4210,7 +4210,7 @@ const _hoisted_14$1 = {
   key: 1,
   class: "alert alert-danger"
 };
-const _hoisted_15 = { colspan: 2 };
+const _hoisted_15$1 = { colspan: 2 };
 const _hoisted_16 = {
   key: 0,
   class: "text-center"
@@ -4379,7 +4379,7 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
             ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11$1, _hoisted_13$1))
             : ($data.loading === 'error')
               ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_14$1, [
-                  vue.createElementVNode("span", _hoisted_15, vue.toDisplayString($data.loading_error), 1 /* TEXT */)
+                  vue.createElementVNode("span", _hoisted_15$1, vue.toDisplayString($data.loading_error), 1 /* TEXT */)
                 ]))
               : vue.createCommentVNode("v-if", true),
           ($data.loading === 'done')
@@ -4984,38 +4984,138 @@ return (_ctx, _cache) => {
 
 script$4.__file = "src/lib/components/ShDynamicTabs.vue";
 
+const useUserStore = pinia.defineStore('user-store', {
+  state: () => ({
+    user: null,
+    role: null,
+    permissions: null,
+    menus: [],
+    loggedOut: false
+  }),
+  actions: {
+    setUser (){
+      let user = null;
+      try {
+         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
+      } catch (error) {
+        user= null;
+      }
+      if (user) {
+        user.isAllowedTo = function (slug) {
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+      }
+      this.user = user;
+      shApis.doGet('auth/user').then(res => {
+        let user = res.data.user;
+        if (typeof(user) === 'undefined') {
+           user = res.data;
+        }
+        ShStorage.setItem('user',user);
+        user.signOut = this.signOut;
+        user.logout = this.signOut;
+        user.logOut = this.signOut;
+        user.isAllowedTo = function (slug) {
+          if(!slug){
+            return true
+          }
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+        this.user = user;
+      }).catch((reason) => {
+        if (reason.response && reason.response.status) {
+          if(reason.response.status === 401) {
+            ShStorage.setItem('user',null);
+            this.user = null;
+          }
+          this.loggedOut = true;
+        }
+      });
+      if (this.user) {
+        if (typeof this.user.permissions === 'string') {
+          this.permissions = this.user.permissions;
+        } else {
+          this.permissions = this.user.permissions;
+        }
+      }
+      const timeNow = moment__default["default"]().toISOString();
+      ShStorage.setItem('session_start',timeNow);
+    },
+    signOut () {
+      shRepo.signOutUser();
+    },
+    logOut () {
+      this.signOut();
+    },
+    getUser () {
+      this.setUser();
+    },
+    setAccessToken (accessToken) {
+      ShStorage.setItem('access_token', accessToken);
+      this.setUser();
+    }
+  },
+  getters: {
+    userId (state) {
+      return state.user === null ? null:state.user.id
+    }
+  }
+});
+
 const _withScopeId$1 = n => (vue.pushScopeId("data-v-0d4fa0ac"),n=n(),vue.popScopeId(),n);
 const _hoisted_1$3 = { class: "row permissions-main d-flex" };
 const _hoisted_2$3 = {
   id: "permissions-nav",
-  class: "col-md-2 d-flex align-items-center py-4"
+  class: "col-md-3 d-flex align-items-center py-4"
 };
-const _hoisted_3$3 = ["disabled", "checked"];
-const _hoisted_4$3 = ["onClick"];
-const _hoisted_5$3 = {
+const _hoisted_3$3 = { class: "d-flex flex-column w-100 px-2" };
+const _hoisted_4$3 = ["checked", "disabled"];
+const _hoisted_5$3 = ["onClick"];
+const _hoisted_6$2 = {
   id: "permissions-content",
-  class: "col-md-10 py-4 pe-4 ps-0"
+  class: "col-md-9 py-4 px-4"
 };
-const _hoisted_6$2 = { class: "p-2 rounded-2 bg-white h-100" };
-const _hoisted_7$1 = {
+const _hoisted_7$1 = { class: "p-2 rounded-2 bg-white h-100" };
+const _hoisted_8$1 = {
   key: 0,
   class: "alert alert-info"
 };
-const _hoisted_8$1 = { key: 1 };
-const _hoisted_9$1 = { class: "row row-cols-4" };
-const _hoisted_10 = { class: "col py-3" };
-const _hoisted_11 = ["value"];
-const _hoisted_12 = {
+const _hoisted_9$1 = { key: 1 };
+const _hoisted_10 = { class: "row row-cols-3" };
+const _hoisted_11 = { class: "col" };
+const _hoisted_12 = ["value"];
+const _hoisted_13 = {
   key: 0,
   class: "w-100 row"
 };
-const _hoisted_13 = { class: "col-md-3" };
-const _hoisted_14 = /*#__PURE__*/ _withScopeId$1(() => /*#__PURE__*/vue.createElementVNode("i", { class: "bi-check" }, null, -1 /* HOISTED */));
+const _hoisted_14 = { class: "col-md-3" };
+const _hoisted_15 = /*#__PURE__*/ _withScopeId$1(() => /*#__PURE__*/vue.createElementVNode("i", { class: "bi-check" }, null, -1 /* HOISTED */));
+
 
 var script$3 = {
   __name: 'ManagePermissions',
   setup(__props) {
 
+const userStore =useUserStore();
+
 const route = vueRouter.useRoute();
 const modules = vue.ref([]);
 const selectedModule = vue.ref('tasks');
@@ -5024,6 +5124,8 @@ const modulePermissions = vue.ref(null);
 const selectedPermissions = vue.ref([]);
 const permissionsChanged = vue.ref(false);
 const departmentId = route.params.id;
+const department = vue.ref(null);
+const departmentModules = vue.ref([]);
 const setModule = module=>{
   (selectedModule.value !== module) && (selectedModule.value = module) && getModulePermissions();
 };
@@ -5031,8 +5133,10 @@ vue.onMounted(() => {
   getDepartmentModules();
 });
 const getDepartmentModules = ()=>{
-  shApis.doGet(`admin/departments/department/list-all-modules/admin`).then(res=>{
+  shApis.doGet(`admin/departments/department/list-all-modules/admin/${departmentId}`).then(res=>{
     modules.value = res.data.modules;
+    department.value = res.data.department;
+    departmentModules.value = res.data.departmentModules;
     selectedModule.value = res.data.modules[0];
     getModulePermissions();
   });
@@ -5048,6 +5152,10 @@ const getModulePermissions = () => {
     permissionsChanged.value = false;
   });
 };
+const permissionsUpdated = (res)=>{
+  userStore.setUser();
+  departmentModules.value = res.data.departmentModules;
+};
 function reformatModulePermissions(mPs){
 let mpModules = {};
   mPs.map(mp=>{
@@ -5068,6 +5176,7 @@ const checkAllPermissions = ()=>{
   if(selectedPermissions.value.length > 0) {
     selectedPermissions.value = [];
   } else {
+    departmentModules.value.push(selectedModule);
     console.log(modulePermissions.value);
     const all = modulePermissions.value;
     Object.keys(all).map(key=>{
@@ -5091,37 +5200,34 @@ const getPermissionStyle = permission => {
 return (_ctx, _cache) => {
   return (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$3, [
     vue.createElementVNode("div", _hoisted_2$3, [
-      (vue.openBlock(), vue.createElementBlock("ul", {
-        class: "d-flex flex-column w-100 ps-2",
-        key: selectedModule.value ? selectedModule.value:0
-      }, [
+      vue.createElementVNode("ul", _hoisted_3$3, [
         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(modules.value, (module) => {
           return (vue.openBlock(), vue.createElementBlock("li", {
             class: vue.normalizeClass(selectedModule.value === module && 'active'),
             key: selectedModule.value
           }, [
             vue.createElementVNode("input", {
-              onClick: _cache[0] || (_cache[0] = $event => (checkAllPermissions())),
+              checked: departmentModules.value.includes(module),
+              onClick: checkAllPermissions,
               disabled: selectedModule.value !== module,
-              checked: selectedPermissions.value.length > 0 && selectedModule.value === module,
               type: "checkbox"
-            }, null, 8 /* PROPS */, _hoisted_3$3),
+            }, null, 8 /* PROPS */, _hoisted_4$3),
             vue.createElementVNode("label", {
               class: "text-capitalize",
               onClick: $event => (setModule(module))
-            }, vue.toDisplayString(module.replaceAll('_',' ')), 9 /* TEXT, PROPS */, _hoisted_4$3)
+            }, vue.toDisplayString(module.replaceAll('_',' ')), 9 /* TEXT, PROPS */, _hoisted_5$3)
           ], 2 /* CLASS */))
         }), 128 /* KEYED_FRAGMENT */))
-      ]))
+      ])
     ]),
-    vue.createElementVNode("div", _hoisted_5$3, [
-      vue.createElementVNode("div", _hoisted_6$2, [
+    vue.createElementVNode("div", _hoisted_6$2, [
+      vue.createElementVNode("div", _hoisted_7$1, [
         (loading.value)
-          ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7$1, " loading ... "))
-          : (vue.openBlock(), vue.createElementBlock("div", _hoisted_8$1, [
-              vue.createElementVNode("div", _hoisted_9$1, [
+          ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_8$1, " loading ... "))
+          : (vue.openBlock(), vue.createElementBlock("div", _hoisted_9$1, [
+              vue.createElementVNode("div", _hoisted_10, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(modulePermissions.value, (permissions) => {
-                  return (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, [
+                  return (vue.openBlock(), vue.createElementBlock("div", _hoisted_11, [
                     (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(permissions, (permission) => {
                       return (vue.openBlock(), vue.createElementBlock("label", {
                         onClick: setPermissionsChanged,
@@ -5129,10 +5235,10 @@ return (_ctx, _cache) => {
                         style: vue.normalizeStyle(getPermissionStyle(permission))
                       }, [
                         vue.withDirectives(vue.createElementVNode("input", {
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ((selectedPermissions).value = $event)),
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => ((selectedPermissions).value = $event)),
                           value: permission,
                           type: "checkbox"
-                        }, null, 8 /* PROPS */, _hoisted_11), [
+                        }, null, 8 /* PROPS */, _hoisted_12), [
                           [vue.vModelCheckbox, selectedPermissions.value]
                         ]),
                         vue.createTextVNode(" " + vue.toDisplayString(getLabel(permission)), 1 /* TEXT */)
@@ -5142,15 +5248,16 @@ return (_ctx, _cache) => {
                 }), 256 /* UNKEYED_FRAGMENT */))
               ]),
               (permissionsChanged.value)
-                ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_12, [
-                    vue.createElementVNode("div", _hoisted_13, [
-                      vue.createVNode(script$8, {
+                ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_13, [
+                    vue.createElementVNode("div", _hoisted_14, [
+                      vue.createVNode(script$7, {
+                        onSuccess: permissionsUpdated,
                         url: `admin/departments/department/permissions/${vue.unref(departmentId)}/${selectedModule.value}`,
                         data: {permissions: selectedPermissions.value},
                         class: "btn btn-primary d-block"
                       }, {
                         default: vue.withCtx(() => [
-                          _hoisted_14,
+                          _hoisted_15,
                           vue.createTextVNode(" Save")
                         ]),
                         _: 1 /* STABLE */
@@ -5170,102 +5277,6 @@ return (_ctx, _cache) => {
 script$3.__scopeId = "data-v-0d4fa0ac";
 script$3.__file = "src/lib/components/core/Departments/department/ManagePermissions.vue";
 
-const useUserStore = pinia.defineStore('user-store', {
-  state: () => ({
-    user: null,
-    role: null,
-    permissions: null,
-    menus: [],
-    loggedOut: false
-  }),
-  actions: {
-    setUser (){
-      let user = null;
-      try {
-         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
-      } catch (error) {
-        user= null;
-      }
-      if (user) {
-        user.isAllowedTo = function (slug) {
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-      }
-      this.user = user;
-      shApis.doGet('auth/user').then(res => {
-        let user = res.data.user;
-        if (typeof(user) === 'undefined') {
-           user = res.data;
-        }
-        ShStorage.setItem('user',user);
-        user.signOut = this.signOut;
-        user.logout = this.signOut;
-        user.logOut = this.signOut;
-        user.isAllowedTo = function (slug) {
-          if(!slug){
-            return true
-          }
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-        this.user = user;
-      }).catch((reason) => {
-        if (reason.response && reason.response.status) {
-          if(reason.response.status === 401) {
-            ShStorage.setItem('user',null);
-            this.user = null;
-          }
-          this.loggedOut = true;
-        }
-      });
-      if (this.user) {
-        if (typeof this.user.permissions === 'string') {
-          this.permissions = this.user.permissions;
-        } else {
-          this.permissions = this.user.permissions;
-        }
-      }
-      const timeNow = moment__default["default"]().toISOString();
-      ShStorage.setItem('session_start',timeNow);
-    },
-    signOut () {
-      shRepo.signOutUser();
-    },
-    logOut () {
-      this.signOut();
-    },
-    getUser () {
-      this.setUser();
-    },
-    setAccessToken (accessToken) {
-      ShStorage.setItem('access_token', accessToken);
-      this.setUser();
-    }
-  },
-  getters: {
-    userId (state) {
-      return state.user === null ? null:state.user.id
-    }
-  }
-});
-
 const _hoisted_1$2 = /*#__PURE__*/vue.createElementVNode("h5", null, "Departments", -1 /* HOISTED */);
 const _hoisted_2$2 = { class: "card sh-departments-card shadow" };
 const _hoisted_3$2 = { class: "card-body" };
@@ -5316,7 +5327,7 @@ return (_ctx, _cache) => {
       actions: [
         {
           label: 'Permissions',
-          path: '/sh-departments/permissions/{id}',
+          path: '/sh-departments/manage-permissions/{id}',
           class: 'btn btn-info bi-lock btn-sm'
         }
       ]

package/dist/library.mjs

@@ -2546,7 +2546,7 @@ const _hoisted_11$3 = ["data-cy", "placeholder", "name", "onFocus", "onUpdate:mo
 const _hoisted_12$3 = ["data-cy", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_13$3 = ["data-cy", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_14$3 = ["data-cy", "name", "onFocus", "onUpdate:modelValue"];
-const _hoisted_15$2 = ["disabled", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
+const _hoisted_15$3 = ["disabled", "placeholder", "name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_16$2 = ["name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_17$2 = ["name", "onFocus", "onUpdate:modelValue"];
 const _hoisted_18$2 = ["value"];
@@ -2740,7 +2740,7 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
                     class: normalizeClass([_ctx.form_errors[field] == null ? ' field_' + field:'is-invalid ' + field, "form-control"]),
                     "onUpdate:modelValue": $event => ((_ctx.form_elements[field]) = $event),
                     type: "text"
-                  }, null, 42 /* CLASS, PROPS, HYDRATE_EVENTS */, _hoisted_15$2)), [
+                  }, null, 42 /* CLASS, PROPS, HYDRATE_EVENTS */, _hoisted_15$3)), [
                     [vModelText, _ctx.form_elements[field]]
                   ])
                 : createCommentVNode("v-if", true),
@@ -3616,7 +3616,7 @@ const _hoisted_14$2 = {
   key: 1,
   class: "page-link"
 };
-const _hoisted_15$1 = ["onClick"];
+const _hoisted_15$2 = ["onClick"];
 const _hoisted_16$1 = { key: 1 };
 const _hoisted_17$1 = {
   key: 0,
@@ -3678,7 +3678,7 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
                             key: 2,
                             onClick: $event => ($options.changeTableKey('page',page)),
                             class: "page-link"
-                          }, toDisplayString(page), 9 /* TEXT, PROPS */, _hoisted_15$1))
+                          }, toDisplayString(page), 9 /* TEXT, PROPS */, _hoisted_15$2))
                   ], 2 /* CLASS */))
                 }), 128 /* KEYED_FRAGMENT */)),
                 createElementVNode("li", {
@@ -4197,7 +4197,7 @@ const _hoisted_14$1 = {
   key: 1,
   class: "alert alert-danger"
 };
-const _hoisted_15 = { colspan: 2 };
+const _hoisted_15$1 = { colspan: 2 };
 const _hoisted_16 = {
   key: 0,
   class: "text-center"
@@ -4366,7 +4366,7 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
             ? (openBlock(), createElementBlock("div", _hoisted_11$1, _hoisted_13$1))
             : ($data.loading === 'error')
               ? (openBlock(), createElementBlock("div", _hoisted_14$1, [
-                  createElementVNode("span", _hoisted_15, toDisplayString($data.loading_error), 1 /* TEXT */)
+                  createElementVNode("span", _hoisted_15$1, toDisplayString($data.loading_error), 1 /* TEXT */)
                 ]))
               : createCommentVNode("v-if", true),
           ($data.loading === 'done')
@@ -4971,38 +4971,138 @@ return (_ctx, _cache) => {
 
 script$4.__file = "src/lib/components/ShDynamicTabs.vue";
 
+const useUserStore = defineStore('user-store', {
+  state: () => ({
+    user: null,
+    role: null,
+    permissions: null,
+    menus: [],
+    loggedOut: false
+  }),
+  actions: {
+    setUser (){
+      let user = null;
+      try {
+         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
+      } catch (error) {
+        user= null;
+      }
+      if (user) {
+        user.isAllowedTo = function (slug) {
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+      }
+      this.user = user;
+      shApis.doGet('auth/user').then(res => {
+        let user = res.data.user;
+        if (typeof(user) === 'undefined') {
+           user = res.data;
+        }
+        ShStorage.setItem('user',user);
+        user.signOut = this.signOut;
+        user.logout = this.signOut;
+        user.logOut = this.signOut;
+        user.isAllowedTo = function (slug) {
+          if(!slug){
+            return true
+          }
+          if (this.permissions) {
+            let permissions = [];
+            if (typeof this.permissions === 'string') {
+              permissions = this.permissions;
+            } else {
+              permissions = this.permissions;
+            }
+            return permissions.includes(slug)
+          }
+          return false
+        };
+        this.user = user;
+      }).catch((reason) => {
+        if (reason.response && reason.response.status) {
+          if(reason.response.status === 401) {
+            ShStorage.setItem('user',null);
+            this.user = null;
+          }
+          this.loggedOut = true;
+        }
+      });
+      if (this.user) {
+        if (typeof this.user.permissions === 'string') {
+          this.permissions = this.user.permissions;
+        } else {
+          this.permissions = this.user.permissions;
+        }
+      }
+      const timeNow = moment().toISOString();
+      ShStorage.setItem('session_start',timeNow);
+    },
+    signOut () {
+      shRepo.signOutUser();
+    },
+    logOut () {
+      this.signOut();
+    },
+    getUser () {
+      this.setUser();
+    },
+    setAccessToken (accessToken) {
+      ShStorage.setItem('access_token', accessToken);
+      this.setUser();
+    }
+  },
+  getters: {
+    userId (state) {
+      return state.user === null ? null:state.user.id
+    }
+  }
+});
+
 const _withScopeId$1 = n => (pushScopeId("data-v-0d4fa0ac"),n=n(),popScopeId(),n);
 const _hoisted_1$3 = { class: "row permissions-main d-flex" };
 const _hoisted_2$3 = {
   id: "permissions-nav",
-  class: "col-md-2 d-flex align-items-center py-4"
+  class: "col-md-3 d-flex align-items-center py-4"
 };
-const _hoisted_3$3 = ["disabled", "checked"];
-const _hoisted_4$3 = ["onClick"];
-const _hoisted_5$3 = {
+const _hoisted_3$3 = { class: "d-flex flex-column w-100 px-2" };
+const _hoisted_4$3 = ["checked", "disabled"];
+const _hoisted_5$3 = ["onClick"];
+const _hoisted_6$2 = {
   id: "permissions-content",
-  class: "col-md-10 py-4 pe-4 ps-0"
+  class: "col-md-9 py-4 px-4"
 };
-const _hoisted_6$2 = { class: "p-2 rounded-2 bg-white h-100" };
-const _hoisted_7$1 = {
+const _hoisted_7$1 = { class: "p-2 rounded-2 bg-white h-100" };
+const _hoisted_8$1 = {
   key: 0,
   class: "alert alert-info"
 };
-const _hoisted_8$1 = { key: 1 };
-const _hoisted_9$1 = { class: "row row-cols-4" };
-const _hoisted_10 = { class: "col py-3" };
-const _hoisted_11 = ["value"];
-const _hoisted_12 = {
+const _hoisted_9$1 = { key: 1 };
+const _hoisted_10 = { class: "row row-cols-3" };
+const _hoisted_11 = { class: "col" };
+const _hoisted_12 = ["value"];
+const _hoisted_13 = {
   key: 0,
   class: "w-100 row"
 };
-const _hoisted_13 = { class: "col-md-3" };
-const _hoisted_14 = /*#__PURE__*/ _withScopeId$1(() => /*#__PURE__*/createElementVNode("i", { class: "bi-check" }, null, -1 /* HOISTED */));
+const _hoisted_14 = { class: "col-md-3" };
+const _hoisted_15 = /*#__PURE__*/ _withScopeId$1(() => /*#__PURE__*/createElementVNode("i", { class: "bi-check" }, null, -1 /* HOISTED */));
+
 
 var script$3 = {
   __name: 'ManagePermissions',
   setup(__props) {
 
+const userStore =useUserStore();
+
 const route = useRoute();
 const modules = ref([]);
 const selectedModule = ref('tasks');
@@ -5011,6 +5111,8 @@ const modulePermissions = ref(null);
 const selectedPermissions = ref([]);
 const permissionsChanged = ref(false);
 const departmentId = route.params.id;
+const department = ref(null);
+const departmentModules = ref([]);
 const setModule = module=>{
   (selectedModule.value !== module) && (selectedModule.value = module) && getModulePermissions();
 };
@@ -5018,8 +5120,10 @@ onMounted(() => {
   getDepartmentModules();
 });
 const getDepartmentModules = ()=>{
-  shApis.doGet(`admin/departments/department/list-all-modules/admin`).then(res=>{
+  shApis.doGet(`admin/departments/department/list-all-modules/admin/${departmentId}`).then(res=>{
     modules.value = res.data.modules;
+    department.value = res.data.department;
+    departmentModules.value = res.data.departmentModules;
     selectedModule.value = res.data.modules[0];
     getModulePermissions();
   });
@@ -5035,6 +5139,10 @@ const getModulePermissions = () => {
     permissionsChanged.value = false;
   });
 };
+const permissionsUpdated = (res)=>{
+  userStore.setUser();
+  departmentModules.value = res.data.departmentModules;
+};
 function reformatModulePermissions(mPs){
 let mpModules = {};
   mPs.map(mp=>{
@@ -5055,6 +5163,7 @@ const checkAllPermissions = ()=>{
   if(selectedPermissions.value.length > 0) {
     selectedPermissions.value = [];
   } else {
+    departmentModules.value.push(selectedModule);
     console.log(modulePermissions.value);
     const all = modulePermissions.value;
     Object.keys(all).map(key=>{
@@ -5078,37 +5187,34 @@ const getPermissionStyle = permission => {
 return (_ctx, _cache) => {
   return (openBlock(), createElementBlock("div", _hoisted_1$3, [
     createElementVNode("div", _hoisted_2$3, [
-      (openBlock(), createElementBlock("ul", {
-        class: "d-flex flex-column w-100 ps-2",
-        key: selectedModule.value ? selectedModule.value:0
-      }, [
+      createElementVNode("ul", _hoisted_3$3, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(modules.value, (module) => {
           return (openBlock(), createElementBlock("li", {
             class: normalizeClass(selectedModule.value === module && 'active'),
             key: selectedModule.value
           }, [
             createElementVNode("input", {
-              onClick: _cache[0] || (_cache[0] = $event => (checkAllPermissions())),
+              checked: departmentModules.value.includes(module),
+              onClick: checkAllPermissions,
               disabled: selectedModule.value !== module,
-              checked: selectedPermissions.value.length > 0 && selectedModule.value === module,
               type: "checkbox"
-            }, null, 8 /* PROPS */, _hoisted_3$3),
+            }, null, 8 /* PROPS */, _hoisted_4$3),
             createElementVNode("label", {
               class: "text-capitalize",
               onClick: $event => (setModule(module))
-            }, toDisplayString(module.replaceAll('_',' ')), 9 /* TEXT, PROPS */, _hoisted_4$3)
+            }, toDisplayString(module.replaceAll('_',' ')), 9 /* TEXT, PROPS */, _hoisted_5$3)
           ], 2 /* CLASS */))
         }), 128 /* KEYED_FRAGMENT */))
-      ]))
+      ])
     ]),
-    createElementVNode("div", _hoisted_5$3, [
-      createElementVNode("div", _hoisted_6$2, [
+    createElementVNode("div", _hoisted_6$2, [
+      createElementVNode("div", _hoisted_7$1, [
         (loading.value)
-          ? (openBlock(), createElementBlock("div", _hoisted_7$1, " loading ... "))
-          : (openBlock(), createElementBlock("div", _hoisted_8$1, [
-              createElementVNode("div", _hoisted_9$1, [
+          ? (openBlock(), createElementBlock("div", _hoisted_8$1, " loading ... "))
+          : (openBlock(), createElementBlock("div", _hoisted_9$1, [
+              createElementVNode("div", _hoisted_10, [
                 (openBlock(true), createElementBlock(Fragment, null, renderList(modulePermissions.value, (permissions) => {
-                  return (openBlock(), createElementBlock("div", _hoisted_10, [
+                  return (openBlock(), createElementBlock("div", _hoisted_11, [
                     (openBlock(true), createElementBlock(Fragment, null, renderList(permissions, (permission) => {
                       return (openBlock(), createElementBlock("label", {
                         onClick: setPermissionsChanged,
@@ -5116,10 +5222,10 @@ return (_ctx, _cache) => {
                         style: normalizeStyle(getPermissionStyle(permission))
                       }, [
                         withDirectives(createElementVNode("input", {
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ((selectedPermissions).value = $event)),
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => ((selectedPermissions).value = $event)),
                           value: permission,
                           type: "checkbox"
-                        }, null, 8 /* PROPS */, _hoisted_11), [
+                        }, null, 8 /* PROPS */, _hoisted_12), [
                           [vModelCheckbox, selectedPermissions.value]
                         ]),
                         createTextVNode(" " + toDisplayString(getLabel(permission)), 1 /* TEXT */)
@@ -5129,15 +5235,16 @@ return (_ctx, _cache) => {
                 }), 256 /* UNKEYED_FRAGMENT */))
               ]),
               (permissionsChanged.value)
-                ? (openBlock(), createElementBlock("div", _hoisted_12, [
-                    createElementVNode("div", _hoisted_13, [
-                      createVNode(script$8, {
+                ? (openBlock(), createElementBlock("div", _hoisted_13, [
+                    createElementVNode("div", _hoisted_14, [
+                      createVNode(script$7, {
+                        onSuccess: permissionsUpdated,
                         url: `admin/departments/department/permissions/${unref(departmentId)}/${selectedModule.value}`,
                         data: {permissions: selectedPermissions.value},
                         class: "btn btn-primary d-block"
                       }, {
                         default: withCtx(() => [
-                          _hoisted_14,
+                          _hoisted_15,
                           createTextVNode(" Save")
                         ]),
                         _: 1 /* STABLE */
@@ -5157,102 +5264,6 @@ return (_ctx, _cache) => {
 script$3.__scopeId = "data-v-0d4fa0ac";
 script$3.__file = "src/lib/components/core/Departments/department/ManagePermissions.vue";
 
-const useUserStore = defineStore('user-store', {
-  state: () => ({
-    user: null,
-    role: null,
-    permissions: null,
-    menus: [],
-    loggedOut: false
-  }),
-  actions: {
-    setUser (){
-      let user = null;
-      try {
-         user = ShStorage.getItem('user') ? ShStorage.getItem('user') : null;
-      } catch (error) {
-        user= null;
-      }
-      if (user) {
-        user.isAllowedTo = function (slug) {
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-      }
-      this.user = user;
-      shApis.doGet('auth/user').then(res => {
-        let user = res.data.user;
-        if (typeof(user) === 'undefined') {
-           user = res.data;
-        }
-        ShStorage.setItem('user',user);
-        user.signOut = this.signOut;
-        user.logout = this.signOut;
-        user.logOut = this.signOut;
-        user.isAllowedTo = function (slug) {
-          if(!slug){
-            return true
-          }
-          if (this.permissions) {
-            let permissions = [];
-            if (typeof this.permissions === 'string') {
-              permissions = this.permissions;
-            } else {
-              permissions = this.permissions;
-            }
-            return permissions.includes(slug)
-          }
-          return false
-        };
-        this.user = user;
-      }).catch((reason) => {
-        if (reason.response && reason.response.status) {
-          if(reason.response.status === 401) {
-            ShStorage.setItem('user',null);
-            this.user = null;
-          }
-          this.loggedOut = true;
-        }
-      });
-      if (this.user) {
-        if (typeof this.user.permissions === 'string') {
-          this.permissions = this.user.permissions;
-        } else {
-          this.permissions = this.user.permissions;
-        }
-      }
-      const timeNow = moment().toISOString();
-      ShStorage.setItem('session_start',timeNow);
-    },
-    signOut () {
-      shRepo.signOutUser();
-    },
-    logOut () {
-      this.signOut();
-    },
-    getUser () {
-      this.setUser();
-    },
-    setAccessToken (accessToken) {
-      ShStorage.setItem('access_token', accessToken);
-      this.setUser();
-    }
-  },
-  getters: {
-    userId (state) {
-      return state.user === null ? null:state.user.id
-    }
-  }
-});
-
 const _hoisted_1$2 = /*#__PURE__*/createElementVNode("h5", null, "Departments", -1 /* HOISTED */);
 const _hoisted_2$2 = { class: "card sh-departments-card shadow" };
 const _hoisted_3$2 = { class: "card-body" };
@@ -5303,7 +5314,7 @@ return (_ctx, _cache) => {
       actions: [
         {
           label: 'Permissions',
-          path: '/sh-departments/permissions/{id}',
+          path: '/sh-departments/manage-permissions/{id}',
           class: 'btn btn-info bi-lock btn-sm'
         }
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iankibetsh/shframework",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "Vue library for handling laravel backend",
   "main": "dist/library.js",
   "module": "dist/library.mjs",