@webiny/api-file-manager 5.19.0 → 5.20.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager",
-	"version": "5.19.0",
+	"version": "5.20.0-beta.1",
 	"main": "index.js",
 	"keywords": [
 		"fm:base"
@@ -20,17 +20,17 @@
 	"dependencies": {
 		"@babel/runtime": "7.16.3",
 		"@commodo/fields": "1.1.2-beta.20",
-		"@webiny/api-i18n-content": "5.19.0",
-		"@webiny/api-security": "5.19.0",
-		"@webiny/api-tenancy": "5.19.0",
-		"@webiny/api-upgrade": "5.19.0",
-		"@webiny/error": "5.19.0",
-		"@webiny/handler": "5.19.0",
-		"@webiny/handler-client": "5.19.0",
-		"@webiny/handler-graphql": "5.19.0",
-		"@webiny/plugins": "5.19.0",
-		"@webiny/project-utils": "5.19.0",
-		"@webiny/validation": "5.19.0",
+		"@webiny/api-i18n-content": "5.20.0-beta.1",
+		"@webiny/api-security": "5.20.0-beta.1",
+		"@webiny/api-tenancy": "5.20.0-beta.1",
+		"@webiny/api-upgrade": "5.20.0-beta.1",
+		"@webiny/error": "5.20.0-beta.1",
+		"@webiny/handler": "5.20.0-beta.1",
+		"@webiny/handler-client": "5.20.0-beta.1",
+		"@webiny/handler-graphql": "5.20.0-beta.1",
+		"@webiny/plugins": "5.20.0-beta.1",
+		"@webiny/project-utils": "5.20.0-beta.1",
+		"@webiny/validation": "5.20.0-beta.1",
 		"aws-sdk": "2.1032.0",
 		"commodo-fields-object": "1.0.6",
 		"mdbid": "1.0.0",
@@ -44,9 +44,9 @@
 		"@babel/plugin-transform-runtime": "^7.5.5",
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-typescript": "^7.0.0",
-		"@webiny/api-i18n": "^5.19.0",
-		"@webiny/api-i18n-ddb": "^5.19.0",
-		"@webiny/cli": "^5.19.0",
+		"@webiny/api-i18n": "^5.20.0-beta.1",
+		"@webiny/api-i18n-ddb": "^5.20.0-beta.1",
+		"@webiny/cli": "^5.20.0-beta.1",
 		"jest": "^26.6.3",
 		"rimraf": "^3.0.2",
 		"ttypescript": "^1.5.12",
@@ -71,5 +71,5 @@
 			]
 		}
 	},
-	"gitHead": "9cb14e343f881e70ce71967ff525b52f385b64d3"
+	"gitHead": "40e30fb4c778d0bcc773b3b8231ce8e0861b6d52"
 }

package/plugins/crud/files.crud.js

@@ -107,6 +107,7 @@ const filesContextCrudPlugin = new _ContextPlugin.ContextPlugin(async context =>
       const id = (0, _mdbid.default)();
 
       const file = _objectSpread(_objectSpread({}, input), {}, {
+        tags: Array.isArray(input.tags) ? input.tags : [],
         id,
         meta: _objectSpread({
           private: false
@@ -164,6 +165,7 @@ const filesContextCrudPlugin = new _ContextPlugin.ContextPlugin(async context =>
       checkOwnership(original, permission, context);
 
       const file = _objectSpread(_objectSpread(_objectSpread({}, original), input), {}, {
+        tags: Array.isArray(input.tags) ? input.tags : Array.isArray(original.tags) ? original.tags : [],
         id: original.id,
         webinyVersion: context.WEBINY_VERSION
       });
@@ -262,6 +264,7 @@ const filesContextCrudPlugin = new _ContextPlugin.ContextPlugin(async context =>
       };
       const files = inputs.map(input => {
         return _objectSpread(_objectSpread({}, input), {}, {
+          tags: Array.isArray(input.tags) ? input.tags : [],
           meta: _objectSpread({
             private: false
           }, input.meta || {}),
@@ -314,7 +317,7 @@ const filesContextCrudPlugin = new _ContextPlugin.ContextPlugin(async context =>
 
       const where = _objectSpread(_objectSpread({}, initialWhere), {}, {
         private: false,
-        locale: context.i18nContent.getLocale().code,
+        locale: context.i18nContent.getCurrentLocale().code,
         tenant: context.tenancy.getCurrentTenant().id
       });
       /**
@@ -403,15 +406,16 @@ const filesContextCrudPlugin = new _ContextPlugin.ContextPlugin(async context =>
       };
 
       try {
-        /**
-         * There is a meta object on the second key.
-         * TODO: use when changing GraphQL output of the tags.
-         */
         const [tags] = await storageOperations.tags(params);
+
+        if (Array.isArray(tags) === false) {
+          return [];
+        }
         /**
          * just to keep it standardized, sort by the tag ASC
          */
 
+
         return tags.sort();
       } catch (ex) {
         throw new _error.default(ex.message || "Could not search for tags.", ex.code || "FILE_TAG_SEARCH_ERROR", _objectSpread(_objectSpread({}, ex.data || {}), {}, {

package/plugins/crud/system.crud.js

@@ -45,6 +45,10 @@ const systemCrudContextPlugin = new _ContextPlugin.ContextPlugin(async context =
     context.fileManager = {};
   }
 
+  const getTenantId = () => {
+    return context.tenancy.getCurrentTenant().id;
+  };
+
   context.fileManager.system = {
     async getVersion() {
       const system = await storageOperations.get();
@@ -56,6 +60,7 @@ const systemCrudContextPlugin = new _ContextPlugin.ContextPlugin(async context =
 
       if (system) {
         const data = _objectSpread(_objectSpread({}, system), {}, {
+          tenant: system.tenant || getTenantId(),
           version
         });
 
@@ -73,7 +78,8 @@ const systemCrudContextPlugin = new _ContextPlugin.ContextPlugin(async context =
       }
 
       const data = {
-        version
+        version,
+        tenant: getTenantId()
       };
 
       try {

package/plugins/graphql.js

@@ -217,7 +217,7 @@ const plugin = {
             fileManager
           } = context;
 
-          if (!tenancy.getCurrentTenant() || !i18nContent.getLocale()) {
+          if (!tenancy.getCurrentTenant() || !i18nContent.getCurrentLocale()) {
             return null;
           }
 

package/types.d.ts

@@ -109,6 +109,7 @@ export interface FileManagerSettings {
 }
 export interface FileManagerSystem {
     version: string;
+    tenant: string;
 }
 export declare type SettingsCRUD = {
     getSettings(): Promise<FileManagerSettings>;