cozy-search 2.2.19 → 2.2.20

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.
Files changed (6) hide show
  1. package/dist/components/CreateAssistantSteps/Provider.js +3 -1
  2. package/dist/components/CreateAssistantSteps/helpers.d.ts +2 -0
  3. package/dist/components/CreateAssistantSteps/helpers.js +31 -2
  4. package/dist/components/Views/CreateAssistantDialog.js +2 -1
  5. package/dist/components/Views/EditAssistantDialog.js +14 -10
  6. package/package.json +4 -4
package/dist/components/CreateAssistantSteps/Provider.js CHANGED
@@ -21,6 +21,8 @@ var _CozyTheme = require("cozy-ui-plus/dist/providers/CozyTheme");
21
21
 
22
22
  var _twakeI18n = require("twake-i18n");
23
23
 
24
+ var _helpers = require("./helpers");
25
+
24
26
  var styles = {
25
27
  "BasicInfoStep": "styles__BasicInfoStep___2r0eM",
26
28
  "avatar-container": "styles__avatar-container___kJ_64",
@@ -498,7 +500,7 @@ var Provider = function Provider(_ref) {
498
500
  }, /*#__PURE__*/_react.default.createElement(_Typography.default, {
499
501
  variant: "body1",
500
502
  className: "u-flex u-flex-justify-between u-flex-items-start"
501
- }, provider.id === 'custom' ? t(provider.name) : provider.name), /*#__PURE__*/_react.default.createElement(_Typography.default, {
503
+ }, (0, _helpers.getProviderName)(provider, t)), /*#__PURE__*/_react.default.createElement(_Typography.default, {
502
504
  variant: "body2",
503
505
  className: "u-mt-half u-c-text-secondary"
504
506
  }, t(provider.description))), isSelected && /*#__PURE__*/_react.default.createElement(_twakeIcons.Icon, {
package/dist/components/CreateAssistantSteps/helpers.d.ts CHANGED
@@ -1,2 +1,4 @@
1
1
  export function getSelectedProviderById(providerId: string): object;
2
+ export function getProviderName(provider: object, t: Function): string;
3
+ export function getProviderNameById(providerId: string, t: Function): string;
2
4
  export function checkIfModelUnsupported(provider: object, model: string): boolean;
package/dist/components/CreateAssistantSteps/helpers.js CHANGED
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.getSelectedProviderById = exports.checkIfModelUnsupported = void 0;
8
+ exports.getSelectedProviderById = exports.getProviderNameById = exports.getProviderName = exports.checkIfModelUnsupported = void 0;
9
9
 
10
10
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
11
 
@@ -66,6 +66,35 @@ var getSelectedProviderById = function getSelectedProviderById(providerId) {
66
66
  return provider.id === 'custom';
67
67
  }));
68
68
  };
69
+ /**
70
+ * Get the display name of a provider.
71
+ * The custom provider has no name of its own, only a translation key.
72
+ * @param {object} provider - The provider object.
73
+ * @param {Function} t - The translation function.
74
+ * @returns {string} The provider display name.
75
+ */
76
+
77
+
78
+ exports.getSelectedProviderById = getSelectedProviderById;
79
+
80
+ var getProviderName = function getProviderName(provider, t) {
81
+ return provider.id === 'custom' ? t(provider.name) : provider.name;
82
+ };
83
+ /**
84
+ * Get the display name of a provider from its ID, used to name its account.
85
+ * Resolves against providers.json rather than against a selected provider,
86
+ * whose name is overridden by the dialogs.
87
+ * @param {string} providerId - The ID of the provider.
88
+ * @param {Function} t - The translation function.
89
+ * @returns {string} The provider display name.
90
+ */
91
+
92
+
93
+ exports.getProviderName = getProviderName;
94
+
95
+ var getProviderNameById = function getProviderNameById(providerId, t) {
96
+ return getProviderName(getSelectedProviderById(providerId), t);
97
+ };
69
98
  /**
70
99
  * Check whether the given model is unsupported by the provider.
71
100
  * @param {object} provider - The provider object.
@@ -74,7 +103,7 @@ var getSelectedProviderById = function getSelectedProviderById(providerId) {
74
103
  */
75
104
 
76
105
 
77
- exports.getSelectedProviderById = getSelectedProviderById;
106
+ exports.getProviderNameById = getProviderNameById;
78
107
 
