@equinor/fusion-framework-react-components-people-provider 1.5.10 → 1.5.11
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 +11 -0
- package/dist/esm/PersonController.js +25 -37
- package/dist/esm/PersonController.js.map +1 -1
- package/dist/esm/create-resolver.js +10 -3
- package/dist/esm/create-resolver.js.map +1 -1
- package/dist/esm/makeResolver.js +3 -12
- package/dist/esm/makeResolver.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +7 -7
- package/src/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
# @equinor/fusion-framework-react-components-people-provider
|
|
2
2
|
|
|
3
|
+
## 1.5.11
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2973](https://github.com/equinor/fusion-framework/pull/2973) [`cb1d8d7`](https://github.com/equinor/fusion-framework/commit/cb1d8d70711f6965b2b7567ea687d69f22e4a471) Thanks [@odinr](https://github.com/odinr)! - update @equinor/fusion-wc-person dependency to version 3.1.8
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`134863f`](https://github.com/equinor/fusion-framework/commit/134863fa96bcd5f799bc621f755b1605d0c1255c)]:
|
|
10
|
+
- @equinor/fusion-framework-module-services@5.1.3
|
|
11
|
+
- @equinor/fusion-query@5.2.4
|
|
12
|
+
- @equinor/fusion-framework-react@7.4.6
|
|
13
|
+
|
|
3
14
|
## 1.5.10
|
|
4
15
|
|
|
5
16
|
### Patch Changes
|
|
@@ -1,42 +1,29 @@
|
|
|
1
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
2
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
3
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
4
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
5
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
6
|
-
};
|
|
7
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
8
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
9
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
|
-
};
|
|
12
|
-
var _PersonController_personQuery, _PersonController_personSearchQuery, _PersonController_personPhotoQuery;
|
|
13
1
|
import { EMPTY, concat, from, fromEvent, of } from 'rxjs';
|
|
14
2
|
import { catchError, filter, find, map, switchMap, take, takeUntil } from 'rxjs/operators';
|
|
15
3
|
import { isApiPerson } from '@equinor/fusion-framework-module-services/people/utils';
|
|
16
4
|
import { Query } from '@equinor/fusion-query';
|
|
17
5
|
import { queryValue } from '@equinor/fusion-query/operators';
|
|
18
6
|
const personMatcher = (args) => (value) => {
|
|
19
|
-
var _a, _b;
|
|
20
7
|
const { azureId, upn } = args;
|
|
21
8
|
if (azureId && upn) {
|
|
22
|
-
return (
|
|
9
|
+
return (value.upn?.toLocaleLowerCase() === upn.toLocaleLowerCase() &&
|
|
23
10
|
value.azureUniqueId === azureId);
|
|
24
11
|
}
|
|
25
12
|
else if (azureId) {
|
|
26
13
|
return value.azureUniqueId === azureId;
|
|
27
14
|
}
|
|
28
15
|
else if (upn) {
|
|
29
|
-
return
|
|
16
|
+
return value.upn?.toLocaleLowerCase() === upn.toLocaleLowerCase();
|
|
30
17
|
}
|
|
31
18
|
return false;
|
|
32
19
|
};
|
|
33
20
|
export class PersonController {
|
|
21
|
+
#personQuery;
|
|
22
|
+
#personSearchQuery;
|
|
23
|
+
#personPhotoQuery;
|
|
34
24
|
constructor(client, options) {
|
|
35
|
-
_PersonController_personQuery.set(this, void 0);
|
|
36
|
-
_PersonController_personSearchQuery.set(this, void 0);
|
|
37
|
-
_PersonController_personPhotoQuery.set(this, void 0);
|
|
38
25
|
const expire = 3 * 60 * 1000;
|
|
39
|
-
|
|
26
|
+
this.#personQuery = new Query({
|
|
40
27
|
expire,
|
|
41
28
|
queueOperator: 'merge',
|
|
42
29
|
key: ({ azureId }) => azureId,
|
|
@@ -46,12 +33,15 @@ export class PersonController {
|
|
|
46
33
|
.get('v4', 'json$', { azureId, expand: ['manager', 'positions'] }, { signal })
|
|
47
34
|
.pipe(map((result) => {
|
|
48
35
|
const { positions = [] } = result;
|
|
49
|
-
return
|
|
36
|
+
return {
|
|
37
|
+
...result,
|
|
38
|
+
positions: positions.filter((x) => new Date(x.appliesTo) > new Date()),
|
|
39
|
+
};
|
|
50
40
|
}));
|
|
51
41
|
},
|
|
52
42
|
},
|
|
53
|
-
})
|
|
54
|
-
|
|
43
|
+
});
|
|
44
|
+
this.#personSearchQuery = new Query({
|
|
55
45
|
expire,
|
|
56
46
|
queueOperator: 'merge',
|
|
57
47
|
key: ({ search }) => search,
|
|
@@ -60,8 +50,8 @@ export class PersonController {
|
|
|
60
50
|
return client.query('v2', 'json$', { search }, { signal });
|
|
61
51
|
},
|
|
62
52
|
},
|
|
63
|
-
})
|
|
64
|
-
|
|
53
|
+
});
|
|
54
|
+
this.#personPhotoQuery = new Query({
|
|
65
55
|
expire,
|
|
66
56
|
queueOperator: 'merge',
|
|
67
57
|
key: ({ azureId }) => azureId,
|
|
@@ -70,21 +60,20 @@ export class PersonController {
|
|
|
70
60
|
return client.photo('v2', 'blob$', { azureId }, { signal }).pipe(map((result) => {
|
|
71
61
|
return result.blob;
|
|
72
62
|
}), catchError((err) => {
|
|
73
|
-
var _a;
|
|
74
63
|
if (err.name === 'ApiProviderError' &&
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
return of(options
|
|
64
|
+
err.response?.status === 404 &&
|
|
65
|
+
options?.fallbackImage) {
|
|
66
|
+
return of(options?.fallbackImage);
|
|
78
67
|
}
|
|
79
68
|
throw err;
|
|
80
69
|
}));
|
|
81
70
|
},
|
|
82
71
|
},
|
|
83
|
-
})
|
|
72
|
+
});
|
|
84
73
|
}
|
|
85
74
|
search(args) {
|
|
86
75
|
const { search, signal } = args;
|
|
87
|
-
return
|
|
76
|
+
return this.#personSearchQuery.query({ search }, { signal }).pipe(queryValue);
|
|
88
77
|
}
|
|
89
78
|
/** TODO why does this need to have data?!? */
|
|
90
79
|
getPhoto(args) {
|
|
@@ -126,7 +115,7 @@ export class PersonController {
|
|
|
126
115
|
filter(isApiPerson('v4')), takeUntil(abort$));
|
|
127
116
|
}
|
|
128
117
|
_getPersonByAzureId(azureId, signal) {
|
|
129
|
-
return
|
|
118
|
+
return this.#personQuery.query({ azureId }, { signal }).pipe(queryValue);
|
|
130
119
|
}
|
|
131
120
|
_getPersonInfoById(azureId, signal) {
|
|
132
121
|
const abort$ = signal ? fromEvent(signal, 'abort') : EMPTY;
|
|
@@ -139,7 +128,7 @@ export class PersonController {
|
|
|
139
128
|
_getPersonInfoByUpn(upn, signal) {
|
|
140
129
|
const matcher = personMatcher({ upn });
|
|
141
130
|
const abort$ = signal ? fromEvent(signal, 'abort') : EMPTY;
|
|
142
|
-
return concat(this._personCache$({ upn }), this._queryCache$({ upn }),
|
|
131
|
+
return concat(this._personCache$({ upn }), this._queryCache$({ upn }), this.#personSearchQuery.query({ search: upn }, { signal }).pipe(
|
|
143
132
|
/** extract first match, should only be 0 or 1 */
|
|
144
133
|
map((x) => x.value.find(matcher)),
|
|
145
134
|
/** type cast and end stream */
|
|
@@ -148,7 +137,7 @@ export class PersonController {
|
|
|
148
137
|
find(isApiPerson('v2')), filter(isApiPerson('v2')), filter(isApiPerson('v2')), takeUntil(abort$));
|
|
149
138
|
}
|
|
150
139
|
_getPersonPhotoByAzureId(azureId, signal) {
|
|
151
|
-
return
|
|
140
|
+
return this.#personPhotoQuery.query({ azureId }, { signal }).pipe(
|
|
152
141
|
/** */
|
|
153
142
|
take(1), map((result) => URL.createObjectURL(result.value)));
|
|
154
143
|
}
|
|
@@ -159,15 +148,15 @@ export class PersonController {
|
|
|
159
148
|
}
|
|
160
149
|
_personCache$(args) {
|
|
161
150
|
const mather = personMatcher(args);
|
|
162
|
-
return
|
|
151
|
+
return this.#personQuery.cache.state$.pipe(
|
|
163
152
|
/** make subscription cold */
|
|
164
153
|
take(1),
|
|
165
154
|
/** map out cached ApiPerson_v2 which matches upn */
|
|
166
|
-
map((x) =>
|
|
155
|
+
map((x) => Object.values(x).find((x) => mather(x.value))?.value), find(isApiPerson('v4')), filter(isApiPerson('v4')));
|
|
167
156
|
}
|
|
168
157
|
_queryCache$(args) {
|
|
169
158
|
const mather = personMatcher(args);
|
|
170
|
-
return
|
|
159
|
+
return this.#personSearchQuery.cache.state$.pipe(
|
|
171
160
|
/** make subscription cold */
|
|
172
161
|
take(1), switchMap((entry) => {
|
|
173
162
|
/** expand cache records */
|
|
@@ -179,5 +168,4 @@ export class PersonController {
|
|
|
179
168
|
}), find(isApiPerson('v2')), filter(isApiPerson('v2')));
|
|
180
169
|
}
|
|
181
170
|
}
|
|
182
|
-
_PersonController_personQuery = new WeakMap(), _PersonController_personSearchQuery = new WeakMap(), _PersonController_personPhotoQuery = new WeakMap();
|
|
183
171
|
//# sourceMappingURL=PersonController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersonController.js","sourceRoot":"","sources":["../../src/PersonController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PersonController.js","sourceRoot":"","sources":["../../src/PersonController.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,18 +3,25 @@ export const createResolver = (controller) => ({
|
|
|
3
3
|
getDetails(args) {
|
|
4
4
|
return firstValueFrom(controller.getPerson(args).pipe(
|
|
5
5
|
/** TODO */
|
|
6
|
-
map((x) => (
|
|
6
|
+
map((x) => ({ ...x, azureId: x.azureUniqueId }))));
|
|
7
7
|
},
|
|
8
8
|
getInfo(args) {
|
|
9
9
|
return firstValueFrom(controller.getPersonInfo(args).pipe(
|
|
10
10
|
/** TODO */
|
|
11
|
-
map((x) => (
|
|
11
|
+
map((x) => ({ ...x, azureId: x.azureUniqueId }))));
|
|
12
12
|
},
|
|
13
13
|
getPhoto(args) {
|
|
14
14
|
return firstValueFrom(controller.getPhoto(args));
|
|
15
15
|
},
|
|
16
16
|
search(args) {
|
|
17
|
-
return firstValueFrom(controller.search(args).pipe(map((x) => x.map((x) => (
|
|
17
|
+
return firstValueFrom(controller.search(args).pipe(map((x) => x.map((x) => ({
|
|
18
|
+
...x,
|
|
19
|
+
azureId: x.azureUniqueId,
|
|
20
|
+
// TODO
|
|
21
|
+
// @asbjornhaland
|
|
22
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
23
|
+
// @ts-ignore https://github.com/equinor/fusion-web-components/issues/804
|
|
24
|
+
})))));
|
|
18
25
|
},
|
|
19
26
|
});
|
|
20
27
|
export default createResolver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-resolver.js","sourceRoot":"","sources":["../../src/create-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAK3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,UAA6B,EAAkB,EAAE,CAAC,CAAC;IAChF,UAAU,CAAC,IAAI;QACb,OAAO,cAAc,CACnB,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI;QAC7B,WAAW;QACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"create-resolver.js","sourceRoot":"","sources":["../../src/create-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAK3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,UAA6B,EAAkB,EAAE,CAAC,CAAC;IAChF,UAAU,CAAC,IAAI;QACb,OAAO,cAAc,CACnB,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI;QAC7B,WAAW;QACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,aAAa,EAAE,CAA6B,CAAC,CAC7E,CACF,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,IAAI;QACV,OAAO,cAAc,CACnB,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI;QACjC,WAAW;QACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,aAAa,EAAE,CAA0B,CAAC,CAC1E,CACF,CAAC;IACJ,CAAC;IACD,QAAQ,CAAC,IAAI;QACX,OAAO,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,CAAC,IAAI;QACT,OAAO,cAAc,CACnB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACR,CAAC,CAAC,GAAG,CACH,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC;YACC,GAAG,CAAC;YACJ,OAAO,EAAE,CAAC,CAAC,aAAa;YACxB,OAAO;YACP,iBAAiB;YACjB,6DAA6D;YAC7D,yEAAyE;SAC1E,CAA0B,CAC9B,CACF,CACF,CACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,eAAe,cAAc,CAAC"}
|
package/dist/esm/makeResolver.js
CHANGED
|
@@ -1,26 +1,17 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
11
2
|
import { lazy } from 'react';
|
|
12
3
|
import { PeopleResolverComponent } from './PeopleResolver';
|
|
13
4
|
import { PersonController } from './PersonController';
|
|
14
5
|
import { createResolver } from './create-resolver';
|
|
15
6
|
export const makeResolver = (services, options) => {
|
|
16
|
-
return lazy(() =>
|
|
17
|
-
const client =
|
|
7
|
+
return lazy(async () => {
|
|
8
|
+
const client = await services.createPeopleClient();
|
|
18
9
|
const controller = new PersonController(client, options);
|
|
19
10
|
const resolver = createResolver(controller);
|
|
20
11
|
const Component = ({ children }) => (_jsx(PeopleResolverComponent, { resolver: resolver, children: children }));
|
|
21
12
|
return {
|
|
22
13
|
default: Component,
|
|
23
14
|
};
|
|
24
|
-
})
|
|
15
|
+
});
|
|
25
16
|
};
|
|
26
17
|
//# sourceMappingURL=makeResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeResolver.js","sourceRoot":"","sources":["../../src/makeResolver.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"makeResolver.js","sourceRoot":"","sources":["../../src/makeResolver.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAgC,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAsB,EAAE,OAAiC,EAAE,EAAE;IACxF,OAAO,IAAI,CAAC,KAAK,IAAI,EAAE;QACrB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,IAAI,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,CAAC,EAAE,QAAQ,EAA2C,EAAE,EAAE,CAAC,CAC3E,KAAC,uBAAuB,IAAC,QAAQ,EAAE,QAAQ,YAAG,QAAQ,GAA2B,CAClF,CAAC;QACF,OAAO;YACL,OAAO,EAAE,SAAS;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
|
package/dist/esm/version.js
CHANGED