@iankibetsh/shframework 1.1.4 → 1.1.6

package/dist/library.js

@@ -284,8 +284,12 @@ async function shSwalLogout () {
   }).then((result) => {
     if (result.isConfirmed) {
       logoutUser();
-    } else if (result.isDenied) {
-     updateSession();
+    } else {
+      window.ShConfirmation = null;
+      clearInterval(window.shInterval);
+      const timeNow = moment__default["default"]().toISOString();
+      ShStorage.setItem('last_activity', timeNow);
+      startSession();
     }
   })
 }
@@ -307,7 +311,6 @@ const updateSession = () =>{
   }
   const timeNow = moment__default["default"]().toISOString();
   ShStorage.setItem('last_activity', timeNow);
-  window.ShConfirmation = null;
 };
 
 let apiUrl = undefined.VITE_APP_API_URL;
@@ -2195,7 +2198,8 @@ var script$d = {
       'files',
       'phones',
       'numbers',
-      'customComponent'
+      'customComponent',
+      'successMessage'
   ],
   data: function () {
     return {
@@ -2384,6 +2388,11 @@ var script$d = {
         Object.keys(this.form_files).forEach(key => {
           this.form_errors[key] = null;
         });
+        this.$emit('formSubmitted',res.data);
+        this.$emit('success',res.data);
+        if(this.successMessage){
+          shRepo.showToast(this.successMessage);
+        }
         if (this.successCallback) {
           if (typeof this.successCallback === 'function') {
             this.successCallback(res.data);
@@ -2897,8 +2906,9 @@ var script$a = {
   'files',
   'phones',
   'numbers',
-  'customComponent','modalTitle','class'],
-  setup(__props) {
+  'customComponent','modalTitle','class','successMessage'],
+  emits: ['success'],
+  setup(__props, { emit }) {
 
 const props = __props;
 
@@ -2907,7 +2917,9 @@ const props = __props;
 vue.ref(props);
 let btnClass=props.class;
 const modalId = 'rand' + (Math.random() + 1).toString(36).substring(2);
-
+const success = (res)=>{
+  emit('success',res);
+};
 
 return (_ctx, _cache) => {
   return (vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
@@ -2923,7 +2935,7 @@ return (_ctx, _cache) => {
       "modal-title": __props.modalTitle
     }, {
       default: vue.withCtx(() => [
-        vue.createVNode(script$d, vue.normalizeProps(vue.guardReactiveProps(props)), null, 16 /* FULL_PROPS */)
+        vue.createVNode(script$d, vue.mergeProps({ onSuccess: success }, props), null, 16 /* FULL_PROPS */)
       ]),
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["modal-title"])
@@ -3158,7 +3170,7 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
           : vue.createCommentVNode("v-if", true)
       ]))
     : (vue.openBlock(), vue.createElementBlock("div", _hoisted_16$1, [
-        (this.pagination_data.loading === 1 && $props.loadMore)
+        (this.pagination_data.loading === 1 && $props.loadMore && $props.hideLoadMore)
           ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_17$1, _hoisted_19$1))
           : vue.createCommentVNode("v-if", true),
         (!$props.hideCount)
@@ -3200,36 +3212,56 @@ var script$7 = {
   loadingMessage: {
     type: String,
     default: 'Processing'
+  },
+  successMessage: {
+    type: String,
+    default: 'Action Successful'
+  },
+  failMessage: {
+    type: String,
+    default: 'Action failed'
   }
 },
-  emits: ['actionSuccessful', 'actionFailed','actionCanceled'],
+  emits: ['actionSuccessful', 'actionFailed','success','actionCanceled'],
   setup(__props, { emit }) {
 
 const props = __props;
 
 
+
 const processing = vue.ref(false);
 
+const actionSuccessful = (res)=>{
+  processing.value = false;
+  res.actionType = 'silentAction';
+  emit('actionSuccessful',res);
+  emit('success',res);
+  shRepo.showToast(res.message ?? props.successMessage);
+};
 
+const actionFailed = reason =>{
+  console.log(reason);
+  processing.value = false;
+  reason.actionType = 'silentAction';
+  emit('actionFailed', reason);
+  shRepo.showToast(reason.value.error.message ?? props.failMessage,'error');
+};
 function runAction () {
   processing.value = true;
   shRepo.runPlainRequest(props.url, props.message, props.title, props.data).then(res => {
     if(res.isConfirmed){
       const value = res.value;
-      if(value.status){
-        emit('actionSuccessful', res);
-        processing.value = false;
+      if(value.success){
+        actionSuccessful(res.value.response);
       } else {
-        emit('actionFailed', value);
-        processing.value = false;
+        actionFailed(res);
       }
     } else {
       emit('actionCanceled');
       processing.value = false;
     }
   }).catch(ex => {
-    emit('actionFailed', ex);
-    processing.value = false;
+    actionFailed(ex);
   });
 }
 
@@ -3269,6 +3301,14 @@ var script$6 = {
     type: String,
     default: 'Processing'
   },
+  successMessage: {
+    type: String,
+    default: 'Action Successful'
+  },
+  failMessage: {
+    type: String,
+    default: 'Action failed'
+  },
   method: {
     type: String,
     default: 'POST'
@@ -3278,7 +3318,7 @@ var script$6 = {
     required: true
   }
 },
-  emits: ['actionSuccessful','actionFailed'],
+  emits: ['actionSuccessful','actionFailed','success'],
   setup(__props, { emit }) {
 
 const props = __props;
@@ -3286,25 +3326,37 @@ const props = __props;
 
 const processing = vue.ref(false);
 
+const actionSuccessful = (res)=>{
+  processing.value = false;
+  res.actionType = 'silentAction';
+  console.log(res.data,props.successMessage);
+  emit('actionSuccessful',res);
+  emit('success',res);
+  shRepo.showToast(res.data.message ?? props.successMessage);
+};
 
+const actionFailed = reason =>{
+  processing.value = false;
+  console.log(reason);
+  shRepo.showToast('Failed');
+  reason.actionType = 'silentAction';
+  emit('actionFailed', reason);
+  shRepo.showToast(reason.message ?? props.failMessage,'error');
+};
 function runAction(){
   processing.value = true;
   if(props.method === 'POST'){
     shApis.doPost(props.url,props.data).then(res=>{
-      emit('actionSuccessful',res);
-      processing.value = false;
+      actionSuccessful(res);
     }).catch(reason=>{
-      emit('actionFailed', reason);
-      processing.value = false;
+      actionFailed(reason);
     });
   }
   if(props.method === 'GET'){
     shApis.doGet(props.url,props.data).then(res=>{
-      emit('actionSuccessful',res);
-      processing.value = false;
+      actionSuccessful(res);
     }).catch(reason=>{
-      emit('actionFailed', reason);
-      processing.value = false;
+      actionFailed(reason);
     });
   }
 }
@@ -3966,7 +4018,7 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
                                                           ]),
                                                           _: 2 /* DYNAMIC */
                                                         }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["onActionSuccessful", "onActionFailed", "onActionCanceled", "loading-message", "class", "url"]))
-                                                      : (act.canvasId)
+                                                      : (act.canvasId || act.type === 'offcanvas')
                                                         ? (vue.openBlock(), vue.createElementBlock("a", {
                                                             key: 2,
                                                             href: '#' + act.canvasId,
@@ -4417,6 +4469,9 @@ const useUserStore = pinia.defineStore('user-store', {
         }
         ShStorage.setItem('user',user);
         user.isAllowedTo = function (slug) {
+          if(!slug){
+            return true
+          }
           if (this.permissions) {
             let permissions = [];
             if (typeof this.permissions === 'string') {
@@ -4596,6 +4651,7 @@ let getModule = vue.computed(()=>{
 
 function moduleAdded () {
   shRepo.showToast('module added successfully', 'success');
+  userStore.setUser();
   reload.value++;
 }
 function showModule (module) {
@@ -4654,6 +4710,7 @@ function submitPermissions() {
   shApis.doPost('admin/departments/department/permissions/' + getModule.value.id, data)
       .then(res => {
         reload.value++;
+        userStore.setUser();
         shRepo.showToast('Permissions updated', 'success');
       });
 }

package/dist/library.mjs

@@ -1,7 +1,7 @@
 import Axios from 'axios';
 import moment from 'moment';
 import Swal from 'sweetalert2';
-import { inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, resolveComponent, withModifiers, createVNode, ref, onMounted, unref, normalizeClass, createBlock, resolveDynamicComponent, renderSlot, normalizeProps, guardReactiveProps, withCtx, createStaticVNode, mergeProps, shallowRef, computed, isRef, vModelCheckbox, watch, pushScopeId, popScopeId } from 'vue';
+import { inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, resolveComponent, withModifiers, createVNode, ref, onMounted, unref, normalizeClass, createBlock, resolveDynamicComponent, renderSlot, normalizeProps, guardReactiveProps, withCtx, mergeProps, createStaticVNode, shallowRef, computed, isRef, vModelCheckbox, watch, pushScopeId, popScopeId } from 'vue';
 import NProgress from 'nprogress';
 import Editor from '@tinymce/tinymce-vue';
 import { defineStore, storeToRefs } from 'pinia';
@@ -272,8 +272,12 @@ async function shSwalLogout () {
   }).then((result) => {
     if (result.isConfirmed) {
       logoutUser();
-    } else if (result.isDenied) {
-     updateSession();
+    } else {
+      window.ShConfirmation = null;
+      clearInterval(window.shInterval);
+      const timeNow = moment().toISOString();
+      ShStorage.setItem('last_activity', timeNow);
+      startSession();
     }
   })
 }
@@ -295,7 +299,6 @@ const updateSession = () =>{
   }
   const timeNow = moment().toISOString();
   ShStorage.setItem('last_activity', timeNow);
-  window.ShConfirmation = null;
 };
 
 let apiUrl = import.meta.env.VITE_APP_API_URL;
@@ -2183,7 +2186,8 @@ var script$d = {
       'files',
       'phones',
       'numbers',
-      'customComponent'
+      'customComponent',
+      'successMessage'
   ],
   data: function () {
     return {
@@ -2372,6 +2376,11 @@ var script$d = {
         Object.keys(this.form_files).forEach(key => {
           this.form_errors[key] = null;
         });
+        this.$emit('formSubmitted',res.data);
+        this.$emit('success',res.data);
+        if(this.successMessage){
+          shRepo.showToast(this.successMessage);
+        }
         if (this.successCallback) {
           if (typeof this.successCallback === 'function') {
             this.successCallback(res.data);
@@ -2885,8 +2894,9 @@ var script$a = {
   'files',
   'phones',
   'numbers',
-  'customComponent','modalTitle','class'],
-  setup(__props) {
+  'customComponent','modalTitle','class','successMessage'],
+  emits: ['success'],
+  setup(__props, { emit }) {
 
 const props = __props;
 
@@ -2895,7 +2905,9 @@ const props = __props;
 ref(props);
 let btnClass=props.class;
 const modalId = 'rand' + (Math.random() + 1).toString(36).substring(2);
-
+const success = (res)=>{
+  emit('success',res);
+};
 
 return (_ctx, _cache) => {
   return (openBlock(), createElementBlock(Fragment, null, [
@@ -2911,7 +2923,7 @@ return (_ctx, _cache) => {
       "modal-title": __props.modalTitle
     }, {
       default: withCtx(() => [
-        createVNode(script$d, normalizeProps(guardReactiveProps(props)), null, 16 /* FULL_PROPS */)
+        createVNode(script$d, mergeProps({ onSuccess: success }, props), null, 16 /* FULL_PROPS */)
       ]),
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["modal-title"])
@@ -3146,7 +3158,7 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
           : createCommentVNode("v-if", true)
       ]))
     : (openBlock(), createElementBlock("div", _hoisted_16$1, [
-        (this.pagination_data.loading === 1 && $props.loadMore)
+        (this.pagination_data.loading === 1 && $props.loadMore && $props.hideLoadMore)
           ? (openBlock(), createElementBlock("div", _hoisted_17$1, _hoisted_19$1))
           : createCommentVNode("v-if", true),
         (!$props.hideCount)
@@ -3188,36 +3200,56 @@ var script$7 = {
   loadingMessage: {
     type: String,
     default: 'Processing'
+  },
+  successMessage: {
+    type: String,
+    default: 'Action Successful'
+  },
+  failMessage: {
+    type: String,
+    default: 'Action failed'
   }
 },
-  emits: ['actionSuccessful', 'actionFailed','actionCanceled'],
+  emits: ['actionSuccessful', 'actionFailed','success','actionCanceled'],
   setup(__props, { emit }) {
 
 const props = __props;
 
 
+
 const processing = ref(false);
 
+const actionSuccessful = (res)=>{
+  processing.value = false;
+  res.actionType = 'silentAction';
+  emit('actionSuccessful',res);
+  emit('success',res);
+  shRepo.showToast(res.message ?? props.successMessage);
+};
 
+const actionFailed = reason =>{
+  console.log(reason);
+  processing.value = false;
+  reason.actionType = 'silentAction';
+  emit('actionFailed', reason);
+  shRepo.showToast(reason.value.error.message ?? props.failMessage,'error');
+};
 function runAction () {
   processing.value = true;
   shRepo.runPlainRequest(props.url, props.message, props.title, props.data).then(res => {
     if(res.isConfirmed){
       const value = res.value;
-      if(value.status){
-        emit('actionSuccessful', res);
-        processing.value = false;
+      if(value.success){
+        actionSuccessful(res.value.response);
       } else {
-        emit('actionFailed', value);
-        processing.value = false;
+        actionFailed(res);
       }
     } else {
       emit('actionCanceled');
       processing.value = false;
     }
   }).catch(ex => {
-    emit('actionFailed', ex);
-    processing.value = false;
+    actionFailed(ex);
   });
 }
 
@@ -3257,6 +3289,14 @@ var script$6 = {
     type: String,
     default: 'Processing'
   },
+  successMessage: {
+    type: String,
+    default: 'Action Successful'
+  },
+  failMessage: {
+    type: String,
+    default: 'Action failed'
+  },
   method: {
     type: String,
     default: 'POST'
@@ -3266,7 +3306,7 @@ var script$6 = {
     required: true
   }
 },
-  emits: ['actionSuccessful','actionFailed'],
+  emits: ['actionSuccessful','actionFailed','success'],
   setup(__props, { emit }) {
 
 const props = __props;
@@ -3274,25 +3314,37 @@ const props = __props;
 
 const processing = ref(false);
 
+const actionSuccessful = (res)=>{
+  processing.value = false;
+  res.actionType = 'silentAction';
+  console.log(res.data,props.successMessage);
+  emit('actionSuccessful',res);
+  emit('success',res);
+  shRepo.showToast(res.data.message ?? props.successMessage);
+};
 
+const actionFailed = reason =>{
+  processing.value = false;
+  console.log(reason);
+  shRepo.showToast('Failed');
+  reason.actionType = 'silentAction';
+  emit('actionFailed', reason);
+  shRepo.showToast(reason.message ?? props.failMessage,'error');
+};
 function runAction(){
   processing.value = true;
   if(props.method === 'POST'){
     shApis.doPost(props.url,props.data).then(res=>{
-      emit('actionSuccessful',res);
-      processing.value = false;
+      actionSuccessful(res);
     }).catch(reason=>{
-      emit('actionFailed', reason);
-      processing.value = false;
+      actionFailed(reason);
     });
   }
   if(props.method === 'GET'){
     shApis.doGet(props.url,props.data).then(res=>{
-      emit('actionSuccessful',res);
-      processing.value = false;
+      actionSuccessful(res);
     }).catch(reason=>{
-      emit('actionFailed', reason);
-      processing.value = false;
+      actionFailed(reason);
     });
   }
 }
@@ -3954,7 +4006,7 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
                                                           ]),
                                                           _: 2 /* DYNAMIC */
                                                         }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["onActionSuccessful", "onActionFailed", "onActionCanceled", "loading-message", "class", "url"]))
-                                                      : (act.canvasId)
+                                                      : (act.canvasId || act.type === 'offcanvas')
                                                         ? (openBlock(), createElementBlock("a", {
                                                             key: 2,
                                                             href: '#' + act.canvasId,
@@ -4405,6 +4457,9 @@ const useUserStore = defineStore('user-store', {
         }
         ShStorage.setItem('user',user);
         user.isAllowedTo = function (slug) {
+          if(!slug){
+            return true
+          }
           if (this.permissions) {
             let permissions = [];
             if (typeof this.permissions === 'string') {
@@ -4584,6 +4639,7 @@ let getModule = computed(()=>{
 
 function moduleAdded () {
   shRepo.showToast('module added successfully', 'success');
+  userStore.setUser();
   reload.value++;
 }
 function showModule (module) {
@@ -4642,6 +4698,7 @@ function submitPermissions() {
   shApis.doPost('admin/departments/department/permissions/' + getModule.value.id, data)
       .then(res => {
         reload.value++;
+        userStore.setUser();
         shRepo.showToast('Permissions updated', 'success');
       });
 }

package/package.json

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