@peassoft/mnr-web-topline 3.0.0 → 4.0.0

package/dist/ru/parts/shell/ui/user-menu-item/index.js

@@ -4,6 +4,7 @@ export default function UserMenuItem(props) {
     label,
     itemRef,
     tabIndex,
+    testId,
     onKeyDown,
     onClick
   } = props;
@@ -12,6 +13,7 @@ export default function UserMenuItem(props) {
     className: 'topline_shell_userMenuItem',
     role: 'menuitem',
     tabIndex: tabIndex,
+    "data-testid": testId || undefined,
     onClick: onClick,
     onKeyDown: onKeyDown,
     children: label

package/dist/ru/parts/signup/actions/perform-signup/index.d.ts

@@ -1,7 +1,3 @@
-import stampit from 'stampit';
-import { getApiBaseUrl, getRequestCredentialsMode } from '../../../../modules/env/index.js';
-import request from '../../../../modules/request/index.js';
-import processSuccessfulResponse from '../../../../shared/procedures/process-successful-response/index.js';
 import type { ToplineUser } from '../../../../types/data.js';
 export type UserData = {
     email: string;
@@ -20,14 +16,4 @@ export type ReturnValue = {
  *   - on network error or if backend responds with 5xx - "network";
  *   - on 409 Conflict response - "user-exists".
  */
-declare function performSignup(this: This, userData: UserData): Promise<ReturnValue>;
-export type This = {
-    getApiBaseUrl: typeof getApiBaseUrl;
-    getRequestCredentialsMode: typeof getRequestCredentialsMode;
-    request: typeof request;
-    processSuccessfulResponse: typeof processSuccessfulResponse;
-    performSignup: typeof performSignup;
-};
-export declare const PerformSignup: stampit.Stamp<This>;
-declare const _default: (userData: UserData) => Promise<ReturnValue>;
-export default _default;
+export default function performSignup(userData: UserData): Promise<ReturnValue>;

package/dist/ru/parts/signup/actions/perform-signup/index.js

@@ -1,7 +1,7 @@
-import stampit from 'stampit';
 import { getApiBaseUrl, getRequestCredentialsMode } from '../../../../modules/env/index.js';
 import request from '../../../../modules/request/index.js';
-import processSuccessfulResponse from '../../../../shared/procedures/process-successful-response/index.js';
+import processResponse from '../../../../shared/procedures/process-response.js';
+import { ToplineEventName } from '../../../../modules/topline-service/index.js';
 /**
  * Perform signing-up
  *
@@ -9,19 +9,19 @@ import processSuccessfulResponse from '../../../../shared/procedures/process-suc
  *   - on network error or if backend responds with 5xx - "network";
  *   - on 409 Conflict response - "user-exists".
  */
-async function performSignup(userData) {
-  const url = `${this.getApiBaseUrl()}/public/signup`;
+export default async function performSignup(userData) {
+  const url = `${getApiBaseUrl()}/public/signup`;
   const options = {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json; charset=utf-8'
     },
     body: JSON.stringify(userData),
-    credentials: this.getRequestCredentialsMode(),
+    credentials: getRequestCredentialsMode(),
     cache: 'no-store',
     redirect: 'error'
   };
-  const response = await this.request(url, options, {
+  const response = await request(url, options, {
     expectedStatusCodes: [200, 409],
     maxRetries: 1
   });
@@ -32,7 +32,7 @@ async function performSignup(userData) {
     };
   }
   if (response.status === 200) {
-    return await this.processSuccessfulResponse(response, url);
+    return await processResponse(response, url, ToplineEventName.Signup);
   }
   if (response.status === 409) {
     return {
@@ -46,13 +46,4 @@ async function performSignup(userData) {
     user: null,
     error: 'network'
   };
-}
-export const PerformSignup = stampit().props({
-  getApiBaseUrl,
-  getRequestCredentialsMode,
-  request,
-  processSuccessfulResponse
-}).methods({
-  performSignup
-});
-export default performSignup.bind(PerformSignup());
+}

package/dist/ru/shared/components/modal/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from 'react';
-import keyCodes from '../../../modules/keyboard-navigation/key-codes.js';
+import { Key } from '../../../modules/keyboard-navigation/key-codes.js';
 export default function Modal(props) {
   const {
     title,
@@ -8,7 +8,7 @@ export default function Modal(props) {
   } = props;
   useEffect(() => {
     const handleKeyDown = e => {
-      if (e.which === keyCodes.ESC) {
+      if (e.key === Key.Escape) {
         onClose();
       }
     };

package/dist/ru/shared/procedures/process-response.d.ts

@@ -0,0 +1,13 @@
+import { ToplineEventName } from '../../modules/topline-service/index.js';
+import type { CustomResponse } from '../../modules/request/index.js';
+import { type ToplineUser } from '../../types/data.js';
+type EventName = ToplineEventName.Login | ToplineEventName.Signup;
+type ReturnValue = {
+    user: ToplineUser | null;
+    error: 'network' | null;
+};
+/**
+ * Process successful response on a request that implies user has to be logged-in
+ */
+export default function processResponse(response: CustomResponse, url: string, eventName: EventName): Promise<ReturnValue>;
+export {};

package/dist/ru/shared/procedures/process-response.js

@@ -0,0 +1,53 @@
+import WebError from '@memnrev/web-error';
+import { updateUser, updateGrantToken, updateRefreshToken, updateIsUserKnown } from '../../modules/local-db/index.js';
+import { setGrantToken, setRefreshToken } from '../../modules/tokens/index.js';
+import { openWebsocket } from '../../modules/websocket/index.js';
+import { innerToplineService, ToplineEventName } from '../../modules/topline-service/index.js';
+import { logError } from '../../modules/logger/index.js';
+import { isToplineUser } from '../../types/data.js';
+import { isObject } from '../../types/helpers.js';
+/**
+ * Process successful response on a request that implies user has to be logged-in
+ */
+export default async function processResponse(response, url, eventName) {
+  try {
+    const responseBody = await response.json();
+    if (isObject(responseBody) && 'user' in responseBody && isToplineUser(responseBody.user) && 'grantToken' in responseBody && typeof responseBody.grantToken === 'string' && 'refreshToken' in responseBody && typeof responseBody.refreshToken === 'string') {
+      const {
+        user,
+        grantToken,
+        refreshToken
+      } = responseBody;
+      void updateUser(user);
+      void updateGrantToken(grantToken);
+      void updateRefreshToken(refreshToken);
+      void updateIsUserKnown(true);
+      setGrantToken(grantToken);
+      setRefreshToken(refreshToken);
+      openWebsocket();
+      innerToplineService.emit(eventName, user);
+      return {
+        user,
+        error: null
+      };
+    }
+    logError(new WebError({
+      name: 'UnexpectedError'
+    }, `unexpected payload of response to request to ${url}`));
+    return {
+      user: null,
+      error: 'network'
+    };
+  } catch (e) {
+    logError(new WebError({
+      name: 'UnexpectedError',
+      ...(e instanceof Error ? {
+        cause: e
+      } : {})
+    }, `parsing 200 response of request to ${url} failed`));
+    return {
+      user: null,
+      error: 'network'
+    };
+  }
+}

package/dist/ru/topline.d.ts

@@ -13,7 +13,7 @@ export type ToplineProps = {
      */
     forceBlankHomeLink?: boolean;
     /** Callback that is invoked after user is restored from a local DB */
-    onReady?: (toplineService: ToplineService, user: ToplineUser | null) => unknown;
+    onReady?: (toplineService: ToplineService, user: ToplineUser | null, isUserKnown: boolean) => unknown;
     /**
      * Callback that is invoked if an unexpected error is caught by React's error boundary
      * component

package/dist/ru/types/result.d.ts

@@ -0,0 +1,9 @@
+export type Result<T, E> = {
+    ok: true;
+    value: T;
+} | {
+    ok: false;
+    error: E;
+};
+export declare const Ok: <T>(data: T) => Result<T, never>;
+export declare const Err: <E>(error: E) => Result<never, E>;

package/dist/ru/types/result.js

@@ -0,0 +1,12 @@
+export const Ok = data => {
+  return {
+    ok: true,
+    value: data
+  };
+};
+export const Err = error => {
+  return {
+    ok: false,
+    error
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peassoft/mnr-web-topline",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Peassoft Topline widget for mem'n'rev web applications",
   "type": "module",
   "exports": {
@@ -30,18 +30,24 @@
     "@memnrev/dict-replacer": "^0.1.0",
     "@memnrev/eslint-v9-config": "^0.4.0",
     "@microsoft/api-extractor": "^7.38.0",
+    "@peassoft/dict-builder": "^0.1.0",
     "@peassoft/mnr-web-ui-kit": "^2.1.0",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@testing-library/user-event": "^14.6.1",
     "@types/md5": "^2.3.3",
     "@types/react": "^19.0.2",
     "@types/react-dom": "^19.0.2",
     "@types/stampit": "^4.3.4",
+    "@vitejs/plugin-react": "^5.1.4",
     "autoprefixer": "^10.3.4",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^13.0.0",
-    "cpy-cli": "^6.0.0",
+    "cpy-cli": "^7.0.0",
     "css-loader": "^7.1.2",
     "eslint": "^9.8.0",
     "html-webpack-plugin": "^5.3.2",
+    "jsdom": "^28.0.0",
     "postcss": "^8.3.6",
     "postcss-loader": "^8.0.0",
     "postcss-normalize": "^13.0.1",
@@ -50,8 +56,8 @@
     "sass": "^1.52.1",
     "sass-loader": "^16.0.4",
     "style-loader": "^4.0.0",
-    "stylelint": "^16.2.0",
-    "stylelint-config-sass-guidelines": "^12.1.0",
+    "stylelint": "^17.0.0",
+    "stylelint-config-sass-guidelines": "^13.0.0",
     "ts-loader": "^9.4.4",
     "typescript": "^5.2.2",
     "vitest": "^4.0.7",

package/dist/en/shared/procedures/process-successful-response/index.d.ts

@@ -1,30 +0,0 @@
-import stampit from 'stampit';
-import { updateUser, updateGrantToken, updateRefreshToken } from '../../../modules/local-db/index.js';
-import { setGrantToken, setRefreshToken } from '../../../modules/tokens/index.js';
-import { openWebsocket } from '../../../modules/websocket/index.js';
-import { type InnerService } from '../../../modules/topline-service/index.js';
-import { logError } from '../../../modules/logger/index.js';
-import type { CustomResponse } from '../../../modules/request/index.js';
-import { type ToplineUser } from '../../../types/data.js';
-type ReturnValue = {
-    user: ToplineUser | null;
-    error: 'network' | null;
-};
-/**
- * Process successful response on a request that implies user has to be logged-in
- */
-declare function processSuccessfulResponse(this: This, response: CustomResponse, url: string): Promise<ReturnValue>;
-export type This = {
-    updateUser: typeof updateUser;
-    updateGrantToken: typeof updateGrantToken;
-    updateRefreshToken: typeof updateRefreshToken;
-    setGrantToken: typeof setGrantToken;
-    setRefreshToken: typeof setRefreshToken;
-    openWebsocket: typeof openWebsocket;
-    innerToplineService: Pick<InnerService, 'emit'>;
-    logError: typeof logError;
-    processSuccessfulResponse: typeof processSuccessfulResponse;
-};
-export declare const ProcessSuccessfulResponse: stampit.Stamp<This>;
-declare const _default: (response: CustomResponse, url: string) => Promise<ReturnValue>;
-export default _default;

package/dist/en/shared/procedures/process-successful-response/index.js

@@ -1,66 +0,0 @@
-import stampit from 'stampit';
-import WebError from '@memnrev/web-error';
-import { updateUser, updateGrantToken, updateRefreshToken } from '../../../modules/local-db/index.js';
-import { setGrantToken, setRefreshToken } from '../../../modules/tokens/index.js';
-import { openWebsocket } from '../../../modules/websocket/index.js';
-import { innerToplineService, ToplineEventName } from '../../../modules/topline-service/index.js';
-import { logError } from '../../../modules/logger/index.js';
-import { isToplineUser } from '../../../types/data.js';
-import { isObject } from '../../../types/helpers.js';
-/**
- * Process successful response on a request that implies user has to be logged-in
- */
-async function processSuccessfulResponse(response, url) {
-  try {
-    const responseBody = await response.json();
-    if (isObject(responseBody) && 'user' in responseBody && isToplineUser(responseBody.user) && 'grantToken' in responseBody && typeof responseBody.grantToken === 'string' && 'refreshToken' in responseBody && typeof responseBody.refreshToken === 'string') {
-      const {
-        user,
-        grantToken,
-        refreshToken
-      } = responseBody;
-      void this.updateUser(user);
-      void this.updateGrantToken(grantToken);
-      void this.updateRefreshToken(refreshToken);
-      this.setGrantToken(grantToken);
-      this.setRefreshToken(refreshToken);
-      this.openWebsocket();
-      this.innerToplineService.emit(ToplineEventName.UserChange, user);
-      return {
-        user,
-        error: null
-      };
-    }
-    this.logError(new WebError({
-      name: 'UnexpectedError'
-    }, `unexpected payload of response to request to ${url}`));
-    return {
-      user: null,
-      error: 'network'
-    };
-  } catch (e) {
-    this.logError(new WebError({
-      name: 'UnexpectedError',
-      ...(e instanceof Error ? {
-        cause: e
-      } : {})
-    }, `parsing 200 response of request to ${url} failed`));
-    return {
-      user: null,
-      error: 'network'
-    };
-  }
-}
-export const ProcessSuccessfulResponse = stampit().props({
-  updateUser,
-  updateGrantToken,
-  updateRefreshToken,
-  setGrantToken,
-  setRefreshToken,
-  openWebsocket,
-  innerToplineService,
-  logError
-}).methods({
-  processSuccessfulResponse
-});
-export default processSuccessfulResponse.bind(ProcessSuccessfulResponse());

package/dist/ru/shared/procedures/process-successful-response/index.d.ts

@@ -1,30 +0,0 @@
-import stampit from 'stampit';
-import { updateUser, updateGrantToken, updateRefreshToken } from '../../../modules/local-db/index.js';
-import { setGrantToken, setRefreshToken } from '../../../modules/tokens/index.js';
-import { openWebsocket } from '../../../modules/websocket/index.js';
-import { type InnerService } from '../../../modules/topline-service/index.js';
-import { logError } from '../../../modules/logger/index.js';
-import type { CustomResponse } from '../../../modules/request/index.js';
-import { type ToplineUser } from '../../../types/data.js';
-type ReturnValue = {
-    user: ToplineUser | null;
-    error: 'network' | null;
-};
-/**
- * Process successful response on a request that implies user has to be logged-in
- */
-declare function processSuccessfulResponse(this: This, response: CustomResponse, url: string): Promise<ReturnValue>;
-export type This = {
-    updateUser: typeof updateUser;
-    updateGrantToken: typeof updateGrantToken;
-    updateRefreshToken: typeof updateRefreshToken;
-    setGrantToken: typeof setGrantToken;
-    setRefreshToken: typeof setRefreshToken;
-    openWebsocket: typeof openWebsocket;
-    innerToplineService: Pick<InnerService, 'emit'>;
-    logError: typeof logError;
-    processSuccessfulResponse: typeof processSuccessfulResponse;
-};
-export declare const ProcessSuccessfulResponse: stampit.Stamp<This>;
-declare const _default: (response: CustomResponse, url: string) => Promise<ReturnValue>;
-export default _default;

package/dist/ru/shared/procedures/process-successful-response/index.js

@@ -1,66 +0,0 @@
-import stampit from 'stampit';
-import WebError from '@memnrev/web-error';
-import { updateUser, updateGrantToken, updateRefreshToken } from '../../../modules/local-db/index.js';
-import { setGrantToken, setRefreshToken } from '../../../modules/tokens/index.js';
-import { openWebsocket } from '../../../modules/websocket/index.js';
-import { innerToplineService, ToplineEventName } from '../../../modules/topline-service/index.js';
-import { logError } from '../../../modules/logger/index.js';
-import { isToplineUser } from '../../../types/data.js';
-import { isObject } from '../../../types/helpers.js';
-/**
- * Process successful response on a request that implies user has to be logged-in
- */
-async function processSuccessfulResponse(response, url) {
-  try {
-    const responseBody = await response.json();
-    if (isObject(responseBody) && 'user' in responseBody && isToplineUser(responseBody.user) && 'grantToken' in responseBody && typeof responseBody.grantToken === 'string' && 'refreshToken' in responseBody && typeof responseBody.refreshToken === 'string') {
-      const {
-        user,
-        grantToken,
-        refreshToken
-      } = responseBody;
-      void this.updateUser(user);
-      void this.updateGrantToken(grantToken);
-      void this.updateRefreshToken(refreshToken);
-      this.setGrantToken(grantToken);
-      this.setRefreshToken(refreshToken);
-      this.openWebsocket();
-      this.innerToplineService.emit(ToplineEventName.UserChange, user);
-      return {
-        user,
-        error: null
-      };
-    }
-    this.logError(new WebError({
-      name: 'UnexpectedError'
-    }, `unexpected payload of response to request to ${url}`));
-    return {
-      user: null,
-      error: 'network'
-    };
-  } catch (e) {
-    this.logError(new WebError({
-      name: 'UnexpectedError',
-      ...(e instanceof Error ? {
-        cause: e
-      } : {})
-    }, `parsing 200 response of request to ${url} failed`));
-    return {
-      user: null,
-      error: 'network'
-    };
-  }
-}
-export const ProcessSuccessfulResponse = stampit().props({
-  updateUser,
-  updateGrantToken,
-  updateRefreshToken,
-  setGrantToken,
-  setRefreshToken,
-  openWebsocket,
-  innerToplineService,
-  logError
-}).methods({
-  processSuccessfulResponse
-});
-export default processSuccessfulResponse.bind(ProcessSuccessfulResponse());