@equinor/fusion-framework-react-components-people-provider 2.0.0-next.0 → 2.0.0

package/dist/types/PersonController.d.ts

@@ -2,6 +2,8 @@ import { type Observable } from 'rxjs';
 import type { ApiPerson, PeopleApiClient } from '@equinor/fusion-framework-module-services/people';
 import type { ApiResponse as GetPersonApiResponse } from '@equinor/fusion-framework-module-services/people/get';
 import type { ApiResponse as QueryPersonApiResponse } from '@equinor/fusion-framework-module-services/people/query';
+import type { ApiResponse as SuggestPersonApiResponse } from '@equinor/fusion-framework-module-services/people/suggest';
+import type { ApiResponse as ResolvePersonApiResponse } from '@equinor/fusion-framework-module-services/people/resolve';
 type GetPersonResult = GetPersonApiResponse<'v4', {
     azureId: '';
     expand: ['positions', 'manager'];
@@ -28,6 +30,13 @@ export interface IPersonController {
     search(args: ResolverArgs<{
         search: string;
     }>): Observable<PersonSearchResult>;
+    suggest(args: ResolverArgs<{
+        search: string;
+        systemAccounts: boolean;
+    }>): Observable<SuggestPersonApiResponse>;
+    resolve(args: ResolverArgs<{
+        resolveIds: string[];
+    }>): Observable<ResolvePersonApiResponse>;
 }
 export type PersonControllerOptions = {
     fallbackImage?: Blob;
@@ -35,6 +44,21 @@ export type PersonControllerOptions = {
 export declare class PersonController implements IPersonController {
     #private;
     constructor(client: PeopleApiClient, options?: PersonControllerOptions);
+    /**
+     * Suggest persons matching the given search string.
+     * Search string can be a part of display name, mail, upn or the full azureId.
+     * If systemAccounts is true, it will also include system accounts in the result.
+     */
+    suggest(args: ResolverArgs<{
+        search: string;
+        systemAccounts: boolean;
+    }>): Observable<SuggestPersonApiResponse>;
+    /**
+     * Resolve person details for given identifiers, which can be a mix of azureIds and upns.
+     */
+    resolve(args: ResolverArgs<{
+        resolveIds: string[];
+    }>): Observable<ResolvePersonApiResponse>;
     search(args: {
         search: string;
         signal?: AbortSignal;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.0.0-next.0";
+export declare const version = "2.0.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-react-components-people-provider",
-  "version": "2.0.0-next.0",
+  "version": "2.0.0",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
@@ -19,23 +19,23 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/equinor/fusion-framework.git",
-    "directory": "packages/react/components/people-provider"
+    "directory": "packages/react/components/people-resolver"
   },
   "dependencies": {
     "rxjs": "^7.8.1",
-    "@equinor/fusion-framework-module-services": "^7.1.6-next.0",
-    "@equinor/fusion-framework-react": "^8.0.0-next.0",
-    "@equinor/fusion-query": "^7.0.0-next.0",
-    "@equinor/fusion-framework-react-module": "^4.0.0-next.0"
+    "@equinor/fusion-framework-module-services": "^8.0.0",
+    "@equinor/fusion-framework-react": "^8.0.0",
+    "@equinor/fusion-query": "^7.0.0",
+    "@equinor/fusion-framework-react-module": "^4.0.0"
   },
   "devDependencies": {
-    "@equinor/fusion-wc-person": "^3.2.4",
+    "@equinor/fusion-wc-person": "^3.4.0",
     "@types/react": "^19.2.7",
     "react": "^19.2.1",
-    "typescript": "^5.8.2",
-    "@equinor/fusion-framework-module-app": "^7.2.0-next.0",
-    "@equinor/fusion-framework-module-event": "^4.4.1-next.0",
-    "@equinor/fusion-framework-module-bookmark": "^3.0.5-next.0"
+    "typescript": "^5.9.3",
+    "@equinor/fusion-framework-module-app": "^8.0.0",
+    "@equinor/fusion-framework-module-bookmark": "^4.0.0",
+    "@equinor/fusion-framework-module-event": "^6.0.0"
   },
   "peerDependencies": {
     "@types/react": "^18.0.0 || ^19.0.0",

package/src/PersonController.ts

@@ -5,6 +5,8 @@ import type { ApiPerson, PeopleApiClient } from '@equinor/fusion-framework-modul
 import { isApiPerson } from '@equinor/fusion-framework-module-services/people/utils';
 import type { ApiResponse as GetPersonApiResponse } from '@equinor/fusion-framework-module-services/people/get';
 import type { ApiResponse as QueryPersonApiResponse } from '@equinor/fusion-framework-module-services/people/query';
+import type { ApiResponse as SuggestPersonApiResponse } from '@equinor/fusion-framework-module-services/people/suggest';
+import type { ApiResponse as ResolvePersonApiResponse } from '@equinor/fusion-framework-module-services/people/resolve';
 import { Query } from '@equinor/fusion-query';
 import { queryValue } from '@equinor/fusion-query/operators';
 
@@ -45,6 +47,10 @@ export interface IPersonController {
   getPersonInfo(args: ResolverArgs<MatcherArgs>): Observable<ApiPerson<'v2'>>;
   getPhoto(args: ResolverArgs<MatcherArgs>): Observable<string>;
   search(args: ResolverArgs<{ search: string }>): Observable<PersonSearchResult>;
+  suggest(
+    args: ResolverArgs<{ search: string; systemAccounts: boolean }>,
+  ): Observable<SuggestPersonApiResponse>;
+  resolve(args: ResolverArgs<{ resolveIds: string[] }>): Observable<ResolvePersonApiResponse>;
 }
 
 export type PersonControllerOptions = {
@@ -55,6 +61,11 @@ export class PersonController implements IPersonController {
   #personQuery: Query<GetPersonResult, ResolverArgs<{ azureId: string }>>;
   #personSearchQuery: Query<PersonSearchResult, ResolverArgs<{ search: string }>>;
   #personPhotoQuery: Query<Blob, ResolverArgs<{ azureId: string }>>;
+  #personSuggestQuery: Query<
+    SuggestPersonApiResponse,
+    ResolverArgs<{ search: string; systemAccounts: boolean }>
+  >;
+  #personResolveQuery: Query<ResolvePersonApiResponse, ResolverArgs<{ resolveIds: string[] }>>;
 
   constructor(client: PeopleApiClient, options?: PersonControllerOptions) {
     const expire = 3 * 60 * 1000;
@@ -112,6 +123,60 @@ export class PersonController implements IPersonController {
         },
       },
     });
+    this.#personSuggestQuery = new Query({
+      expire,
+      queueOperator: 'merge',
+      key: ({ search, systemAccounts }) => `${search}-${systemAccounts}`,
+      client: {
+        fn: ({ search, systemAccounts }, signal) => {
+          const types = ['Person'];
+          if (systemAccounts) {
+            types.push('SystemAccount');
+          }
+          return client.suggest('json$', {
+            method: 'POST',
+            body: JSON.stringify({ queryString: search, types }),
+            signal,
+          });
+        },
+      },
+    });
+    this.#personResolveQuery = new Query({
+      expire,
+      queueOperator: 'merge',
+      key: ({ resolveIds }) => JSON.stringify([...resolveIds].sort()),
+      client: {
+        fn: ({ resolveIds }, signal) => {
+          return client.resolve('json$', {
+            method: 'POST',
+            body: JSON.stringify({ identifiers: resolveIds }),
+            signal,
+          });
+        },
+      },
+    });
+  }
+
+  /**
+   * Suggest persons matching the given search string.
+   * Search string can be a part of display name, mail, upn or the full azureId.
+   * If systemAccounts is true, it will also include system accounts in the result.
+   */
+  public suggest(
+    args: ResolverArgs<{ search: string; systemAccounts: boolean }>,
+  ): Observable<SuggestPersonApiResponse> {
+    const { search, systemAccounts, signal } = args;
+    return this.#personSuggestQuery.query({ search, systemAccounts }, { signal }).pipe(queryValue);
+  }
+
+  /**
+   * Resolve person details for given identifiers, which can be a mix of azureIds and upns.
+   */
+  public resolve(
+    args: ResolverArgs<{ resolveIds: string[] }>,
+  ): Observable<ResolvePersonApiResponse> {
+    const { resolveIds, signal } = args;
+    return this.#personResolveQuery.query({ resolveIds }, { signal }).pipe(queryValue);
   }
 
   public search(args: { search: string; signal?: AbortSignal }): Observable<PersonSearchResult> {
@@ -198,18 +263,12 @@ export class PersonController implements IPersonController {
         /** type cast and end stream */
         find(isApiPerson('v2')),
       ),
-    ).pipe(
-      /** */
-      find(isApiPerson('v2')),
-      filter(isApiPerson('v2')),
-      filter(isApiPerson('v2')),
-      takeUntil(abort$),
-    );
+    ).pipe(find(isApiPerson('v2')), filter(isApiPerson('v2')), takeUntil(abort$));
   }
 
   protected _getPersonPhotoByAzureId(azureId: string, signal?: AbortSignal): Observable<string> {
     return this.#personPhotoQuery.query({ azureId }, { signal }).pipe(
-      /** */
+      /** make subscription cold */
       take(1),
       map((result) => URL.createObjectURL(result.value)),
     );
@@ -217,7 +276,7 @@ export class PersonController implements IPersonController {
 
   protected _getPersonPhotoByUpn(upn: string, signal?: AbortSignal) {
     return this._getPersonInfoByUpn(upn, signal).pipe(
-      /** */
+      /** make subscription cold */
       take(1),
       switchMap((x) => this._getPersonPhotoByAzureId(x.azureUniqueId, signal)),
     );

package/src/create-resolver.ts

@@ -32,16 +32,18 @@ export const createResolver = (controller: IPersonController): PersonResolver =>
               ({
                 ...x,
                 azureId: x.azureUniqueId,
-                // TODO
-                // @asbjornhaland
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore https://github.com/equinor/fusion-web-components/issues/804
               }) as unknown as PersonInfo,
           ),
         ),
       ),
     );
   },
+  suggest(args) {
+    return firstValueFrom(controller.suggest(args));
+  },
+  resolve(args) {
+    return firstValueFrom(controller.resolve(args));
+  },
 });
 
 export default createResolver;

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '2.0.0-next.0';
+export const version = '2.0.0';