@benjy2976/pmsg 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@benjy2976/pmsg",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "generator of models and store default for pinia",
   "main": "src/Model.js",
   "scripts": {

package/src/Model.js

@@ -23,10 +23,7 @@ export default class Model {
       params              : { modeljs: true },// Aquí se configuran parámetros adicionales a enviar en los request excepto DELETE
       modelGetters        : {},// Aquí se configuran parámetros adicionales a enviar en los request excepto DELETE
       paginate            : false,// Condicional para definir si el modelo tiene paginación
-      pagination          : {
-        current_page : 1,
-        per_page     : 10
-      }
+      pagination          : {current_page: 1, per_page: 10},// Configuración de paginación
     }
     //config.hasKey=config.hasKey!=undefined?config.hasKey:config.key!=undefined
     defaultValues = Object.assign(defaultValues, config)
@@ -50,16 +47,16 @@ export default class Model {
     this.params = defaultValues.params
     this.modelGetters = defaultValues.modelGetters
     this.paginate = defaultValues.paginate
-    this.pagination = {...defaultValues.pagination}
+    this.pagination = defaultValues.pagination
     this.state = {}
     this.getters = {}
     this.actions = {}
   }
 
-  get(url = '', params = {}) {
+  get(url = '', params = {}, config = {}) {
     params = Object.assign(params, this.params)
     url = this.route + '/' + url
-    return this.instance.get(url, params)
+    return this.instance.get(url, params, config)
   }
 
   post(url = '', params = {}) {
@@ -69,9 +66,9 @@ export default class Model {
   }
 
   // Función para obtener el listado de Objetos de la base de datos
-  getAll(params = {}) {
+  getAll(params = {}, config = {}) {
     params = Object.assign(params, this.params)
-    return this.instance.get(this.route, params)
+    return this.instance.get(this.route, params, config)
   }
 
   // Función para crear un objeto en la base de datos
@@ -193,7 +190,9 @@ export default class Model {
 
         }
       }),
-      sync : this.sync
+      sync       : this.sync,
+      paginate   : this.paginate,
+      pagination : this.pagination,
     }
   }
 
@@ -217,5 +216,4 @@ export default class Model {
   getNameAttribute() {
     return this.name
   }
-}
-
+}

package/src/useModelStore.js

@@ -22,7 +22,6 @@ export default function createModelStore (model, state = {}, getters = {}, actio
       return areObjEquals(d,data)
     }
   }
-  const resolveR = (item) => item
   return {
     state : {
       itemSelected        : { loading: false, ...model.getDefault() },
@@ -34,10 +33,12 @@ export default function createModelStore (model, state = {}, getters = {}, actio
       maxRelationsResolve : config.maxRelationsResolve,
       relations           : config.relations,
       syncStatus          : config.sync,
-      pagination          : {...config.paginate, last_page: 1, total: 0},
+      paginate            : config.paginate,  
+      pagination          : config.pagination,
       selectedStatus      : false,
       timeOutAsinc        : null,
       check               : check,
+      resolve             : (item) => item,
       ...state
     },
     getters : {
@@ -51,21 +52,21 @@ export default function createModelStore (model, state = {}, getters = {}, actio
         return item ? item[model.getNameAttribute()] : null
       },
       // Getter para obtener el objeto seleccionado
-      find : ({ items, key }) => (id, level = 1) => {
-        const item = items.find(d => d[key] === id)
-        return item ? resolveR(item, level):model.getDefault()
+      find : ({ items, key, resolve }) => (id, level = 1) => {
+        const item = items.find(d => d[key] === Number(id))
+        return item ? resolve(item, level):model.getDefault()
       },
       // Getter para obtener la lista de objetos
-      list : ({items}) => {
-        return items.map(resolveR)
+      list : ({items, resolve}) => {
+        return items.map(resolve)
       },
       // Getter para obtener la lista de objetos filtrados
-      filter : ({items}) => (filter, level = 1) => {
-        return items.filter(filter).map(item => resolveR(item, level))
+      filter : ({items,resolve}) => (filter, level = 1) => {
+        return items.filter(filter).map(item => resolve(item, level))
       },
       // Getter para obtener el objeto seleccionado o falso si no hay seleccion
-      selected : ({ itemSelected, selectedStatus }) => {
-        return selectedStatus ? resolveR(itemSelected) : selectedStatus
+      selected : ({ itemSelected, selectedStatus, resolve }) => {
+        return selectedStatus ? resolve(itemSelected) : selectedStatus
       },
       ...getters
     },
@@ -130,10 +131,10 @@ export default function createModelStore (model, state = {}, getters = {}, actio
       },
       // Action para obtener la lista de objetos de el servidor
       async get (params = {}, pagination={}) {
-      //var commit = store.commit
+        //var commit = store.commit
         const action = this.syncStatus ? 'sync' : 'setItems';
-
-        if (model.paginate) {
+        
+        if (this.paginate) {
           params = {...params, ...Object.assign({
             page : this.pagination.current_page, per_page : this.pagination.per_page
           }, pagination) };
@@ -143,10 +144,12 @@ export default function createModelStore (model, state = {}, getters = {}, actio
             model.getAll(params).then(response => {
               const data = response.data;
               model.save(data.data);
-              this[action](data.data);              
-              const { data: _ , ...pagination } = data;
-              this.pagination = Object.assign(this.pagination, pagination);
-              //console.log('get', this.pagination)
+              this[action](data.data);
+              if (this.paginate) {
+                // eslint-disable-next-line no-unused-vars
+                const { data: _, ...pagination } = data.meta;
+                this.pagination = Object.assign(this.pagination, pagination);
+              }
               this.afterGet();
               resolve(response);
             }).catch(reject);
@@ -174,7 +177,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
         //var commit = store.commit
         return new Promise((resolve, reject) => {
           model.getAll(params).then(response => {
-            this.sync(response.data);
+            this.sync(response.data.data);
             this.afterGet();
             resolve(response);
           }).catch(reject);
@@ -187,7 +190,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
           // divide y vencceras
           this.setItems([]);
           model.getAll(params).then(response => {
-            this.setItems(response.data);
+            this.setItems(response.data.data);
             this.afterGet();
             resolve(response);
           }).catch(reject);
@@ -346,4 +349,4 @@ export default function createModelStore (model, state = {}, getters = {}, actio
       ...actions
     }
   };
-}
+}