79
108
  var checkIfModelUnsupported = function checkIfModelUnsupported(provider, model) {
80
109
  var unsupportedModels = (provider === null || provider === void 0 ? void 0 : provider.unsupportedModels) || [];
package/dist/components/Views/CreateAssistantDialog.js CHANGED
@@ -131,7 +131,8 @@ var CreateAssistantDialog = function CreateAssistantDialog(_ref) {
131
131
  model: formData.model,
132
132
  apiKey: formData.apiKey,
133
133
  baseUrl: formData.baseUrl,
134
- providerId: selectedProvider.id
134
+ providerId: selectedProvider.id,
135
+ providerName: (0, _helpers.getProviderNameById)(selectedProvider.id, t)
135
136
  });
136
137
 
137
138
  case 2:
package/dist/components/Views/EditAssistantDialog.js CHANGED
@@ -116,9 +116,9 @@ var EditAssistantDialog = function EditAssistantDialog(_ref) {
116
116
 
117
117
  var fetchAssistant = /*#__PURE__*/function () {
118
118
  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
119
- var _assistant$relationsh, _assistant$relationsh2, _assistant$relationsh3, _assistant$relationsh4, _provider$auth, _provider$data, _provider$auth2, _provider$auth3, _provider$auth4, _provider$data2, _provider$auth5;
119
+ var _assistant$relationsh, _assistant$relationsh2, _assistant$relationsh3, _assistant$relationsh4, _provider$data, _provider$auth, _provider$data2, _provider$auth2, _provider$auth3, _provider$data3, _provider$auth4;
120
120
 
121
- var response, assistant, provider, providerId, selectProviderDefault;
121
+ var response, assistant, provider, providerId, model, selectProviderDefault;
122
122
  return _regenerator.default.wrap(function _callee$(_context) {
123
123
  while (1) {
124
124
  switch (_context.prev = _context.next) {
@@ -130,13 +130,16 @@ var EditAssistantDialog = function EditAssistantDialog(_ref) {
130
130
  response = _context.sent;
131
131
  assistant = response.data;
132
132
  provider = response.included[0];
133
- providerId = assistant === null || assistant === void 0 ? void 0 : (_assistant$relationsh = assistant.relationships) === null || _assistant$relationsh === void 0 ? void 0 : (_assistant$relationsh2 = _assistant$relationsh.provider) === null || _assistant$relationsh2 === void 0 ? void 0 : (_assistant$relationsh3 = _assistant$relationsh2.data) === null || _assistant$relationsh3 === void 0 ? void 0 : (_assistant$relationsh4 = _assistant$relationsh3.metadata) === null || _assistant$relationsh4 === void 0 ? void 0 : _assistant$relationsh4.providerId;
133
+ providerId = assistant === null || assistant === void 0 ? void 0 : (_assistant$relationsh = assistant.relationships) === null || _assistant$relationsh === void 0 ? void 0 : (_assistant$relationsh2 = _assistant$relationsh.provider) === null || _assistant$relationsh2 === void 0 ? void 0 : (_assistant$relationsh3 = _assistant$relationsh2.data) === null || _assistant$relationsh3 === void 0 ? void 0 : (_assistant$relationsh4 = _assistant$relationsh3.metadata) === null || _assistant$relationsh4 === void 0 ? void 0 : _assistant$relationsh4.providerId; // `auth.login` held the model before it moved to `data.model`: kept as a
134
+ // fallback for accounts that have not been rewritten yet.
135
+
136
+ model = (provider === null || provider === void 0 ? void 0 : (_provider$data = provider.data) === null || _provider$data === void 0 ? void 0 : _provider$data.model) || (provider === null || provider === void 0 ? void 0 : (_provider$auth = provider.auth) === null || _provider$auth === void 0 ? void 0 : _provider$auth.login);
134
137
  setFormData({
135
138
  name: assistant.name || '',
136
139
  description: assistant.prompt || '',
137
140
  icon: assistant.icon || '',
138
- model: (provider === null || provider === void 0 ? void 0 : (_provider$auth = provider.auth) === null || _provider$auth === void 0 ? void 0 : _provider$auth.login) || '',
139
- baseUrl: (provider === null || provider === void 0 ? void 0 : (_provider$data = provider.data) === null || _provider$data === void 0 ? void 0 : _provider$data.baseUrl) || '',
141
+ model: model || '',
142
+ baseUrl: (provider === null || provider === void 0 ? void 0 : (_provider$data2 = provider.data) === null || _provider$data2 === void 0 ? void 0 : _provider$data2.baseUrl) || '',
140
143
  apiKey: (provider === null || provider === void 0 ? void 0 : (_provider$auth2 = provider.auth) === null || _provider$auth2 === void 0 ? void 0 : _provider$auth2.apiKey) || '',
141
144
  encryptedApiKey: (provider === null || provider === void 0 ? void 0 : (_provider$auth3 = provider.auth) === null || _provider$auth3 === void 0 ? void 0 : _provider$auth3.credentials_encrypted) || '',
142
145
  providerId: providerId,
@@ -144,12 +147,12 @@ var EditAssistantDialog = function EditAssistantDialog(_ref) {
144
147
  });
145
148
  selectProviderDefault = (0, _helpers.getSelectedProviderById)(providerId);
146
149
  setSelectedProvider(_objectSpread(_objectSpread({}, selectProviderDefault), {}, {
147
- model: provider === null || provider === void 0 ? void 0 : (_provider$auth4 = provider.auth) === null || _provider$auth4 === void 0 ? void 0 : _provider$auth4.login,
148
- baseUrl: provider === null || provider === void 0 ? void 0 : (_provider$data2 = provider.data) === null || _provider$data2 === void 0 ? void 0 : _provider$data2.baseUrl,
149
- name: selectProviderDefault.id === 'custom' ? provider === null || provider === void 0 ? void 0 : (_provider$auth5 = provider.auth) === null || _provider$auth5 === void 0 ? void 0 : _provider$auth5.login : selectProviderDefault.name
150
+ model: model,
151
+ baseUrl: provider === null || provider === void 0 ? void 0 : (_provider$data3 = provider.data) === null || _provider$data3 === void 0 ? void 0 : _provider$data3.baseUrl,
152
+ name: selectProviderDefault.id === 'custom' ? (provider === null || provider === void 0 ? void 0 : (_provider$auth4 = provider.auth) === null || _provider$auth4 === void 0 ? void 0 : _provider$auth4.accountName) || model : selectProviderDefault.name
150
153
  }));
151
154
 
152
- case 9:
155
+ case 10:
153
156
  case "end":
154
157
  return _context.stop();
155
158
  }
@@ -187,7 +190,8 @@ var EditAssistantDialog = function EditAssistantDialog(_ref) {
187
190
  model: formData.model,
188
191
  apiKey: formData.apiKey,
189
192
  baseUrl: formData.baseUrl,
190
- providerId: selectedProvider.id
193
+ providerId: selectedProvider.id,
194
+ providerName: (0, _helpers.getProviderNameById)(selectedProvider.id, t)
191
195
  });
192
196
 
193
197
  case 2:
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cozy-search",
3
3
  "description": "UI components about search bar and IA assistant",
4
- "version": "2.2.19",
4
+ "version": "2.2.20",
5
5
  "author": {
6
6
  "name": "Cozy Cloud",
7
7
  "url": "https://github.com/cozy"
@@ -27,7 +27,7 @@
27
27
  "babel-plugin-module-resolver": "^4.0.0",
28
28
  "babel-plugin-tsconfig-paths": "^1.0.3",
29
29
  "babel-preset-cozy-app": "^2.8.4",
30
- "cozy-client": "60.26.0",
30
+ "cozy-client": "60.30.6",
31
31
  "cozy-device-helper": "^4.0.3",
32
32
  "cozy-flags": "^4.9.1",
33
33
  "cozy-intent": "^2.31.1",
@@ -63,7 +63,7 @@
63
63
  },
64
64
  "peerDependencies": {
65
65
  "@linagora/twake-icons": ">=2.6.6",
66
- "cozy-client": ">=60.26.0",
66
+ "cozy-client": ">=60.30.6",
67
67
  "cozy-device-helper": ">=3.7.1",
68
68
  "cozy-flags": ">=4.6.1",
69
69
  "cozy-intent": ">=2.26.0",
@@ -96,5 +96,5 @@
96
96
  "lint": "cd .. && yarn eslint --ext js,jsx,ts packages/cozy-search"
97
97
  },
98
98
  "types": "dist/index.d.ts",
99
- "gitHead": "9945afd53a9a030aa0a80b15380191db260d30c0"
99
+ "gitHead": "7294e89af6717116c64614562c24e9153db0494f"
100
100
  }