@atlaskit/teams-client 4.9.0 → 4.9.1

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/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/teams-client
2
2
 
3
+ ## 4.9.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#193849](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/193849)
8
+ [`4a8c4dffd99ef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4a8c4dffd99ef) -
9
+ Fix the context setting issue in the query setting query
10
+
3
11
  ## 4.9.0
4
12
 
5
13
  ### Minor Changes
@@ -52,7 +52,7 @@ var TeamsUFOExperience = exports.TeamsUFOExperience = /*#__PURE__*/function (_UF
52
52
  return _superPropGet(TeamsUFOExperience, "failure", this, 3)([{
53
53
  metadata: {
54
54
  error: (0, _utils.createErrorMetadata)(error),
55
- packageVersion: "4.8.2",
55
+ packageVersion: "4.9.0",
56
56
  packageName: "@atlaskit/teams-client"
57
57
  }
58
58
  }]);
@@ -60,7 +60,7 @@ var TeamsUFOExperience = exports.TeamsUFOExperience = /*#__PURE__*/function (_UF
60
60
  return _superPropGet(TeamsUFOExperience, "failure", this, 3)([{
61
61
  metadata: {
62
62
  error: 'unknown error',
63
- packageVersion: "4.8.2",
63
+ packageVersion: "4.9.0",
64
64
  packageName: "@atlaskit/teams-client"
65
65
  }
66
66
  }]);
@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
10
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
12
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
13
14
  var _constants = require("../common/utils/ufo/constants");
14
15
  var _aggClient = require("./agg-client");
15
16
  var _collaborationgraphClient = _interopRequireDefault(require("./collaborationgraph-client"));
@@ -25,6 +26,8 @@ var _replinesClient = _interopRequireDefault(require("./replines-client"));
25
26
  var _teamCentralClient = _interopRequireDefault(require("./team-central-client"));
26
27
  var _teamsInSlackClient = _interopRequireDefault(require("./teams-in-slack-client"));
27
28
  var _userPreferencesClient = _interopRequireDefault(require("./user-preferences-client"));
29
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
30
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
28
31
  /**
29
32
  * This solves error TS1055:
30
33
  * Type 'ReturnType' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value
@@ -151,13 +154,21 @@ var TeamsClient = exports.TeamsClient = /*#__PURE__*/function () {
151
154
  value: (function () {
152
155
  var _querySettings = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(cloudId, product) {
153
156
  var _this = this;
157
+ var previousContext;
154
158
  return _regenerator.default.wrap(function _callee3$(_context3) {
155
159
  while (1) switch (_context3.prev = _context3.next) {
156
160
  case 0:
157
161
  if (cloudId) {
158
- this.setContext({
159
- cloudId: cloudId
160
- });
162
+ if ((0, _platformFeatureFlags.fg)('fix_query_settings_context')) {
163
+ previousContext = this._legionClient.getContext();
164
+ this.setContext(_objectSpread(_objectSpread({}, previousContext), {}, {
165
+ cloudId: cloudId
166
+ }));
167
+ } else {
168
+ this.setContext({
169
+ cloudId: cloudId
170
+ });
171
+ }
161
172
  }
162
173
  return _context3.abrupt("return", this.measurePerformance('querySettings', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
163
174
  var response;
@@ -36,7 +36,7 @@ function getSentryConfig(options) {
36
36
  return _objectSpread(_objectSpread(_objectSpread({}, otherOptions), DEFAULT_SENTRY_CONFIG), {}, {
37
37
  // Standalone __VERSION__ is set from `bin/set-release-version.sh`
38
38
  // when building to deploy to production
39
- release: "".concat("@atlaskit/teams-client", "@").concat("4.8.2") ||
39
+ release: "".concat("@atlaskit/teams-client", "@").concat("4.9.0") ||
40
40
  // @ts-ignore Jira - window.BUILD_KEY
41
41
  window.BUILD_KEY || ( // @ts-ignore Confluence - window.__buildInfo
42
42
  (_window$__buildInfo = window.__buildInfo) === null || _window$__buildInfo === void 0 ? void 0 : _window$__buildInfo.FRONTEND_VERSION) || '---',
@@ -27,7 +27,7 @@ export class TeamsUFOExperience extends UFOExperience {
27
27
  return super.failure({
28
28
  metadata: {
29
29
  error: createErrorMetadata(error),
30
- packageVersion: "4.8.2",
30
+ packageVersion: "4.9.0",
31
31
  packageName: "@atlaskit/teams-client"
32
32
  }
33
33
  });
@@ -35,7 +35,7 @@ export class TeamsUFOExperience extends UFOExperience {
35
35
  return super.failure({
36
36
  metadata: {
37
37
  error: 'unknown error',
38
- packageVersion: "4.8.2",
38
+ packageVersion: "4.9.0",
39
39
  packageName: "@atlaskit/teams-client"
40
40
  }
41
41
  });
@@ -1,4 +1,5 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import { TEAMS_CLIENT_EXPERIENCES } from '../common/utils/ufo/constants';
3
4
  import { aggClient } from './agg-client';
4
5
  import collaborationGraphClient from './collaborationgraph-client';
@@ -107,9 +108,17 @@ export class TeamsClient {
107
108
  */
108
109
  async querySettings(cloudId, product) {
109
110
  if (cloudId) {
110
- this.setContext({
111
- cloudId
112
- });
111
+ if (fg('fix_query_settings_context')) {
112
+ const previousContext = this._legionClient.getContext();
113
+ this.setContext({
114
+ ...previousContext,
115
+ cloudId
116
+ });
117
+ } else {
118
+ this.setContext({
119
+ cloudId
120
+ });
121
+ }
113
122
  }
114
123
  return this.measurePerformance('querySettings', async () => {
115
124
  if (!product) {
@@ -28,7 +28,7 @@ export function getSentryConfig(options) {
28
28
  ...DEFAULT_SENTRY_CONFIG,
29
29
  // Standalone __VERSION__ is set from `bin/set-release-version.sh`
30
30
  // when building to deploy to production
31
- release: `${"@atlaskit/teams-client"}@${"4.8.2"}` ||
31
+ release: `${"@atlaskit/teams-client"}@${"4.9.0"}` ||
32
32
  // @ts-ignore Jira - window.BUILD_KEY
33
33
  window.BUILD_KEY || ( // @ts-ignore Confluence - window.__buildInfo
34
34
  (_window$__buildInfo = window.__buildInfo) === null || _window$__buildInfo === void 0 ? void 0 : _window$__buildInfo.FRONTEND_VERSION) || '---',
@@ -45,7 +45,7 @@ export var TeamsUFOExperience = /*#__PURE__*/function (_UFOExperience) {
45
45
  return _superPropGet(TeamsUFOExperience, "failure", this, 3)([{
46
46
  metadata: {
47
47
  error: createErrorMetadata(error),
48
- packageVersion: "4.8.2",
48
+ packageVersion: "4.9.0",
49
49
  packageName: "@atlaskit/teams-client"
50
50
  }
51
51
  }]);
@@ -53,7 +53,7 @@ export var TeamsUFOExperience = /*#__PURE__*/function (_UFOExperience) {
53
53
  return _superPropGet(TeamsUFOExperience, "failure", this, 3)([{
54
54
  metadata: {
55
55
  error: 'unknown error',
56
- packageVersion: "4.8.2",
56
+ packageVersion: "4.9.0",
57
57
  packageName: "@atlaskit/teams-client"
58
58
  }
59
59
  }]);
@@ -2,7 +2,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
2
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
3
  import _createClass from "@babel/runtime/helpers/createClass";
4
4
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
6
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
7
  import _regeneratorRuntime from "@babel/runtime/regenerator";
8
+ import { fg } from '@atlaskit/platform-feature-flags';
6
9
  import { TEAMS_CLIENT_EXPERIENCES } from '../common/utils/ufo/constants';
7
10
  import { aggClient } from './agg-client';
8
11
  import collaborationGraphClient from './collaborationgraph-client';
@@ -146,13 +149,21 @@ export var TeamsClient = /*#__PURE__*/function () {
146
149
  value: (function () {
147
150
  var _querySettings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(cloudId, product) {
148
151
  var _this = this;
152
+ var previousContext;
149
153
  return _regeneratorRuntime.wrap(function _callee3$(_context3) {
150
154
  while (1) switch (_context3.prev = _context3.next) {
151
155
  case 0:
152
156
  if (cloudId) {
153
- this.setContext({
154
- cloudId: cloudId
155
- });
157
+ if (fg('fix_query_settings_context')) {
158
+ previousContext = this._legionClient.getContext();
159
+ this.setContext(_objectSpread(_objectSpread({}, previousContext), {}, {
160
+ cloudId: cloudId
161
+ }));
162
+ } else {
163
+ this.setContext({
164
+ cloudId: cloudId
165
+ });
166
+ }
156
167
  }
157
168
  return _context3.abrupt("return", this.measurePerformance('querySettings', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
158
169
  var response;
@@ -29,7 +29,7 @@ export function getSentryConfig(options) {
29
29
  return _objectSpread(_objectSpread(_objectSpread({}, otherOptions), DEFAULT_SENTRY_CONFIG), {}, {
30
30
  // Standalone __VERSION__ is set from `bin/set-release-version.sh`
31
31
  // when building to deploy to production
32
- release: "".concat("@atlaskit/teams-client", "@").concat("4.8.2") ||
32
+ release: "".concat("@atlaskit/teams-client", "@").concat("4.9.0") ||
33
33
  // @ts-ignore Jira - window.BUILD_KEY
34
34
  window.BUILD_KEY || ( // @ts-ignore Confluence - window.__buildInfo
35
35
  (_window$__buildInfo = window.__buildInfo) === null || _window$__buildInfo === void 0 ? void 0 : _window$__buildInfo.FRONTEND_VERSION) || '---',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/teams-client",
3
- "version": "4.9.0",
3
+ "version": "4.9.1",
4
4
  "description": "A client to retrieve team related data",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -107,6 +107,9 @@
107
107
  "platform-feature-flags": {
108
108
  "enable_edit_team_name_external_type_teams": {
109
109
  "type": "boolean"
110
+ },
111
+ "fix_query_settings_context": {
112
+ "type": "boolean"
110
113
  }
111
114
  }
112
115
  }