ra-media-provider - npm Package Compare versions

Comparing version 0.0.1 to 0.0.2

esm/mediaProvider/index.js

@@ -84,3 +84,3 @@ var __assign = (this && this.__assign) || function () {
                                             _b = key;
-                                            return [4 /*yield*/, fileService.createMany(data[key].map(function (e) { return e.rawFile; }), resource)];
+                                            return [4 /*yield*/, fileService.createMany(data[key].map(function (e) { return e.rawFile; }), resource, key)];
                                         case 1:
@@ -92,3 +92,3 @@ _a[_b] = _e.sent();
                                             _d = key;
-                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource)];
+                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource, key)];
                                         case 3:
@@ -139,3 +139,3 @@ _c[_d] = _e.sent();
                                             _b = i;
-                                            return [4 /*yield*/, fileService.createOne(data[key][i].rawFile, resource)];
+                                            return [4 /*yield*/, fileService.createOne(data[key][i].rawFile, resource, key)];
                                         case 4:
@@ -157,3 +157,3 @@ _a[_b] = _f.sent();
                                             _d = key;
-                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource)];
+                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource, key)];
                                         case 10:
@@ -160,0 +160,0 @@ _c[_d] = _f.sent();

esm/services/BaseFileService.d.ts

@@ -18,4 +18,4 @@ export interface SFile {
     constructor(settings: SettingsProps);
-    abstract createOne(file: File, resource: string): Promise<Partial<SFile>>;
-    abstract createMany(files: File[], resource: string): Promise<Partial<SFile>>;
+    abstract createOne(file: File, resource: string, key: string): Promise<Partial<SFile>>;
+    abstract createMany(files: File[], resource: string, key: string): Promise<Partial<SFile>>;
     abstract deleteOne(id: number): Promise<void>;
@@ -22,0 +22,0 @@ abstract deleteMany(ids: number[]): Promise<void[]>;

esm/services/RestFileService.d.ts

@@ -6,6 +6,6 @@ import { BaseFileService, SettingsProps } from './BaseFileService';
     private optimizeImage;
-    createOne(file: File, resource: string): Promise<{
+    createOne(file: File, resource: string, key: string): Promise<{
         id: any;
     }>;
-    createMany(files: File[], resource: string): Promise<any>;
+    createMany(files: File[], resource: string, key: string): Promise<any>;
     deleteOne(id: number): Promise<void>;
@@ -12,0 +12,0 @@ deleteMany(ids: number[]): Promise<void[]>;

esm/services/RestFileService.js

@@ -84,3 +84,3 @@ var __extends = (this && this.__extends) || (function () {
     };
-    RestFileService.prototype.optimizeImage = function (file, resource) {
+    RestFileService.prototype.optimizeImage = function (file, resource, keys) {
         return __awaiter(this, void 0, void 0, function () {
@@ -91,3 +91,12 @@ var key_1;
                 if (this.settings.resources) {
-                    key_1 = this.settings.resources[resource] ? resource : 'default';
+                    key_1 = 'default';
+                    if (this.settings.resources[resource]) {
+                        key_1 = resource;
+                    }
+                    if (this.settings.resources[keys]) {
+                        key_1 = keys;
+                    }
+                    if (this.settings.resources[resource + "." + keys]) {
+                        key_1 = keys;
+                    }
                     return [2 /*return*/, new Promise(function (resolve, reject) {
@@ -115,3 +124,3 @@ if (_this.settings.resources && _this.settings.resources[key_1]) {
     };
-    RestFileService.prototype.createOne = function (file, resource) {
+    RestFileService.prototype.createOne = function (file, resource, key) {
         return __awaiter(this, void 0, void 0, function () {
@@ -124,3 +133,3 @@ var formdata, blobImage, requestOptions, response;
                         if (!file.type.includes('image')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.optimizeImage(file, resource)];
+                        return [4 /*yield*/, this.optimizeImage(file, resource, key)];
                     case 1:
@@ -146,3 +155,3 @@ blobImage = _a.sent();
     };
-    RestFileService.prototype.createMany = function (files, resource) {
+    RestFileService.prototype.createMany = function (files, resource, key) {
         return __awaiter(this, void 0, void 0, function () {
@@ -161,3 +170,3 @@ var formdata, requestOptions, response;
                                             if (!file.type.includes('image')) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this.optimizeImage(file, resource)];
+                                            return [4 /*yield*/, this.optimizeImage(file, resource, key)];
                                         case 1:
@@ -164,0 +173,0 @@ blobImage = _a.sent();

lib/mediaProvider/index.js

@@ -87,3 +87,3 @@ "use strict";
                                             _b = key;
-                                            return [4 /*yield*/, fileService.createMany(data[key].map(function (e) { return e.rawFile; }), resource)];
+                                            return [4 /*yield*/, fileService.createMany(data[key].map(function (e) { return e.rawFile; }), resource, key)];
                                         case 1:
@@ -95,3 +95,3 @@ _a[_b] = _e.sent();
                                             _d = key;
-                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource)];
+                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource, key)];
                                         case 3:
@@ -142,3 +142,3 @@ _c[_d] = _e.sent();
                                             _b = i;
-                                            return [4 /*yield*/, fileService.createOne(data[key][i].rawFile, resource)];
+                                            return [4 /*yield*/, fileService.createOne(data[key][i].rawFile, resource, key)];
                                         case 4:
@@ -160,3 +160,3 @@ _a[_b] = _f.sent();
                                             _d = key;
-                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource)];
+                                            return [4 /*yield*/, fileService.createOne(data[key].rawFile, resource, key)];
                                         case 10:
@@ -163,0 +163,0 @@ _c[_d] = _f.sent();

lib/services/BaseFileService.d.ts

@@ -18,4 +18,4 @@ export interface SFile {
     constructor(settings: SettingsProps);
-    abstract createOne(file: File, resource: string): Promise<Partial<SFile>>;
-    abstract createMany(files: File[], resource: string): Promise<Partial<SFile>>;
+    abstract createOne(file: File, resource: string, key: string): Promise<Partial<SFile>>;
+    abstract createMany(files: File[], resource: string, key: string): Promise<Partial<SFile>>;
     abstract deleteOne(id: number): Promise<void>;
@@ -22,0 +22,0 @@ abstract deleteMany(ids: number[]): Promise<void[]>;

lib/services/RestFileService.d.ts

@@ -6,6 +6,6 @@ import { BaseFileService, SettingsProps } from './BaseFileService';
     private optimizeImage;
-    createOne(file: File, resource: string): Promise<{
+    createOne(file: File, resource: string, key: string): Promise<{
         id: any;
     }>;
-    createMany(files: File[], resource: string): Promise<any>;
+    createMany(files: File[], resource: string, key: string): Promise<any>;
     deleteOne(id: number): Promise<void>;
@@ -12,0 +12,0 @@ deleteMany(ids: number[]): Promise<void[]>;

lib/services/RestFileService.js

@@ -90,3 +90,3 @@ "use strict";
     };
-    RestFileService.prototype.optimizeImage = function (file, resource) {
+    RestFileService.prototype.optimizeImage = function (file, resource, keys) {
         return __awaiter(this, void 0, void 0, function () {
@@ -97,3 +97,12 @@ var key_1;
                 if (this.settings.resources) {
-                    key_1 = this.settings.resources[resource] ? resource : 'default';
+                    key_1 = 'default';
+                    if (this.settings.resources[resource]) {
+                        key_1 = resource;
+                    }
+                    if (this.settings.resources[keys]) {
+                        key_1 = keys;
+                    }
+                    if (this.settings.resources[resource + "." + keys]) {
+                        key_1 = keys;
+                    }
                     return [2 /*return*/, new Promise(function (resolve, reject) {
@@ -121,3 +130,3 @@ if (_this.settings.resources && _this.settings.resources[key_1]) {
     };
-    RestFileService.prototype.createOne = function (file, resource) {
+    RestFileService.prototype.createOne = function (file, resource, key) {
         return __awaiter(this, void 0, void 0, function () {
@@ -130,3 +139,3 @@ var formdata, blobImage, requestOptions, response;
                         if (!file.type.includes('image')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.optimizeImage(file, resource)];
+                        return [4 /*yield*/, this.optimizeImage(file, resource, key)];
                     case 1:
@@ -152,3 +161,3 @@ blobImage = _a.sent();
     };
-    RestFileService.prototype.createMany = function (files, resource) {
+    RestFileService.prototype.createMany = function (files, resource, key) {
         return __awaiter(this, void 0, void 0, function () {
@@ -167,3 +176,3 @@ var formdata, requestOptions, response;
                                             if (!file.type.includes('image')) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this.optimizeImage(file, resource)];
+                                            return [4 /*yield*/, this.optimizeImage(file, resource, key)];
                                         case 1:
@@ -170,0 +179,0 @@ blobImage = _a.sent();

package.json

 {
     "name": "ra-media-provider",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "description": "Media provider for react-admin",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

src/services/BaseFileService.ts

@@ -26,7 +26,9 @@ export interface SFile {
     file: File,
-    resource: string
+    resource: string,
+    key: string
   ): Promise<Partial<SFile>>;
   public abstract createMany(
     files: File[],
-    resource: string
+    resource: string,
+    key: string,
   ): Promise<Partial<SFile>>;
@@ -33,0 +35,0 @@ public abstract deleteOne(id: number): Promise<void>;

src/services/RestFileService.ts

@@ -18,5 +18,14 @@ import Resizer from 'react-image-file-resizer';
 
-  private async optimizeImage(file: File, resource: string): Promise<Blob> {
+  private async optimizeImage(file: File, resource: string, keys: string): Promise<Blob> {
     if (this.settings.resources) {
-      const key = this.settings.resources[resource] ? resource : 'default';
+      let key = 'default';
+      if (this.settings.resources[resource]) {
+        key = resource
+      }
+      if (this.settings.resources[keys]) {
+        key = keys;
+      } 
+      if (this.settings.resources[`${resource}.${keys}`]) {
+        key = keys;
+      } 
       return new Promise((resolve, reject) => {
@@ -53,7 +62,8 @@ if (this.settings.resources && this.settings.resources[key]) {
     file: File,
-    resource: string
+    resource: string,
+    key: string
   ) {
     const formdata = new FormData();
     if (file.type.includes('image')) {
-      const blobImage = await this.optimizeImage(file, resource);
+      const blobImage = await this.optimizeImage(file, resource, key);
       formdata.append('file', blobImage);
@@ -76,3 +86,4 @@ } else {
     files: File[],
-    resource: string
+    resource: string,
+    key: string
   ) {
@@ -84,3 +95,3 @@ const formdata = new FormData();
         if (file.type.includes('image')) {
-          const blobImage = await this.optimizeImage(file, resource);
+          const blobImage = await this.optimizeImage(file, resource, key);
           formdata.append('files', blobImage);
@@ -87,0 +98,0 @@ } else {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

59402

increased by2.39%

Lines of code

1100

increased by3.29%

No dependency changes