@webiny/api-file-manager 5.19.1 → 5.20.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/api-file-manager",
3
- "version": "5.19.1",
3
+ "version": "5.20.0-beta.0",
4
4
  "main": "index.js",
5
5
  "keywords": [
6
6
  "fm:base"
@@ -20,17 +20,17 @@
20
20
  "dependencies": {
21
21
  "@babel/runtime": "7.16.3",
22
22
  "@commodo/fields": "1.1.2-beta.20",
23
- "@webiny/api-i18n-content": "5.19.1",
24
- "@webiny/api-security": "5.19.1",
25
- "@webiny/api-tenancy": "5.19.1",
26
- "@webiny/api-upgrade": "5.19.1",
27
- "@webiny/error": "5.19.1",
28
- "@webiny/handler": "5.19.1",
29
- "@webiny/handler-client": "5.19.1",
30
- "@webiny/handler-graphql": "5.19.1",
31
- "@webiny/plugins": "5.19.1",
32
- "@webiny/project-utils": "5.19.1",
33
- "@webiny/validation": "5.19.1",
23
+ "@webiny/api-i18n-content": "5.20.0-beta.0",
24
+ "@webiny/api-security": "5.20.0-beta.0",
25
+ "@webiny/api-tenancy": "5.20.0-beta.0",
26
+ "@webiny/api-upgrade": "5.20.0-beta.0",
27
+ "@webiny/error": "5.20.0-beta.0",
28
+ "@webiny/handler": "5.20.0-beta.0",
29
+ "@webiny/handler-client": "5.20.0-beta.0",
30
+ "@webiny/handler-graphql": "5.20.0-beta.0",
31
+ "@webiny/plugins": "5.20.0-beta.0",
32
+ "@webiny/project-utils": "5.20.0-beta.0",
33
+ "@webiny/validation": "5.20.0-beta.0",
34
34
  "aws-sdk": "2.1032.0",
35
35
  "commodo-fields-object": "1.0.6",
36
36
  "mdbid": "1.0.0",
@@ -44,9 +44,9 @@
44
44
  "@babel/plugin-transform-runtime": "^7.5.5",
45
45
  "@babel/preset-env": "^7.5.5",
46
46
  "@babel/preset-typescript": "^7.0.0",
47
- "@webiny/api-i18n": "^5.19.1",
48
- "@webiny/api-i18n-ddb": "^5.19.1",
49
- "@webiny/cli": "^5.19.1",
47
+ "@webiny/api-i18n": "^5.20.0-beta.0",
48
+ "@webiny/api-i18n-ddb": "^5.20.0-beta.0",
49
+ "@webiny/cli": "^5.20.0-beta.0",
50
50
  "jest": "^26.6.3",
51
51
  "rimraf": "^3.0.2",
52
52
  "ttypescript": "^1.5.12",
@@ -71,5 +71,5 @@
71
71
  ]
72
72
  }
73
73
  },
74
- "gitHead": "1424145d10add470e70fba9c44225656894e0028"
74
+ "gitHead": "2de02bc113e15e3ffa8e1d82deb9d27417787188"
75
75
  }
@@ -317,7 +317,7 @@ const filesContextCrudPlugin = new _ContextPlugin.ContextPlugin(async context =>
317
317
 
318
318
  const where = _objectSpread(_objectSpread({}, initialWhere), {}, {
319
319
  private: false,
320
- locale: context.i18nContent.getLocale().code,
320
+ locale: context.i18nContent.getCurrentLocale().code,
321
321
  tenant: context.tenancy.getCurrentTenant().id
322
322
  });
323
323
  /**
@@ -406,10 +406,6 @@ const filesContextCrudPlugin = new _ContextPlugin.ContextPlugin(async context =>
406
406
  };
407
407
 
408
408
  try {
409
- /**
410
- * There is a meta object on the second key.
411
- * TODO: use when changing GraphQL output of the tags.
412
- */
413
409
  const [tags] = await storageOperations.tags(params);
414
410
 
415
411
  if (Array.isArray(tags) === false) {
@@ -45,6 +45,10 @@ const systemCrudContextPlugin = new _ContextPlugin.ContextPlugin(async context =
45
45
  context.fileManager = {};
46
46
  }
47
47
 
48
+ const getTenantId = () => {
49
+ return context.tenancy.getCurrentTenant().id;
50
+ };
51
+
48
52
  context.fileManager.system = {
49
53
  async getVersion() {
50
54
  const system = await storageOperations.get();
@@ -56,6 +60,7 @@ const systemCrudContextPlugin = new _ContextPlugin.ContextPlugin(async context =
56
60
 
57
61
  if (system) {
58
62
  const data = _objectSpread(_objectSpread({}, system), {}, {
63
+ tenant: system.tenant || getTenantId(),
59
64
  version
60
65
  });
61
66
 
@@ -73,7 +78,8 @@ const systemCrudContextPlugin = new _ContextPlugin.ContextPlugin(async context =
73
78
  }
74
79
 
75
80
  const data = {
76
- version
81
+ version,
82
+ tenant: getTenantId()
77
83
  };
78
84
 
79
85
  try {
@@ -217,7 +217,7 @@ const plugin = {
217
217
  fileManager
218
218
  } = context;
219
219
 
220
- if (!tenancy.getCurrentTenant() || !i18nContent.getLocale()) {
220
+ if (!tenancy.getCurrentTenant() || !i18nContent.getCurrentLocale()) {
221
221
  return null;
222
222
  }
223
223
 
package/types.d.ts CHANGED
@@ -109,6 +109,7 @@ export interface FileManagerSettings {
109
109
  }
110
110
  export interface FileManagerSystem {
111
111
  version: string;
112
+ tenant: string;
112
113
  }
113
114
  export declare type SettingsCRUD = {
114
115
  getSettings(): Promise<FileManagerSettings>;