@iankibetsh/shframework 5.4.5 → 5.4.8

package/dist/library.js

@@ -4160,7 +4160,7 @@ const useUserStore = pinia.defineStore('user-store', {
     loggedOut: false
   }),
   actions: {
-    setUser (){
+    setUser (defaultEndpoint) {
       let user = null;
       try {
          user = shStorage.getItem('user') ? shStorage.getItem('user') : null;
@@ -4185,7 +4185,9 @@ const useUserStore = pinia.defineStore('user-store', {
         };
       }
       this.user = user;
-      shApis.doGet(vue.inject('userEndpoint')).then(res => {
+      const userEndpoint = defaultEndpoint ?? vue.inject('userEndpoint','auth/user') ?? 'auth/user?defaults=1';
+
+      shApis.doGet(userEndpoint).then(res => {
         let user = res.data.user;
         if (typeof(user) === 'undefined') {
            user = res.data;
@@ -6085,6 +6087,7 @@ const setTab = (tab) => {
   }
 };
 const setTabCounts = (tabCounts) => {
+  console.log('Setting tab counts', tabCounts);
   if (typeof tabCounts === 'object') {
     setCounts(tabCounts);
   } else {
@@ -6100,8 +6103,12 @@ const resetTabCounts = () => {
   } else {
     setTab(arr[arr.length - 1]);
   }
+  let tbCounts = props.tabCounts;
+  if(!tbCounts && typeof props.tabs[0] == 'object'){
+    tbCounts = props.tabs;
+  }
   if (props.tabCounts) {
-    setTabCounts(props.tabCounts);
+    setTabCounts(tbCounts);
   }
 };
 const tabExistsInUrl = () => {
@@ -6116,6 +6123,7 @@ const tabExistsInUrl = () => {
 };
 const setCounts = (res) => {
   Object.keys(res).forEach(key => {
+    console.log('Setting count for tab', key, res[key]);
     let elem = document.getElementsByClassName('sh_tab_' + key);
     if (elem.length > 0) {
       elem = elem[0];
@@ -7560,8 +7568,8 @@ const ShFrontend = {
     const noRecordsComponent = options.noRecordsComponent ?? script$k;
     const registrationFields = options.registrationFields ?? ['name','email','phone','password','password_confirmation'];
     const AuthComponent = options.authComponent ?? script;
-    const baseApiUrl = options.baseApiUrl ?? undefined.VITE_APP_API_URL;
     const userEndpoint = options.userEndpoint ?? 'auth/user';
+    const baseApiUrl = options.baseApiUrl ?? undefined.VITE_APP_API_URL;
     app.provide('loginEndpoint',loginEndpoint);
     app.provide('registerEndpoint', registerEndpoint);
     app.provide('registrationFields', registrationFields);

package/dist/library.mjs

@@ -4148,7 +4148,7 @@ const useUserStore = defineStore('user-store', {
     loggedOut: false
   }),
   actions: {
-    setUser (){
+    setUser (defaultEndpoint) {
       let user = null;
       try {
          user = shStorage.getItem('user') ? shStorage.getItem('user') : null;
@@ -4173,7 +4173,9 @@ const useUserStore = defineStore('user-store', {
         };
       }
       this.user = user;
-      shApis.doGet(inject('userEndpoint')).then(res => {
+      const userEndpoint = defaultEndpoint ?? inject('userEndpoint','auth/user') ?? 'auth/user?defaults=1';
+
+      shApis.doGet(userEndpoint).then(res => {
         let user = res.data.user;
         if (typeof(user) === 'undefined') {
            user = res.data;
@@ -6073,6 +6075,7 @@ const setTab = (tab) => {
   }
 };
 const setTabCounts = (tabCounts) => {
+  console.log('Setting tab counts', tabCounts);
   if (typeof tabCounts === 'object') {
     setCounts(tabCounts);
   } else {
@@ -6088,8 +6091,12 @@ const resetTabCounts = () => {
   } else {
     setTab(arr[arr.length - 1]);
   }
+  let tbCounts = props.tabCounts;
+  if(!tbCounts && typeof props.tabs[0] == 'object'){
+    tbCounts = props.tabs;
+  }
   if (props.tabCounts) {
-    setTabCounts(props.tabCounts);
+    setTabCounts(tbCounts);
   }
 };
 const tabExistsInUrl = () => {
@@ -6104,6 +6111,7 @@ const tabExistsInUrl = () => {
 };
 const setCounts = (res) => {
   Object.keys(res).forEach(key => {
+    console.log('Setting count for tab', key, res[key]);
     let elem = document.getElementsByClassName('sh_tab_' + key);
     if (elem.length > 0) {
       elem = elem[0];
@@ -7548,8 +7556,8 @@ const ShFrontend = {
     const noRecordsComponent = options.noRecordsComponent ?? script$k;
     const registrationFields = options.registrationFields ?? ['name','email','phone','password','password_confirmation'];
     const AuthComponent = options.authComponent ?? script;
-    const baseApiUrl = options.baseApiUrl ?? import.meta.env.VITE_APP_API_URL;
     const userEndpoint = options.userEndpoint ?? 'auth/user';
+    const baseApiUrl = options.baseApiUrl ?? import.meta.env.VITE_APP_API_URL;
     app.provide('loginEndpoint',loginEndpoint);
     app.provide('registerEndpoint', registerEndpoint);
     app.provide('registrationFields', registrationFields);

package/package.json

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