@iankibetsh/shframework 1.9.9 → 2.0.0

package/dist/library.mjs

@@ -2,7 +2,7 @@ import Axios from 'axios';
 import moment from 'moment';
 import Swal from 'sweetalert2';
 import NProgress from 'nprogress';
-import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, ref, onMounted, unref, normalizeClass, resolveComponent, createBlock, resolveDynamicComponent, watch, inject, mergeProps, normalizeStyle, renderSlot, createVNode, normalizeProps, guardReactiveProps, withCtx, createStaticVNode, shallowRef, vModelCheckbox, pushScopeId, popScopeId, markRaw, defineAsyncComponent, computed, isRef } from 'vue';
+import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, ref, onMounted, unref, normalizeClass, resolveComponent, createBlock, resolveDynamicComponent, watch, inject, mergeProps, normalizeStyle, renderSlot, createVNode, normalizeProps, guardReactiveProps, withCtx, createStaticVNode, shallowRef, vModelCheckbox, pushScopeId, popScopeId, markRaw, computed, isRef } from 'vue';
 import _ from 'lodash';
 import { useRoute, useRouter } from 'vue-router';
 import { defineStore, storeToRefs } from 'pinia';
@@ -1880,7 +1880,7 @@ const countries = [
   }
 ];
 
-var script$v = {
+var script$t = {
   name: 'PhoneInput',
   props: ['modelValue', 'country_code'],
   data () {
@@ -1950,19 +1950,19 @@ var script$v = {
   }
 };
 
-const _hoisted_1$o = { class: "sh-phone mb-3" };
-const _hoisted_2$f = {
+const _hoisted_1$n = { class: "sh-phone mb-3" };
+const _hoisted_2$e = {
   key: 0,
   style: {"display":"contents"}
 };
-const _hoisted_3$e = ["src"];
-const _hoisted_4$e = ["value"];
+const _hoisted_3$d = ["src"];
+const _hoisted_4$d = ["value"];
 
-function render$5(_ctx, _cache, $props, $setup, $data, $options) {
-  return (openBlock(), createElementBlock("div", _hoisted_1$o, [
+function render$3(_ctx, _cache, $props, $setup, $data, $options) {
+  return (openBlock(), createElementBlock("div", _hoisted_1$n, [
     ($data.selectedCountry)
-      ? (openBlock(), createElementBlock("div", _hoisted_2$f, [
-          createElementVNode("img", { src: $data.flag }, null, 8 /* PROPS */, _hoisted_3$e),
+      ? (openBlock(), createElementBlock("div", _hoisted_2$e, [
+          createElementVNode("img", { src: $data.flag }, null, 8 /* PROPS */, _hoisted_3$d),
           createTextVNode(" " + toDisplayString($data.selectedCountry.dialCode), 1 /* TEXT */)
         ]))
       : createCommentVNode("v-if", true),
@@ -1975,7 +1975,7 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
         return (openBlock(), createElementBlock("option", {
           value: country,
           key: country.dialCode
-        }, toDisplayString(country.name + '(' + country.dialCode + ')'), 9 /* TEXT, PROPS */, _hoisted_4$e))
+        }, toDisplayString(country.name + '(' + country.dialCode + ')'), 9 /* TEXT, PROPS */, _hoisted_4$d))
       }), 128 /* KEYED_FRAGMENT */))
     ], 544 /* HYDRATE_EVENTS, NEED_PATCH */), [
       [vModelSelect, $data.selectedCountry]
@@ -1993,17 +1993,17 @@ function render$5(_ctx, _cache, $props, $setup, $data, $options) {
   ]))
 }
 
-script$v.render = render$5;
-script$v.__file = "src/lib/components/form-components/PhoneInput.vue";
+script$t.render = render$3;
+script$t.__file = "src/lib/components/form-components/PhoneInput.vue";
 
-const _hoisted_1$n = {
+const _hoisted_1$m = {
   key: 0,
   class: "dropdown sh-suggest"
 };
-const _hoisted_2$e = ["id"];
-const _hoisted_3$d = { class: "badge bg-secondary m-1 sh-selected-item" };
-const _hoisted_4$d = ["onClick"];
-const _hoisted_5$a = ["id"];
+const _hoisted_2$d = ["id"];
+const _hoisted_3$c = { class: "badge bg-secondary m-1 sh-selected-item" };
+const _hoisted_4$c = ["onClick"];
+const _hoisted_5$9 = ["id"];
 const _hoisted_6$8 = ["id", "aria-labelledby"];
 const _hoisted_7$7 = { key: 0 };
 const _hoisted_8$6 = ["onClick"];
@@ -2017,7 +2017,7 @@ const _hoisted_10$5 = {
 };
 
 
-var script$u = {
+var script$s = {
   __name: 'ShSuggest',
   props: ['fillSelects','modelValue'],
   emits: ['update:modelValue'],
@@ -2098,7 +2098,7 @@ function filterData(e){
 
 return (_ctx, _cache) => {
   return (unref(id))
-    ? (openBlock(), createElementBlock("div", _hoisted_1$n, [
+    ? (openBlock(), createElementBlock("div", _hoisted_1$m, [
         createElementVNode("div", {
           id: unref(id),
           "data-bs-toggle": "dropdown",
@@ -2107,14 +2107,14 @@ return (_ctx, _cache) => {
         }, [
           createElementVNode("div", null, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(unref(selectedSuggestions), (sgt) => {
-              return (openBlock(), createElementBlock("h5", _hoisted_3$d, [
+              return (openBlock(), createElementBlock("h5", _hoisted_3$c, [
                 createTextVNode(toDisplayString(sgt.name) + " ", 1 /* TEXT */),
                 createElementVNode("button", {
                   onClick: $event => (removeSuggestion(sgt.id)),
                   type: "button",
                   class: "btn-close border-start border-1 ms-1",
                   "aria-label": "Close"
-                }, null, 8 /* PROPS */, _hoisted_4$d)
+                }, null, 8 /* PROPS */, _hoisted_4$c)
               ]))
             }), 256 /* UNKEYED_FRAGMENT */))
           ]),
@@ -2124,8 +2124,8 @@ return (_ctx, _cache) => {
             onClick: filterData,
             onInput: filterData,
             class: "flex-fill h-100 sh-suggestion-input"
-          }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_5$a)
-        ], 8 /* PROPS */, _hoisted_2$e),
+          }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_5$9)
+        ], 8 /* PROPS */, _hoisted_2$d),
         createElementVNode("ul", {
           class: "dropdown-menu w-100",
           id: 'dropwdown_section' + unref(id),
@@ -2158,15 +2158,15 @@ return (_ctx, _cache) => {
 
 };
 
-script$u.__scopeId = "data-v-71cc9569";
-script$u.__file = "src/lib/components/form-components/ShSuggest.vue";
+script$s.__scopeId = "data-v-71cc9569";
+script$s.__file = "src/lib/components/form-components/ShSuggest.vue";
 
-var script$t = {
+var script$r = {
   name: 'ShForm',
   components: {
-    PhoneInput: script$v,
-    ShSuggest: script$u,
-    ShPhone: script$v
+    PhoneInput: script$t,
+    ShSuggest: script$s,
+    ShPhone: script$t
   },
   props: [
       'action',
@@ -2488,18 +2488,18 @@ var script$t = {
   }
 };
 
-const _hoisted_1$m = /*#__PURE__*/createElementVNode("h5", { class: "d-none" }, null, -1 /* HOISTED */);
-const _hoisted_2$d = {
+const _hoisted_1$l = /*#__PURE__*/createElementVNode("h5", { class: "d-none" }, null, -1 /* HOISTED */);
+const _hoisted_2$c = {
   ref: "ShAutoForm",
   class: "sh-form"
 };
-const _hoisted_3$c = {
+const _hoisted_3$b = {
   key: 0,
   class: "alert alert-danger alert-dismissible fade show sh-form-submission-error",
   role: "alert"
 };
-const _hoisted_4$c = /*#__PURE__*/createElementVNode("i", { class: "bi-exclamation-triangle-fill me-1" }, null, -1 /* HOISTED */);
-const _hoisted_5$9 = { key: 0 };
+const _hoisted_4$b = /*#__PURE__*/createElementVNode("i", { class: "bi-exclamation-triangle-fill me-1" }, null, -1 /* HOISTED */);
+const _hoisted_5$8 = { key: 0 };
 const _hoisted_6$7 = { key: 1 };
 const _hoisted_7$6 = { class: "row" };
 const _hoisted_8$5 = { class: "fg-label control-label text-capitalize control-bel col-md-12 request-form-label mb-2" };
@@ -2544,20 +2544,20 @@ const _hoisted_24$1 = /*#__PURE__*/createElementVNode("span", {
   "aria-hidden": "true"
 }, null, -1 /* HOISTED */);
 
-function render$4(_ctx, _cache, $props, $setup, $data, $options) {
+function render$2(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_phone_input = resolveComponent("phone-input");
   const _component_ShSuggest = resolveComponent("ShSuggest");
 
   return (openBlock(), createElementBlock(Fragment, null, [
-    _hoisted_1$m,
-    createElementVNode("form", _hoisted_2$d, [
+    _hoisted_1$l,
+    createElementVNode("form", _hoisted_2$c, [
       createCommentVNode("    <div v-if=\"form_status == 1\" class=\"alert alert-info\">Processing...</div>"),
       createCommentVNode("    <div v-if=\"form_status == 2\" class=\"alert alert-success\">Success</div>"),
       (_ctx.form_status == 3)
-        ? (openBlock(), createElementBlock("div", _hoisted_3$c, [
-            _hoisted_4$c,
+        ? (openBlock(), createElementBlock("div", _hoisted_3$b, [
+            _hoisted_4$b,
             (_ctx.errorText)
-              ? (openBlock(), createElementBlock("span", _hoisted_5$9, toDisplayString(_ctx.errorText), 1 /* TEXT */))
+              ? (openBlock(), createElementBlock("span", _hoisted_5$8, toDisplayString(_ctx.errorText), 1 /* TEXT */))
               : (openBlock(), createElementBlock("span", _hoisted_6$7, "Unexpected Error Occurred")),
             createCommentVNode("      <button @click=\"hideError\" type=\"button\" class=\"btn-close\" aria-label=\"Close\"></button>")
           ]))
@@ -2755,10 +2755,10 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
   ], 64 /* STABLE_FRAGMENT */))
 }
 
-script$t.render = render$4;
-script$t.__file = "src/lib/components/ShForm.vue";
+script$r.render = render$2;
+script$r.__file = "src/lib/components/ShForm.vue";
 
-var script$s = {
+var script$q = {
   __name: 'EmailInput',
   props: ['modelValue','label'],
   emits: ['update:modelValue','clearValidationErrors'],
@@ -2798,12 +2798,12 @@ return (_ctx, _cache) => {
 
 };
 
-script$s.__file = "src/lib/components/form-components/EmailInput.vue";
+script$q.__file = "src/lib/components/form-components/EmailInput.vue";
 
-const _hoisted_1$l = ["min", "max"];
+const _hoisted_1$k = ["min", "max"];
 
 
-var script$r = {
+var script$p = {
   __name: 'NumberInput',
   props: ['modelValue','label','min','max'],
   emits: ['update:modelValue','clearValidationErrors'],
@@ -2837,7 +2837,7 @@ return (_ctx, _cache) => {
     onChange: modelValueUpdated,
     onKeydown: modelValueUpdated,
     onUpdated: modelValueUpdated
-  }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_1$l)), [
+  }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_1$k)), [
     [vModelText, inputModel.value]
   ])
 }
@@ -2845,9 +2845,9 @@ return (_ctx, _cache) => {
 
 };
 
-script$r.__file = "src/lib/components/form-components/NumberInput.vue";
+script$p.__file = "src/lib/components/form-components/NumberInput.vue";
 
-var script$q = {
+var script$o = {
   __name: 'TextInput',
   props: ['modelValue','label','isInvalid'],
   emits: ['update:modelValue','clearValidationErrors'],
@@ -2889,9 +2889,9 @@ return (_ctx, _cache) => {
 
 };
 
-script$q.__file = "src/lib/components/form-components/TextInput.vue";
+script$o.__file = "src/lib/components/form-components/TextInput.vue";
 
-var script$p = {
+var script$n = {
   __name: 'TextAreaInput',
   props: ['modelValue','label'],
   emits: ['update:modelValue','clearValidationErrors'],
@@ -2931,12 +2931,12 @@ return (_ctx, _cache) => {
 
 };
 
-script$p.__file = "src/lib/components/form-components/TextAreaInput.vue";
+script$n.__file = "src/lib/components/form-components/TextAreaInput.vue";
 
-const _hoisted_1$k = ["value"];
+const _hoisted_1$j = ["value"];
 
 
-var script$o = {
+var script$m = {
   __name: 'SelectInput',
   props: ['modelValue','label','data','dataUrl'],
   emits: ['update:modelValue','clearValidationErrors'],
@@ -2991,7 +2991,7 @@ return (_ctx, _cache) => {
       return (openBlock(), createElementBlock("option", {
         key: option.id,
         value: option.id
-      }, toDisplayString(option.name), 9 /* TEXT, PROPS */, _hoisted_1$k))
+      }, toDisplayString(option.name), 9 /* TEXT, PROPS */, _hoisted_1$j))
     }), 128 /* KEYED_FRAGMENT */))
   ], 544 /* HYDRATE_EVENTS, NEED_PATCH */)), [
     [vModelSelect, inputModel.value]
@@ -3001,9 +3001,9 @@ return (_ctx, _cache) => {
 
 };
 
-script$o.__file = "src/lib/components/form-components/SelectInput.vue";
+script$m.__file = "src/lib/components/form-components/SelectInput.vue";
 
-var script$n = {
+var script$l = {
   __name: 'PasswordInput',
   props: ['modelValue','label'],
   emits: ['update:modelValue','clearValidationErrors'],
@@ -3039,13 +3039,13 @@ return (_ctx, _cache) => {
 
 };
 
-script$n.__file = "src/lib/components/form-components/PasswordInput.vue";
+script$l.__file = "src/lib/components/form-components/PasswordInput.vue";
 
-const _hoisted_1$j = /*#__PURE__*/createElementVNode("div", null, null, -1 /* HOISTED */);
-const _hoisted_2$c = ["onUpdate:modelValue"];
-const _hoisted_3$b = ["innerHTML"];
-const _hoisted_4$b = ["innerHTML"];
-const _hoisted_5$8 = ["innerHTML"];
+const _hoisted_1$i = /*#__PURE__*/createElementVNode("div", null, null, -1 /* HOISTED */);
+const _hoisted_2$b = ["onUpdate:modelValue"];
+const _hoisted_3$a = ["innerHTML"];
+const _hoisted_4$a = ["innerHTML"];
+const _hoisted_5$7 = ["innerHTML"];
 const _hoisted_6$6 = ["disabled"];
 const _hoisted_7$5 = {
   key: 0,
@@ -3056,7 +3056,7 @@ const _hoisted_7$5 = {
 const _hoisted_8$4 = { key: 1 };
 
 
-var script$m = {
+var script$k = {
   __name: 'ShAutoForm',
   props: [
     'action','successCallback','retainDataAfterSubmission',
@@ -3089,13 +3089,13 @@ const getFieldComponent = (fieldObj)=>{
   const defaultPhones = ['phone'];
   const defaultEmails = ['email'];
   const formComponents = inject('formComponents');
-  const TextComponent = formComponents.text ?? script$q;
-  const TextAreaComponent = formComponents.textArea ?? script$p;
-  const EmailComponent = formComponents.email ?? script$s;
-  const PhoneComponent = formComponents.phone ?? script$v;
-  const NumberComponent = formComponents.number ?? script$r;
-  const SelectComponent = formComponents.select ?? script$o;
-  const PasswordComponent = formComponents.password ?? script$n;
+  const TextComponent = formComponents.text ?? script$o;
+  const TextAreaComponent = formComponents.textArea ?? script$n;
+  const EmailComponent = formComponents.email ?? script$q;
+  const PhoneComponent = formComponents.phone ?? script$t;
+  const NumberComponent = formComponents.number ?? script$p;
+  const SelectComponent = formComponents.select ?? script$m;
+  const PasswordComponent = formComponents.password ?? script$l;
   if(props.customComponents && props.customComponents[field]) {
     return props.customComponents[field]
   }
@@ -3107,16 +3107,16 @@ const getFieldComponent = (fieldObj)=>{
   }
   else
   if((props.textAreas && props.textAreas.includes(field)) || defaultTextareas.includes(field)){
-    return formComponents.textArea ?? script$p
+    return formComponents.textArea ?? script$n
   } else
   if((props.emails && props.emails.includes(field)) || defaultEmails.includes(field)){
-    return formComponents.email ?? script$s
+    return formComponents.email ?? script$q
   } else
   if((props.phones && props.phones.includes(field)) || defaultPhones.includes(field)){
-    return formComponents.phone ?? script$v
+    return formComponents.phone ?? script$t
   } else
   if((props.numbers && props.numbers.includes(field)) || defaultNumbers.includes(field)){
-    return formComponents.number ?? script$r
+    return formComponents.number ?? script$p
   }
   // else
   // if((props.selects && props.selects.includes(field)) || defaultSelects.includes(field)){
@@ -3125,7 +3125,7 @@ const getFieldComponent = (fieldObj)=>{
   // if((props.dates && props.dates.includes(field)) || defaultDates.includes(field)){
   //   return formComponents.date ?? DateInput
   // }
-  return formComponents.text ?? script$q
+  return formComponents.text ?? script$o
 };
 const shFormElementClasses = ref(null);
 shFormElementClasses.value = inject('shFormElementClasses');
@@ -3263,7 +3263,7 @@ onMounted((ev)=>{
 
 return (_ctx, _cache) => {
   return (openBlock(), createElementBlock(Fragment, null, [
-    _hoisted_1$j,
+    _hoisted_1$i,
     createElementVNode("form", {
       class: normalizeClass([__props.formClass, "sh-form"]),
       ref_key: "shAutoForm",
@@ -3280,7 +3280,7 @@ return (_ctx, _cache) => {
                 key: 0,
                 type: "hidden",
                 "onUpdate:modelValue": $event => ((formFields.value[index].value) = $event)
-              }, null, 8 /* PROPS */, _hoisted_2$c)), [
+              }, null, 8 /* PROPS */, _hoisted_2$b)), [
                 [vModelText, formFields.value[index].value]
               ])
             : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
@@ -3289,7 +3289,7 @@ return (_ctx, _cache) => {
                       key: 0,
                       class: normalizeClass(getElementClass('formLabel')),
                       innerHTML: field.label
-                    }, null, 10 /* CLASS, PROPS */, _hoisted_3$b))
+                    }, null, 10 /* CLASS, PROPS */, _hoisted_3$a))
                   : createCommentVNode("v-if", true),
                 (openBlock(), createBlock(resolveDynamicComponent(getFieldComponent(field)), mergeProps(getComponentProps(field), {
                   isInvalid: typeof validationErrors.value[field.field] !== 'undefined',
@@ -3303,14 +3303,14 @@ return (_ctx, _cache) => {
                       key: 1,
                       class: normalizeClass(getElementClass('formLabel')),
                       innerHTML: field.label
-                    }, null, 10 /* CLASS, PROPS */, _hoisted_4$b))
+                    }, null, 10 /* CLASS, PROPS */, _hoisted_4$a))
                   : createCommentVNode("v-if", true),
                 (field.helper)
                   ? (openBlock(), createElementBlock("div", {
                       key: 2,
                       class: normalizeClass(getElementClass('helperText')),
                       innerHTML: field.helper
-                    }, null, 10 /* CLASS, PROPS */, _hoisted_5$8))
+                    }, null, 10 /* CLASS, PROPS */, _hoisted_5$7))
                   : createCommentVNode("v-if", true),
                 (validationErrors.value[field.field])
                   ? (openBlock(), createElementBlock("div", {
@@ -3346,12 +3346,12 @@ return (_ctx, _cache) => {
 
 };
 
-script$m.__file = "src/lib/components/ShAutoForm.vue";
+script$k.__file = "src/lib/components/ShAutoForm.vue";
 
-const _hoisted_1$i = /*#__PURE__*/createElementVNode("h5", { class: "d-none" }, "To prevent default class", -1 /* HOISTED */);
-const _hoisted_2$b = { class: "dropdown" };
+const _hoisted_1$h = /*#__PURE__*/createElementVNode("h5", { class: "d-none" }, "To prevent default class", -1 /* HOISTED */);
+const _hoisted_2$a = { class: "dropdown" };
 
-var script$l = {
+var script$j = {
   __name: 'ShDropDownForm',
   props: ['action',
   'classes',
@@ -3381,8 +3381,8 @@ const dropdownId = 'rand' + (Math.random() + 1).toString(36).substring(2);
 
 return (_ctx, _cache) => {
   return (openBlock(), createElementBlock(Fragment, null, [
-    _hoisted_1$i,
-    createElementVNode("div", _hoisted_2$b, [
+    _hoisted_1$h,
+    createElementVNode("div", _hoisted_2$a, [
       createElementVNode("a", {
         class: normalizeClass(unref(btnClass)),
         href: "#",
@@ -3398,7 +3398,7 @@ return (_ctx, _cache) => {
         class: "dropdown-menu px-2 py-1",
         "aria-labelledby": dropdownId
       }, [
-        createVNode(script$t, normalizeProps(guardReactiveProps(props)), null, 16 /* FULL_PROPS */)
+        createVNode(script$r, normalizeProps(guardReactiveProps(props)), null, 16 /* FULL_PROPS */)
       ])
     ])
   ], 64 /* STABLE_FRAGMENT */))
@@ -3407,13 +3407,13 @@ return (_ctx, _cache) => {
 
 };
 
-script$l.__file = "src/lib/components/ShDropDownForm.vue";
+script$j.__file = "src/lib/components/ShDropDownForm.vue";
 
-const _hoisted_1$h = ["id"];
-const _hoisted_2$a = { class: "modal-content" };
-const _hoisted_3$a = { class: "modal-header" };
-const _hoisted_4$a = { class: "modal-title" };
-const _hoisted_5$7 = /*#__PURE__*/createElementVNode("button", {
+const _hoisted_1$g = ["id"];
+const _hoisted_2$9 = { class: "modal-content" };
+const _hoisted_3$9 = { class: "modal-header" };
+const _hoisted_4$9 = { class: "modal-title" };
+const _hoisted_5$6 = /*#__PURE__*/createElementVNode("button", {
   class: "btn btn-danger btn-sm",
   "data-bs-dismiss": "modal",
   "data-dismiss": "modal"
@@ -3421,7 +3421,7 @@ const _hoisted_5$7 = /*#__PURE__*/createElementVNode("button", {
 const _hoisted_6$5 = { class: "modal-body" };
 const _hoisted_7$4 = { class: "section" };
 
-var script$k = {
+var script$i = {
   __name: 'ShModal',
   props: {
   modalId: {
@@ -3458,10 +3458,10 @@ return (_ctx, _cache) => {
     createElementVNode("div", {
       class: normalizeClass(["modal-dialog", `modal-${__props.modalSize}`])
     }, [
-      createElementVNode("div", _hoisted_2$a, [
-        createElementVNode("div", _hoisted_3$a, [
-          createElementVNode("h3", _hoisted_4$a, toDisplayString(__props.modalTitle), 1 /* TEXT */),
-          _hoisted_5$7
+      createElementVNode("div", _hoisted_2$9, [
+        createElementVNode("div", _hoisted_3$9, [
+          createElementVNode("h3", _hoisted_4$9, toDisplayString(__props.modalTitle), 1 /* TEXT */),
+          _hoisted_5$6
         ]),
         createElementVNode("div", _hoisted_6$5, [
           createElementVNode("div", _hoisted_7$4, [
@@ -3470,17 +3470,17 @@ return (_ctx, _cache) => {
         ])
       ])
     ], 2 /* CLASS */)
-  ], 8 /* PROPS */, _hoisted_1$h))
+  ], 8 /* PROPS */, _hoisted_1$g))
 }
 }
 
 };
 
-script$k.__file = "src/lib/components/ShModal.vue";
+script$i.__file = "src/lib/components/ShModal.vue";
 
-const _hoisted_1$g = ["href"];
+const _hoisted_1$f = ["href"];
 
-var script$j = {
+var script$h = {
   __name: 'ShModalForm',
   props: ['action',
   'classes',
@@ -3519,13 +3519,13 @@ return (_ctx, _cache) => {
       "data-bs-toggle": "modal"
     }, [
       renderSlot(_ctx.$slots, "default")
-    ], 10 /* CLASS, PROPS */, _hoisted_1$g),
-    createVNode(script$k, {
+    ], 10 /* CLASS, PROPS */, _hoisted_1$f),
+    createVNode(script$i, {
       "modal-id": modalId,
       "modal-title": __props.modalTitle
     }, {
       default: withCtx(() => [
-        createVNode(script$t, mergeProps({ onSuccess: success }, props), null, 16 /* FULL_PROPS */)
+        createVNode(script$r, mergeProps({ onSuccess: success }, props), null, 16 /* FULL_PROPS */)
       ]),
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["modal-title"])
@@ -3535,11 +3535,11 @@ return (_ctx, _cache) => {
 
 };
 
-script$j.__file = "src/lib/components/ShModalForm.vue";
+script$h.__file = "src/lib/components/ShModalForm.vue";
 
-const _hoisted_1$f = ["href"];
+const _hoisted_1$e = ["href"];
 
-var script$i = {
+var script$g = {
   __name: 'ShModalFormAuto',
   props: ['action',
   'classes',
@@ -3579,13 +3579,13 @@ return (_ctx, _cache) => {
       "data-bs-toggle": "modal"
     }, [
       renderSlot(_ctx.$slots, "default")
-    ], 10 /* CLASS, PROPS */, _hoisted_1$f),
-    createVNode(script$k, {
+    ], 10 /* CLASS, PROPS */, _hoisted_1$e),
+    createVNode(script$i, {
       "modal-id": modalId,
       "modal-title": __props.modalTitle
     }, {
       default: withCtx(() => [
-        createVNode(script$m, mergeProps({ onSuccess: success }, props), null, 16 /* FULL_PROPS */)
+        createVNode(script$k, mergeProps({ onSuccess: success }, props), null, 16 /* FULL_PROPS */)
       ]),
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["modal-title"])
@@ -3595,17 +3595,17 @@ return (_ctx, _cache) => {
 
 };
 
-script$i.__file = "src/lib/components/ShModalFormAuto.vue";
+script$g.__file = "src/lib/components/ShModalFormAuto.vue";
 
-const _hoisted_1$e = ["id"];
-const _hoisted_2$9 = { class: "offcanvas-header" };
-const _hoisted_3$9 = {
+const _hoisted_1$d = ["id"];
+const _hoisted_2$8 = { class: "offcanvas-header" };
+const _hoisted_3$8 = {
   class: "offcanvas-title",
   id: "offcanvasScrollingLabel"
 };
-const _hoisted_4$9 = { class: "offcanvas-body" };
+const _hoisted_4$8 = { class: "offcanvas-body" };
 
-var script$h = {
+var script$f = {
   __name: 'ShCanvas',
   props: {
   canvasId: {
@@ -3650,8 +3650,8 @@ return (_ctx, _cache) => {
     id: __props.canvasId,
     "aria-labelledby": "offcanvasScrollingLabel"
   }, [
-    createElementVNode("div", _hoisted_2$9, [
-      createElementVNode("h5", _hoisted_3$9, toDisplayString(__props.canvasTitle), 1 /* TEXT */),
+    createElementVNode("div", _hoisted_2$8, [
+      createElementVNode("h5", _hoisted_3$8, toDisplayString(__props.canvasTitle), 1 /* TEXT */),
       createElementVNode("button", {
         type: "button",
         ref: "closecanvas",
@@ -3661,18 +3661,18 @@ return (_ctx, _cache) => {
         "aria-label": "Close"
       }, null, 512 /* NEED_PATCH */)
     ]),
-    createElementVNode("div", _hoisted_4$9, [
+    createElementVNode("div", _hoisted_4$8, [
       renderSlot(_ctx.$slots, "default")
     ])
-  ], 10 /* CLASS, PROPS */, _hoisted_1$e))
+  ], 10 /* CLASS, PROPS */, _hoisted_1$d))
 }
 }
 
 };
 
-script$h.__file = "src/lib/components/ShCanvas.vue";
+script$f.__file = "src/lib/components/ShCanvas.vue";
 
-var script$g = {
+var script$e = {
   name: 'Pagination',
   props: ['pagination_data', 'loadMore', 'hideCount', 'hideLoadMore', 'paginationStyle'],
   data () {
@@ -3743,12 +3743,12 @@ var script$g = {
   }
 };
 
-const _hoisted_1$d = { key: 0 };
-const _hoisted_2$8 = { class: "record_count_body mb-3" };
-const _hoisted_3$8 = /*#__PURE__*/createElementVNode("span", { class: "per_page_show" }, "Showing", -1 /* HOISTED */);
-const _hoisted_4$8 = /*#__PURE__*/createStaticVNode("<option value=\"10\">10</option><option value=\"25\">25</option><option value=\"50\">50</option><option value=\"100\">100</option><option value=\"200\">200</option>", 5);
+const _hoisted_1$c = { key: 0 };
+const _hoisted_2$7 = { class: "record_count_body mb-3" };
+const _hoisted_3$7 = /*#__PURE__*/createElementVNode("span", { class: "per_page_show" }, "Showing", -1 /* HOISTED */);
+const _hoisted_4$7 = /*#__PURE__*/createStaticVNode("<option value=\"10\">10</option><option value=\"25\">25</option><option value=\"50\">50</option><option value=\"100\">100</option><option value=\"200\">200</option>", 5);
 const _hoisted_9$4 = [
-  _hoisted_4$8
+  _hoisted_4$7
 ];
 const _hoisted_10$3 = { class: "record_counts" };
 const _hoisted_11$2 = {
@@ -3791,11 +3791,11 @@ const _hoisted_23$1 = {
   class: "spinner-border"
 };
 
-function render$3(_ctx, _cache, $props, $setup, $data, $options) {
+function render$1(_ctx, _cache, $props, $setup, $data, $options) {
   return ($props.paginationStyle !== 'loadMore')
-    ? (openBlock(), createElementBlock("div", _hoisted_1$d, [
-        createElementVNode("div", _hoisted_2$8, [
-          _hoisted_3$8,
+    ? (openBlock(), createElementBlock("div", _hoisted_1$c, [
+        createElementVNode("div", _hoisted_2$7, [
+          _hoisted_3$7,
           createTextVNode("  "),
           withDirectives(createElementVNode("select", {
             class: "select_per_page",
@@ -3868,17 +3868,17 @@ function render$3(_ctx, _cache, $props, $setup, $data, $options) {
       ]))
 }
 
-script$g.render = render$3;
-script$g.__file = "src/lib/components/list_templates/Pagination.vue";
+script$e.render = render$1;
+script$e.__file = "src/lib/components/list_templates/Pagination.vue";
 
-const _hoisted_1$c = /*#__PURE__*/createElementVNode("span", {
+const _hoisted_1$b = /*#__PURE__*/createElementVNode("span", {
   class: "spinner-border spinner-border-sm me-1",
   role: "status",
   "aria-hidden": "true"
 }, null, -1 /* HOISTED */);
 
 
-var script$f = {
+var script$d = {
   __name: 'ShConfirmAction',
   props: {
   data: Object,
@@ -3951,7 +3951,7 @@ return (_ctx, _cache) => {
   }, [
     (processing.value)
       ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-          _hoisted_1$c,
+          _hoisted_1$b,
           createElementVNode("span", null, toDisplayString(__props.loadingMessage), 1 /* TEXT */)
         ], 64 /* STABLE_FRAGMENT */))
       : createCommentVNode("v-if", true),
@@ -3964,15 +3964,15 @@ return (_ctx, _cache) => {
 
 };
 
-script$f.__file = "src/lib/components/ShConfirmAction.vue";
+script$d.__file = "src/lib/components/ShConfirmAction.vue";
 
-const _hoisted_1$b = /*#__PURE__*/createElementVNode("span", {
+const _hoisted_1$a = /*#__PURE__*/createElementVNode("span", {
   class: "spinner-border spinner-border-sm me-1",
   role: "status",
   "aria-hidden": "true"
 }, null, -1 /* HOISTED */);
 
-var script$e = {
+var script$c = {
   __name: 'ShSilentAction',
   props: {
   data: Object,
@@ -4047,7 +4047,7 @@ return (_ctx, _cache) => {
   }, [
     (processing.value)
       ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-          _hoisted_1$b,
+          _hoisted_1$a,
           createElementVNode("span", null, toDisplayString(__props.loadingMessage), 1 /* TEXT */)
         ], 64 /* STABLE_FRAGMENT */))
       : createCommentVNode("v-if", true),
@@ -4060,9 +4060,9 @@ return (_ctx, _cache) => {
 
 };
 
-script$e.__file = "src/lib/components/ShSilentAction.vue";
+script$c.__file = "src/lib/components/ShSilentAction.vue";
 
-var script$d = {
+var script$b = {
   name: 'sh-table',
   props: ['endPoint', 'headers','query', 'pageCount', 'actions', 'hideCount', 'hideLoadMore', 'links', 'reload', 'hideSearch', 'sharedData', 'searchPlaceholder', 'event', 'displayMore', 'displayMoreBtnClass', 'moreDetailsColumns', 'moreDetailsFields', 'hasDownload', 'downloadFields', 'tableHover', 'hideIds', 'paginationStyle'],
   inject: ['channel'],
@@ -4317,10 +4317,10 @@ var script$d = {
     this.reloadData();
   },
   components: {
-    ShSilentAction: script$e,
-    ShConfirmAction: script$f,
-    ShCanvas: script$h,
-    pagination: script$g
+    ShSilentAction: script$c,
+    ShConfirmAction: script$d,
+    ShCanvas: script$f,
+    pagination: script$e
   },
   computed: {
     windowWidth: function () {
@@ -4338,14 +4338,14 @@ var script$d = {
   }
 };
 
-const _hoisted_1$a = { class: "auto-table mt-2" };
-const _hoisted_2$7 = {
+const _hoisted_1$9 = { class: "auto-table mt-2" };
+const _hoisted_2$6 = {
   key: 0,
   class: "col-md-4 mb-2"
 };
-const _hoisted_3$7 = ["disabled"];
-const _hoisted_4$7 = /*#__PURE__*/createElementVNode("i", { class: "bi-download" }, null, -1 /* HOISTED */);
-const _hoisted_5$6 = /*#__PURE__*/createElementVNode("span", {
+const _hoisted_3$6 = ["disabled"];
+const _hoisted_4$6 = /*#__PURE__*/createElementVNode("i", { class: "bi-download" }, null, -1 /* HOISTED */);
+const _hoisted_5$5 = /*#__PURE__*/createElementVNode("span", {
   class: "spinner-border spinner-border-sm",
   role: "status",
   "aria-hidden": "true"
@@ -4494,16 +4494,16 @@ const _hoisted_63 = { key: 0 };
 const _hoisted_64 = ["href"];
 const _hoisted_65 = ["title", "onClick"];
 
-function render$2(_ctx, _cache, $props, $setup, $data, $options) {
+function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_router_link = resolveComponent("router-link");
   const _component_sh_confirm_action = resolveComponent("sh-confirm-action");
   const _component_sh_silent_action = resolveComponent("sh-silent-action");
   const _component_pagination = resolveComponent("pagination");
   const _component_sh_canvas = resolveComponent("sh-canvas");
 
-  return (openBlock(), createElementBlock("div", _hoisted_1$a, [
+  return (openBlock(), createElementBlock("div", _hoisted_1$9, [
     ($props.hasDownload)
-      ? (openBlock(), createElementBlock("div", _hoisted_2$7, [
+      ? (openBlock(), createElementBlock("div", _hoisted_2$6, [
           createElementVNode("button", {
             disabled: $data.downloading,
             class: "btn btn-warning btn-sm",
@@ -4511,14 +4511,14 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
           }, [
             (!$data.downloading)
               ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                  _hoisted_4$7,
+                  _hoisted_4$6,
                   createTextVNode(" Export ")
                 ], 64 /* STABLE_FRAGMENT */))
               : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                  _hoisted_5$6,
+                  _hoisted_5$5,
                   _hoisted_6$4
                 ], 64 /* STABLE_FRAGMENT */))
-          ], 8 /* PROPS */, _hoisted_3$7)
+          ], 8 /* PROPS */, _hoisted_3$6)
         ]))
       : createCommentVNode("v-if", true),
     (!$props.hideSearch)
@@ -4954,10 +4954,10 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
   ]))
 }
 
-script$d.render = render$2;
-script$d.__file = "src/lib/components/ShTable.vue";
+script$b.render = render;
+script$b.__file = "src/lib/components/ShTable.vue";
 
-var script$c = {
+var script$a = {
   __name: 'ShTabs',
   props: {
   tabs: {
@@ -5102,18 +5102,18 @@ return (_ctx, _cache) => {
 
 };
 
-script$c.__file = "src/lib/components/ShTabs.vue";
+script$a.__file = "src/lib/components/ShTabs.vue";
 
-const _hoisted_1$9 = {
+const _hoisted_1$8 = {
   class: "nav-item",
   role: "presentation"
 };
-const _hoisted_2$6 = ["onClick"];
-const _hoisted_3$6 = /*#__PURE__*/createElementVNode("i", { class: "d-none" }, null, -1 /* HOISTED */);
-const _hoisted_4$6 = { class: "sh_tab_count" };
-const _hoisted_5$5 = { class: "tab-content" };
+const _hoisted_2$5 = ["onClick"];
+const _hoisted_3$5 = /*#__PURE__*/createElementVNode("i", { class: "d-none" }, null, -1 /* HOISTED */);
+const _hoisted_4$5 = { class: "sh_tab_count" };
+const _hoisted_5$4 = { class: "tab-content" };
 
-var script$b = {
+var script$9 = {
   __name: 'ShDynamicTabs',
   props: ['tabs','data'],
   setup(__props) {
@@ -5143,7 +5143,7 @@ return (_ctx, _cache) => {
       role: "tablist"
     }, [
       (openBlock(true), createElementBlock(Fragment, null, renderList(unref(tabs), (tab) => {
-        return (openBlock(), createElementBlock("li", _hoisted_1$9, [
+        return (openBlock(), createElementBlock("li", _hoisted_1$8, [
           createElementVNode("button", {
             onClick: $event => (setTab(tab)),
             class: normalizeClass(["nav-link", unref(currentTab) === tab ? 'active':''])
@@ -5151,15 +5151,15 @@ return (_ctx, _cache) => {
             createTextVNode(toDisplayString(tab.label) + " ", 1 /* TEXT */),
             (tab.count || tab.tabCount)
               ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                  _hoisted_3$6,
-                  createElementVNode("sup", _hoisted_4$6, toDisplayString(tab.count ?? tab.tabCount), 1 /* TEXT */)
+                  _hoisted_3$5,
+                  createElementVNode("sup", _hoisted_4$5, toDisplayString(tab.count ?? tab.tabCount), 1 /* TEXT */)
                 ], 64 /* STABLE_FRAGMENT */))
               : createCommentVNode("v-if", true)
-          ], 10 /* CLASS, PROPS */, _hoisted_2$6)
+          ], 10 /* CLASS, PROPS */, _hoisted_2$5)
         ]))
       }), 256 /* UNKEYED_FRAGMENT */))
     ], 2 /* CLASS */),
-    createElementVNode("div", _hoisted_5$5, [
+    createElementVNode("div", _hoisted_5$4, [
       (unref(currentTab))
         ? (openBlock(), createBlock(resolveDynamicComponent(unref(currentTab).component), normalizeProps(mergeProps({ key: 0 }, unref(currentTab))), null, 16 /* FULL_PROPS */))
         : createCommentVNode("v-if", true)
@@ -5170,12 +5170,12 @@ return (_ctx, _cache) => {
 
 };
 
-script$b.__file = "src/lib/components/ShDynamicTabs.vue";
+script$9.__file = "src/lib/components/ShDynamicTabs.vue";
 
-const _hoisted_1$8 = ["href"];
+const _hoisted_1$7 = ["href"];
 
 
-var script$a = {
+var script$8 = {
   __name: 'ShModalBtn',
   props: {
   modalId: {
@@ -5192,18 +5192,18 @@ return (_ctx, _cache) => {
     "data-bs-toggle": "modal"
   }, [
     renderSlot(_ctx.$slots, "default")
-  ], 8 /* PROPS */, _hoisted_1$8))
+  ], 8 /* PROPS */, _hoisted_1$7))
 }
 }
 
 };
 
-script$a.__file = "src/lib/components/ShModalBtn.vue";
+script$8.__file = "src/lib/components/ShModalBtn.vue";
 
-const _hoisted_1$7 = ["href"];
+const _hoisted_1$6 = ["href"];
 
 
-var script$9 = {
+var script$7 = {
   __name: 'ShCanvasBtn',
   props: {
   canvasId: {
@@ -5221,13 +5221,13 @@ return (_ctx, _cache) => {
     "data-bs-toggle": "offcanvas"
   }, [
     renderSlot(_ctx.$slots, "default")
-  ], 8 /* PROPS */, _hoisted_1$7))
+  ], 8 /* PROPS */, _hoisted_1$6))
 }
 }
 
 };
 
-script$9.__file = "src/lib/components/ShCanvasBtn.vue";
+script$7.__file = "src/lib/components/ShCanvasBtn.vue";
 
 const useUserStore = defineStore('user-store', {
   state: () => ({
@@ -5326,18 +5326,18 @@ const useUserStore = defineStore('user-store', {
 });
 
 const _withScopeId$1 = n => (pushScopeId("data-v-0d4fa0ac"),n=n(),popScopeId(),n);
-const _hoisted_1$6 = { class: "row permissions-main d-flex" };
-const _hoisted_2$5 = {
+const _hoisted_1$5 = { class: "row permissions-main d-flex" };
+const _hoisted_2$4 = {
   id: "permissions-nav",
   class: "col-md-3 d-flex align-items-center py-4"
 };
-const _hoisted_3$5 = {
+const _hoisted_3$4 = {
   key: 0,
   class: "mx-auto"
 };
-const _hoisted_4$5 = /*#__PURE__*/ _withScopeId$1(() => /*#__PURE__*/createElementVNode("span", { class: "spinner-grow mx-auto" }, null, -1 /* HOISTED */));
-const _hoisted_5$4 = [
-  _hoisted_4$5
+const _hoisted_4$4 = /*#__PURE__*/ _withScopeId$1(() => /*#__PURE__*/createElementVNode("span", { class: "spinner-grow mx-auto" }, null, -1 /* HOISTED */));
+const _hoisted_5$3 = [
+  _hoisted_4$4
 ];
 const _hoisted_6$3 = {
   key: 1,
@@ -5366,7 +5366,7 @@ const _hoisted_17 = { class: "col-md-3" };
 const _hoisted_18 = /*#__PURE__*/ _withScopeId$1(() => /*#__PURE__*/createElementVNode("i", { class: "bi-check" }, null, -1 /* HOISTED */));
 
 
-var script$8 = {
+var script$6 = {
   __name: 'ManagePermissions',
   emits: ['success'],
   setup(__props, { emit }) {
@@ -5470,10 +5470,10 @@ const getPermissionStyle = permission => {
 };
 
 return (_ctx, _cache) => {
-  return (openBlock(), createElementBlock("div", _hoisted_1$6, [
-    createElementVNode("div", _hoisted_2$5, [
+  return (openBlock(), createElementBlock("div", _hoisted_1$5, [
+    createElementVNode("div", _hoisted_2$4, [
       (loadingModules.value)
-        ? (openBlock(), createElementBlock("div", _hoisted_3$5, _hoisted_5$4))
+        ? (openBlock(), createElementBlock("div", _hoisted_3$4, _hoisted_5$3))
         : (openBlock(), createElementBlock("ul", _hoisted_6$3, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(modules.value, (module) => {
               return (openBlock(), createElementBlock("li", {
@@ -5524,7 +5524,7 @@ return (_ctx, _cache) => {
               (permissionsChanged.value)
                 ? (openBlock(), createElementBlock("div", _hoisted_16, [
                     createElementVNode("div", _hoisted_17, [
-                      createVNode(script$e, {
+                      createVNode(script$c, {
                         onSuccess: permissionsUpdated,
                         url: `sh-departments/department/permissions/${unref(departmentId)}/${selectedModule.value}`,
                         data: {permissions: selectedPermissions.value},
@@ -5548,13 +5548,13 @@ return (_ctx, _cache) => {
 
 };
 
-script$8.__scopeId = "data-v-0d4fa0ac";
-script$8.__file = "src/lib/components/core/Departments/department/ManagePermissions.vue";
+script$6.__scopeId = "data-v-0d4fa0ac";
+script$6.__file = "src/lib/components/core/Departments/department/ManagePermissions.vue";
 
-const _hoisted_1$5 = ["href"];
+const _hoisted_1$4 = ["href"];
 
 
-var script$7 = {
+var script$5 = {
   __name: 'ShRoutePopups',
   setup(__props) {
 
@@ -5582,7 +5582,7 @@ watch(() => route.meta, meta => {
     //no pop up, check if we have any unclosed backdrop
     setTimeout(() => {
       closeOrphanedBackdrops();
-    }, 100);
+    }, 500);
   }
 });
 const closeOrphanedBackdrops = () => {
@@ -5633,9 +5633,9 @@ return (_ctx, _cache) => {
       href: '#' + unref(canvasId),
       shallowRef: "canvasButton",
       class: "d-none"
-    }, "Open Modal", 8 /* PROPS */, _hoisted_1$5),
+    }, "Open Modal", 8 /* PROPS */, _hoisted_1$4),
     (popUp.value === 'modal')
-      ? (openBlock(), createBlock(script$k, {
+      ? (openBlock(), createBlock(script$i, {
           key: 0,
           "modal-id": unref(modalId),
           "modal-size": size.value
@@ -5647,7 +5647,7 @@ return (_ctx, _cache) => {
         }, 8 /* PROPS */, ["modal-id", "modal-size"]))
       : createCommentVNode("v-if", true),
     (['offcanvas','canvas','offCanvas'].includes(popUp.value))
-      ? (openBlock(), createBlock(script$h, {
+      ? (openBlock(), createBlock(script$f, {
           key: 1,
           "canvas-id": unref(canvasId),
           "canvas-size": size.value,
@@ -5665,56 +5665,28 @@ return (_ctx, _cache) => {
 
 };
 
-script$7.__file = "src/lib/components/popups/ShRoutePopups.vue";
-
-const _hoisted_1$4 = { class: "alert alert-info" };
-const _hoisted_2$4 = /*#__PURE__*/createElementVNode("span", { class: "spinner-border" }, null, -1 /* HOISTED */);
-const _hoisted_3$4 = /*#__PURE__*/createElementVNode("span", null, "Loading", -1 /* HOISTED */);
-const _hoisted_4$4 = [
-  _hoisted_2$4,
-  _hoisted_3$4
-];
-
-function render$1(_ctx, _cache) {
-  return (openBlock(), createElementBlock("div", _hoisted_1$4, _hoisted_4$4))
-}
-
-const script$6 = {};
-
-
-script$6.render = render$1;
-script$6.__file = "src/lib/components/popups/etc/PopupLoading.vue";
-
-function render(_ctx, _cache) {
-  return (openBlock(), createElementBlock("h5", null, "Error loading popup"))
-}
-
-const script$5 = {};
-
-
-script$5.render = render;
-script$5.__file = "src/lib/components/popups/etc/ErrorLoadingPopup.vue";
+script$5.__file = "src/lib/components/popups/ShRoutePopups.vue";
 
 var script$4 = {
   __name: 'ShQueryPopups',
   setup(__props) {
 
 const route = useRoute();
-const popUp = ref(route.meta.popUp);
+const popUp = ref(route.query.popUp);
 const modalId = _.uniqueId('modal_');
 const canvasId = _.uniqueId('canvas_');
-let PopupComponent = ref(null);
+let popupComponent = ref(null);
 ref(null);
 const router = useRouter();
 const position = ref(null);
 const size = ref(null);
-const AsyncComp =ref(null);
+ref(null);
 watch(() => route.query.popup, pop => {
   popUp.value = pop;
   position.value = route.query.position ?? route.query.side;
   size.value = route.query.size;
+  popupComponent.value = route.query.comp ?? route.query.component;
   if (popUp.value) {
-    loadPopupComponent();
     setTimeout(() => {
       initPopup();
     }, 100);
@@ -5722,27 +5694,10 @@ watch(() => route.query.popup, pop => {
     //no pop up, check if we have any unclosed backdrop
     setTimeout(() => {
       closeOrphanedBackdrops();
-    }, 100);
+    }, 500);
   }
 });
-const loadPopupComponent = ()=>{
-  const component =  route.query.comp || '';
-  PopupComponent.value = defineAsyncComponent({
-    // the loader function
-    loader: () => import(`../../../views/popups/${component}Popup.vue`),
-
-    // A component to use while the async component is loading
-    loadingComponent: script$6,
-    // Delay before showing the loading component. Default: 200ms.
-    delay: 200,
-
-    // A component to use if the load fails
-    errorComponent: script$5,
-    // The error component will be displayed if a timeout is
-    // provided and exceeded. Default: Infinity.
-    timeout: 3000
-  });
-};
+
 const closeOrphanedBackdrops = () => {
   const offCanvasBackdrop = document.querySelector('.offcanvas-backdrop');
   if (offCanvasBackdrop) {
@@ -5787,27 +5742,26 @@ const goBack = () => {
 return (_ctx, _cache) => {
   return (openBlock(), createElementBlock(Fragment, null, [
     (popUp.value === 'modal')
-      ? (openBlock(), createBlock(script$k, {
+      ? (openBlock(), createBlock(script$i, {
           key: 0,
           "modal-id": unref(modalId),
           "modal-size": size.value
         }, {
           default: withCtx(() => [
-            createVNode(unref(PopupComponent))
+            (openBlock(), createBlock(resolveDynamicComponent(unref(popupComponent))))
           ]),
           _: 1 /* STABLE */
         }, 8 /* PROPS */, ["modal-id", "modal-size"]))
       : createCommentVNode("v-if", true),
     (['offcanvas','canvas','offCanvas'].includes(popUp.value))
-      ? (openBlock(), createBlock(script$h, {
-          key: 1,
+      ? (openBlock(), createBlock(script$f, {
+          key: size.value + position.value,
           "canvas-id": unref(canvasId),
           "canvas-size": size.value,
           position: position.value
         }, {
           default: withCtx(() => [
-            createVNode(unref(PopupComponent)),
-            createVNode(unref(AsyncComp))
+            (openBlock(), createBlock(resolveDynamicComponent(unref(popupComponent))))
           ]),
           _: 1 /* STABLE */
         }, 8 /* PROPS */, ["canvas-id", "canvas-size", "position"]))
@@ -5831,7 +5785,7 @@ const _hoisted_3$3 = {
   "aria-expanded": "false"
 };
 const _hoisted_4$3 = /*#__PURE__*/createElementVNode("i", { class: "bi-calendar text-dark" }, null, -1 /* HOISTED */);
-const _hoisted_5$3 = ["innerHTML"];
+const _hoisted_5$2 = ["innerHTML"];
 const _hoisted_6$2 = {
   class: "dropdown-menu",
   "aria-labelledby": "dropdownMenuLink"
@@ -5951,7 +5905,7 @@ return (_ctx, _cache) => {
       createElementVNode("div", _hoisted_3$3, [
         _hoisted_4$3,
         createTextVNode(),
-        createElementVNode("span", { innerHTML: rangeLabel.value }, null, 8 /* PROPS */, _hoisted_5$3)
+        createElementVNode("span", { innerHTML: rangeLabel.value }, null, 8 /* PROPS */, _hoisted_5$2)
       ]),
       createElementVNode("ul", _hoisted_6$2, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(dates.value, (date) => {
@@ -6001,16 +5955,33 @@ return (_ctx, _cache) => {
 
 script$3.__file = "src/lib/components/ShRange.vue";
 
+const useAppStore = defineStore('sh-app',{
+    state: ()=>{
+        return {
+            refreshKey: 0,
+            appData: {}
+        }
+    },
+    actions: {
+        refreshPage () {
+            this.refreshKey++;
+            return true
+        },
+        refresh () {
+            this.refreshKey++;
+            return true
+        },
+        reload () {
+            this.refreshKey++;
+            return true
+        }
+    }
+});
+
 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" };
-const _hoisted_4$2 = {
-  "data-bs-toggle": "modal",
-  ref: "addDeptBtn",
-  href: "#sh-department_modal",
-  class: "btn btn-info btn-sm"
-};
-const _hoisted_5$2 = /*#__PURE__*/createElementVNode("i", { class: "fa fa-plus" }, null, -1 /* HOISTED */);
+const _hoisted_4$2 = /*#__PURE__*/createElementVNode("i", { class: "fa fa-plus" }, null, -1 /* HOISTED */);
 
 
 var script$2 = {
@@ -6025,21 +5996,40 @@ function departmentAdded (response) {
   reload.value += 1;
 }
 
+const department = ref(null);
+const editDepartment = dept=>{
+department.value = dept;
+  if(dept) {
+    new Modal(document.getElementById('sh_department_modal'),{}).show();
+  }
+};
+
 return (_ctx, _cache) => {
   return (openBlock(), createElementBlock(Fragment, null, [
     _hoisted_1$2,
     createElementVNode("div", _hoisted_2$2, [
       createElementVNode("div", _hoisted_3$2, [
-        createElementVNode("a", _hoisted_4$2, [
-          _hoisted_5$2,
+        createElementVNode("a", {
+          onClick: _cache[0] || (_cache[0] = $event => (editDepartment(null))),
+          "data-bs-toggle": "modal",
+          ref: "addDeptBtn",
+          href: "#sh_department_modal",
+          class: "btn btn-info btn-sm"
+        }, [
+          _hoisted_4$2,
           createTextVNode(" ADD DEPARTMENT")
         ], 512 /* NEED_PATCH */),
-        createVNode(script$d, {
+        createVNode(script$b, {
           headers: ['id','name','description', 'created_at'],
           "end-point": "sh-departments/list",
           actions: {
       label: 'Action',
       actions: [
+        {
+          label: 'Edit',
+          emits: editDepartment,
+          class: 'btn btn-warning bi-pen btn-sm me-1'
+        },
         {
           label: 'Permissions',
           path: '/sh-departments/manage-permissions/{id}',
@@ -6047,18 +6037,19 @@ return (_ctx, _cache) => {
         }
       ]
     }
-        }),
-        createVNode(script$k, {
-          "modal-id": "sh-department_modal",
+        }, null, 8 /* PROPS */, ["actions"]),
+        createVNode(script$i, {
+          "modal-id": "sh_department_modal",
           "modal-title": "Department Form"
         }, {
           default: withCtx(() => [
-            createVNode(script$t, {
+            createVNode(script$r, {
               "success-callback": "departmentAdded",
+              "current-data": department.value,
               onDepartmentAdded: departmentAdded,
               action: "admin/departments/store",
               fields: ['name','description']
-            })
+            }, null, 8 /* PROPS */, ["current-data"])
           ]),
           _: 1 /* STABLE */
         })
@@ -6187,7 +6178,7 @@ return (_ctx, _cache) => {
         createElementVNode("div", _hoisted_2$1, [
           _hoisted_3$1,
           createElementVNode("h5", null, "Department #" + toDisplayString(unref(department).id) + " - " + toDisplayString(unref(department).name) + " Allowed Modules", 1 /* TEXT */),
-          createVNode(script$d, {
+          createVNode(script$b, {
             actions: {
       label: 'Actions',
       actions: [
@@ -6207,12 +6198,12 @@ return (_ctx, _cache) => {
             headers: ['id',showModule,'created_at'],
             "end-point": 'admin/departments/department/list-modules/' + id.value
           }, null, 8 /* PROPS */, ["actions", "reload", "headers", "end-point"]),
-          createVNode(script$k, {
+          createVNode(script$i, {
             "modal-id": "addModule",
             "modal-title": "Add Module Department"
           }, {
             default: withCtx(() => [
-              createVNode(script$t, {
+              createVNode(script$r, {
                 "reload-select-items": unref(reload),
                 "success-callback": moduleAdded,
                 "fill-selects": {
@@ -6234,7 +6225,7 @@ return (_ctx, _cache) => {
             ref: permissionCanvasBtn,
             "data-bs-toggle": "offcanvas"
           }, null, 512 /* NEED_PATCH */),
-          createVNode(script$h, {
+          createVNode(script$f, {
             "canvas-id": "permissionsCanvas",
             position: "end enlarged",
             "canvas-title": "Module Permissions"
@@ -6349,7 +6340,7 @@ return (_ctx, _cache) => {
     : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
         (section.value === 'login')
           ? (openBlock(), createElementBlock("div", _hoisted_2, [
-              createVNode(script$t, {
+              createVNode(script$r, {
                 class: "sh-login-form",
                 fields: ['email','password'],
                 "action-label": "Login",
@@ -6374,7 +6365,7 @@ return (_ctx, _cache) => {
               (unref(registerSubTitle))
                 ? (openBlock(), createElementBlock("span", _hoisted_8, toDisplayString(unref(registerSubTitle)), 1 /* TEXT */))
                 : createCommentVNode("v-if", true),
-              createVNode(script$t, {
+              createVNode(script$r, {
                 class: "sh-login-form",
                 fields: unref(registrationFields),
                 "action-label": "Sign Up",
@@ -6421,7 +6412,7 @@ const ShFrontend = {
     const registerTitle = options.registerTitle ?? 'Create a new account';
     const registerSubTitle = options.registerSubTitle ?? `It's quick and easy`;
     const logoutApiEndpoint = options.logoutApiEndpoint ?? `auth/logout`;
-    options.formTextInput ?? script$q;
+    options.formTextInput ?? script$o;
     const loginUrl = options.loginUrl ?? `/login`;
     const redirectLogin = options.redirectLogin ?? `/`;
     const redirectRegister = options.redirectRegister ?? `/`;
@@ -6454,7 +6445,7 @@ const ShFrontend = {
       });
       options.router.addRoute({
         path: '/sh-departments/manage-permissions/:id',
-        component: script$8
+        component: script$6
       });
     }
     //filter unwanted config items from options to be put in local storage
@@ -6479,4 +6470,4 @@ var shGql = {
     mutate
 };
 
-export { countries as Countries, script$8 as ManagePermissions, script$m as ShAutoForm, script$h as ShCanvas, script$9 as ShCanvasBtn, script$f as ShConfirmAction, script$l as ShDropDownForm, script$b as ShDynamicTabs, script$t as ShForm, ShFrontend, script$k as ShModal, script$a as ShModalBtn, script$j as ShModalForm, script$i as ShModalFormAuto, script$v as ShPhone, script$4 as ShQueryPopups, script$3 as ShRange, script$7 as ShRoutePopups, script$e as ShSilentAction, script$d as ShTable, script$c as ShTabs, shApis, shGql, shRepo, ShStorage as shStorage, useUserStore };
+export { countries as Countries, script$6 as ManagePermissions, script$k as ShAutoForm, script$f as ShCanvas, script$7 as ShCanvasBtn, script$d as ShConfirmAction, script$j as ShDropDownForm, script$9 as ShDynamicTabs, script$r as ShForm, ShFrontend, script$i as ShModal, script$8 as ShModalBtn, script$h as ShModalForm, script$g as ShModalFormAuto, script$t as ShPhone, script$4 as ShQueryPopups, script$3 as ShRange, script$5 as ShRoutePopups, script$c as ShSilentAction, script$b as ShTable, script$a as ShTabs, shApis, shGql, shRepo, ShStorage as shStorage, useAppStore, useUserStore };