merge latest from master

dist/data_provider.js

@@ -0,0 +1,253 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _reactAdmin = require("react-admin");
+
+var _queryString = require("query-string");
+
+var _inflection = require("inflection");
+
+var _auth = _interopRequireDefault(require("@aws-amplify/auth"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = apiUrl => {
+  let getToken = async () => {
+    const session = await _auth.default.currentSession();
+    return session.idToken.jwtToken;
+  };
+
+  const fetchJson = async (path, options = {}) => {
+    if (!options.headers) {
+      options.headers = new Headers({
+        Accept: 'application/json'
+      });
+    }
+
+    options.headers.set('Authorization', await getToken());
+    const accountId = localStorage.getItem('accountId');
+
+    if (accountId) {
+      options.headers.set('Lolo-Account-Id', accountId);
+    }
+
+    return _reactAdmin.fetchUtils.fetchJson(apiUrl + path, options).catch(err => {
+      if (err.body && err.body.error) {
+        // 401, 403, 500
+        err.message = err.body.error;
+      } else if (err.body && err.body.errors) {
+        // 422
+        err.message = err.body.errors.map(item => {
+          const field = (0, _inflection.humanize)(item.dataPath.replace('.body.', ''));
+          return `${field} ${item.message}`;
+        }).join(', ');
+      }
+
+      throw err;
+    });
+  };
+
+  const buildQs = (filter = {}) => Object.entries(filter).reduce((memo, [k, v]) => {
+    memo[`q[${k}]`] = v;
+    return memo;
+  }, {});
+
+  const create = async (resource, params) => {
+    const res = await fetchJson(`/${resource}`, {
+      method: 'POST',
+      body: JSON.stringify(params.data)
+    });
+    return {
+      data: res.json
+    };
+  };
+
+  return {
+    /**
+     * API URL
+     */
+    apiUrl,
+
+    /**
+     * Custom request
+     */
+    sendRequest: async (path, options) => {
+      const res = await fetchJson(path, options);
+      return {
+        data: res.json
+      };
+    },
+
+    /**
+     * getList
+     */
+    getList: async (resource, params) => {
+      const {
+        page = 1,
+        perPage = 10
+      } = params.pagination || {};
+      const {
+        field = 'id',
+        order = 'ASC'
+      } = params.sort || {};
+      const query = {
+        limit: perPage,
+        sort: `${field} ${order.toLowerCase()}`,
+        offset: (page - 1) * perPage,
+        ...buildQs(params.filter)
+      };
+      const url = `/${resource}?${(0, _queryString.stringify)(query)}`;
+      const res = await fetchJson(url);
+      const cKey = (0, _inflection.pluralize)((0, _inflection.camelize)(resource.replace(/-/g, ''), true));
+      return {
+        data: res.json[kebabToCamel(resource)],
+        total: res.json.total
+      };
+    },
+
+    /**
+     * getOne
+     */
+    getOne: async (resource, params) => {
+      const res = await fetchJson(`/${resource}/${params.id}`);
+      return {
+        data: res.json
+      };
+    },
+
+    /**
+     * getMany
+     */
+    getMany: (resource, params) => {
+      const query = params.ids.reduce((memo, id) => {
+        return memo += `&q[id]=${id}`;
+      }, `qor=1`);
+      const url = `/${resource}?${query}`;
+      return fetchJson(url).then(({
+        headers,
+        json
+      }) => ({
+        data: json[kebabToCamel(resource)],
+        total: json.total
+      }));
+    },
+
+    /**
+     * getManyReference
+     */
+    getManyReference: async (resource, params) => {
+      const {
+        page = 1,
+        perPage = 10
+      } = params.pagination || {};
+      const {
+        field = 'id',
+        order = 'ASC'
+      } = params.sort || {};
+      const query = {
+        limit: perPage,
+        sort: `${field} ${order.toLowerCase()}`,
+        offset: (page - 1) * perPage,
+        qre: 0,
+        ...buildQs({ ...params.filter,
+          [params.target]: params.id
+        })
+      };
+      const url = `/${resource}?${(0, _queryString.stringify)(query)}`;
+      const res = await fetchJson(url);
+      return {
+        data: res.json[kebabToCamel(resource)],
+        total: res.json.total
+      };
+    },
+
+    /**
+     * update
+     */
+    update: (resource, params) => {
+      return fetchJson(`/${resource}/${params.id}`, {
+        method: 'PUT',
+        body: JSON.stringify(params.data)
+      }).then(res => {
+        return {
+          data: res.json
+        };
+      }).catch(err => {
+        // Ugly hack for import overwrite
+        if (err.status === 404) return create(resource, params);
+        throw err;
+      });
+    },
+
+    /**
+     * updateMany
+     */
+    updateMany: (resource, params) => {
+      throw new Error('Not implemented');
+    },
+
+    /**
+     * create
+     */
+    create,
+
+    /**
+     * delete
+     */
+    delete: (resource, params) => {
+      return fetchJson(`/${resource}/${params.id}`, {
+        method: 'DELETE'
+      }).then(() => ({
+        data: resource
+      }));
+    },
+
+    /**
+     * deleteMany
+     */
+    deleteMany: async (resource, params) => {
+      const deletedIds = [];
+
+      for (const id of params.ids) {
+        const url = `/${resource}/${id}`;
+
+        try {
+          await fetchJson(url, {
+            method: 'DELETE'
+          });
+          deletedIds.push(id);
+        } catch (err) {
+          console.log('delete error', err);
+        }
+      }
+
+      return {
+        data: deletedIds
+      };
+    },
+
+    /**
+     * getToken
+     */
+    get getToken() {
+      return getToken;
+    },
+
+    set getToken(fn) {
+      getToken = fn;
+    }
+
+  };
+};
+
+exports.default = _default;
+
+function kebabToCamel(s) {
+  return s.replace(/(-\w)/g, function (m) {
+    return m[1].toUpperCase();
+  });
+}

src/providers/dataProvider.js

@@ -133,7 +133,8 @@ export default apiUrl => {
         limit: perPage,
         sort: `${field} ${order.toLowerCase()}`,
         offset: (page - 1) * perPage,
-        ...buildQs({ ...params.filter, [params.target]: params.id }),
+        qre: 0,
+        ...buildQs({ ...params.filter, [params.target]: params.id })
       };
 
       const url = `/${resource}?${stringify(query)}`;