@iankibetsh/shframework 5.1.1 → 5.1.3

package/dist/library.js

@@ -4259,16 +4259,19 @@ const actionSuccessful = (res)=>{
   res.actionType = 'silentAction';
   emit('actionSuccessful',res);
   emit('success',res);
-  shRepo.showToast(res.message ?? props.successMessage);
+  if(props.successMessage || res.message){
+    shRepo.showToast(res.message ?? props.successMessage);
+  }
 };
 
 const actionFailed = reason =>{
-  console.log(reason);
   processing.value = false;
   reason.actionType = 'silentAction';
   emit('actionFailed', reason);
   emit('failed', reason);
-  shRepo.showToast(reason.value.error.message ?? props.failMessage,'error');
+  if (props.failMessage || reason.value?.message) {
+    shRepo.showToast(reason.value.message ?? props.failMessage,'error');
+  }
 };
 function runAction () {
   processing.value = true;
@@ -5213,11 +5216,11 @@ const _hoisted_70 = { key: 0 };
 
 const __default__ = {
   name: 'sh-table',
-  props: ['endPoint', 'headers','disableMobileResponsive', 'cacheKey', 'query', 'pageCount', 'actions', 'hideCount', 'hideLoadMore', 'links', 'reload', 'hideSearch', 'sharedData', 'searchPlaceholder', 'event', 'displayMore', 'displayMoreBtnClass', 'moreDetailsColumns', 'moreDetailsFields', 'hasDownload', 'downloadFields', 'tableHover', 'hideIds', 'paginationStyle', 'hasRange','selectedRange','noRecordsMessage'],
+  props: ['endPoint','orderBy','orderMethod', 'headers','disableMobileResponsive', 'cacheKey', 'query', 'pageCount', 'actions', 'hideCount', 'hideLoadMore', 'links', 'reload', 'hideSearch', 'sharedData', 'searchPlaceholder', 'event', 'displayMore', 'displayMoreBtnClass', 'moreDetailsColumns', 'moreDetailsFields', 'hasDownload', 'downloadFields', 'tableHover', 'hideIds', 'paginationStyle', 'hasRange','selectedRange','noRecordsMessage'],
   data(){
     return {
-      order_by: '',
-      order_method: '',
+      order_by: this.orderBy,
+      order_method: this.orderMethod,
       per_page: this.pageCount ?? shRepo.getShConfig('tablePerPage', 10),
       page: 1,
       exactMatch: false,
@@ -5427,7 +5430,7 @@ const __default__ = {
       } else if (!append) {
         this.loading = 'loading';
       }
-      const data = {
+      let data = {
         order_by: this.order_by,
         order_method: this.order_method,
         per_page: this.per_page,
@@ -5439,6 +5442,12 @@ const __default__ = {
         period: this.period,
         exact: this.exactMatch
       };
+      // remove empty values
+      Object.keys(data).forEach(key => {
+        if (data[key] === null || data[key] === '') {
+          delete data[key];
+        }
+      });
       if (this.pagination_data) {
         this.pagination_data.loading = 1;
       }

package/dist/library.mjs

@@ -4247,16 +4247,19 @@ const actionSuccessful = (res)=>{
   res.actionType = 'silentAction';
   emit('actionSuccessful',res);
   emit('success',res);
-  shRepo.showToast(res.message ?? props.successMessage);
+  if(props.successMessage || res.message){
+    shRepo.showToast(res.message ?? props.successMessage);
+  }
 };
 
 const actionFailed = reason =>{
-  console.log(reason);
   processing.value = false;
   reason.actionType = 'silentAction';
   emit('actionFailed', reason);
   emit('failed', reason);
-  shRepo.showToast(reason.value.error.message ?? props.failMessage,'error');
+  if (props.failMessage || reason.value?.message) {
+    shRepo.showToast(reason.value.message ?? props.failMessage,'error');
+  }
 };
 function runAction () {
   processing.value = true;
@@ -5201,11 +5204,11 @@ const _hoisted_70 = { key: 0 };
 
 const __default__ = {
   name: 'sh-table',
-  props: ['endPoint', 'headers','disableMobileResponsive', 'cacheKey', 'query', 'pageCount', 'actions', 'hideCount', 'hideLoadMore', 'links', 'reload', 'hideSearch', 'sharedData', 'searchPlaceholder', 'event', 'displayMore', 'displayMoreBtnClass', 'moreDetailsColumns', 'moreDetailsFields', 'hasDownload', 'downloadFields', 'tableHover', 'hideIds', 'paginationStyle', 'hasRange','selectedRange','noRecordsMessage'],
+  props: ['endPoint','orderBy','orderMethod', 'headers','disableMobileResponsive', 'cacheKey', 'query', 'pageCount', 'actions', 'hideCount', 'hideLoadMore', 'links', 'reload', 'hideSearch', 'sharedData', 'searchPlaceholder', 'event', 'displayMore', 'displayMoreBtnClass', 'moreDetailsColumns', 'moreDetailsFields', 'hasDownload', 'downloadFields', 'tableHover', 'hideIds', 'paginationStyle', 'hasRange','selectedRange','noRecordsMessage'],
   data(){
     return {
-      order_by: '',
-      order_method: '',
+      order_by: this.orderBy,
+      order_method: this.orderMethod,
       per_page: this.pageCount ?? shRepo.getShConfig('tablePerPage', 10),
       page: 1,
       exactMatch: false,
@@ -5415,7 +5418,7 @@ const __default__ = {
       } else if (!append) {
         this.loading = 'loading';
       }
-      const data = {
+      let data = {
         order_by: this.order_by,
         order_method: this.order_method,
         per_page: this.per_page,
@@ -5427,6 +5430,12 @@ const __default__ = {
         period: this.period,
         exact: this.exactMatch
       };
+      // remove empty values
+      Object.keys(data).forEach(key => {
+        if (data[key] === null || data[key] === '') {
+          delete data[key];
+        }
+      });
       if (this.pagination_data) {
         this.pagination_data.loading = 1;
       }

package/package.json

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