Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish 4.0.2 #535

Merged
merged 20 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ba786e9
Bump @adobe/css-tools from 4.2.0 to 4.3.2 in /login-workflow/example
dependabot[bot] Dec 1, 2023
428fe94
Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /login-workflow
dependabot[bot] Dec 1, 2023
f70e1d3
Bump @typescript-eslint/eslint-plugin in /login-workflow/example
dependabot[bot] Dec 1, 2023
60d60b4
Bump @typescript-eslint/eslint-plugin in /login-workflow
dependabot[bot] Dec 1, 2023
b65f448
Merge pull request #523 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton Dec 4, 2023
a0fddd0
Merge pull request #525 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton Dec 4, 2023
d676aa7
Merge pull request #524 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton Dec 4, 2023
e282881
Merge pull request #522 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton Dec 4, 2023
d34e9e9
pass email to validateUserRegistrationRequest
ektaghag-eaton Dec 13, 2023
88bd2cc
pass sx prop to error dialog
ektaghag-eaton Dec 13, 2023
d554b61
update changelog
ektaghag-eaton Dec 13, 2023
17e40a6
Merge pull request #531 from etn-ccis/fix/send-email-to-validRegistra…
ektaghag-eaton Dec 14, 2023
cc7ae42
fix changelog
ektaghag-eaton Dec 15, 2023
ccff178
Merge branch 'dev' of https://github.com/etn-ccis/blui-react-workflow…
ektaghag-eaton Dec 15, 2023
dc01f3d
remove test code
ektaghag-eaton Dec 18, 2023
9f2aa8e
Merge pull request #532 from etn-ccis/fix/521-override-dialog-styles
surajeaton Dec 18, 2023
0c22985
Update date
ektaghag-eaton Dec 18, 2023
5919f4c
Merge pull request #534 from etn-ccis/update/changelog-date
ektaghag-eaton Dec 18, 2023
e114785
update package version
ektaghag-eaton Dec 18, 2023
c578a09
Merge pull request #536 from etn-ccis/fix/update-package-version
ektaghag-eaton Dec 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions login-workflow/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v4.0.2 (December 18, 2023)

### Added

- `sx` prop to Error Manager Dialog ([#521](https://github.com/etn-ccis/blui-react-workflows/issues/521)).

### Fixed

- Issue where the `email` field did not pass to `validateUserRegistrationRequest` RegistrationUIActions when email is available ([#529](https://github.com/etn-ccis/blui-react-workflows/issues/529)).

## v4.0.1 (December 4, 2023)

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion login-workflow/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.2.4",
"@typescript-eslint/eslint-plugin": "^5.54.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.49.0",
"babel-plugin-istanbul": "^6.1.1",
"eslint": "^8.31.0",
Expand Down
89 changes: 66 additions & 23 deletions login-workflow/example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


"@adobe/css-tools@^4.0.1":
version "4.2.0"
resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855"
integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==
version "4.3.2"
resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.2.tgz#a6abc715fb6884851fca9dad37fc34739a04fd11"
integrity sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==

"@alloc/quick-lru@^5.2.0":
version "5.2.0"
Expand Down Expand Up @@ -2754,17 +2754,17 @@
resolved "https://registry.yarnpkg.com/@types/yarnpkg__lockfile/-/yarnpkg__lockfile-1.1.6.tgz#60a35ede6197d8cbedd5bb8393f3921e8d56d44b"
integrity sha512-kbdQa3J+hVCkqmGQm31fthEwGxszZtepw84p9QGCiJB7TmiPqPAf3/g9eZUnkCeanmiFOaG4pVhiPDyqJxaoaw==

"@typescript-eslint/eslint-plugin@^5.5.0", "@typescript-eslint/eslint-plugin@^5.54.0":
version "5.59.7"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.7.tgz#e470af414f05ecfdc05a23e9ce6ec8f91db56fe2"
integrity sha512-BL+jYxUFIbuYwy+4fF86k5vdT9lT0CNJ6HtwrIvGh0PhH8s0yy5rjaKH2fDCrz5ITHy07WCzVGNvAmjJh4IJFA==
"@typescript-eslint/eslint-plugin@^5.5.0", "@typescript-eslint/eslint-plugin@^5.62.0":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
dependencies:
"@eslint-community/regexpp" "^4.4.0"
"@typescript-eslint/scope-manager" "5.59.7"
"@typescript-eslint/type-utils" "5.59.7"
"@typescript-eslint/utils" "5.59.7"
"@typescript-eslint/scope-manager" "5.62.0"
"@typescript-eslint/type-utils" "5.62.0"
"@typescript-eslint/utils" "5.62.0"
debug "^4.3.4"
grapheme-splitter "^1.0.4"
graphemer "^1.4.0"
ignore "^5.2.0"
natural-compare-lite "^1.4.0"
semver "^7.3.7"
Expand Down Expand Up @@ -2795,13 +2795,21 @@
"@typescript-eslint/types" "5.59.7"
"@typescript-eslint/visitor-keys" "5.59.7"

"@typescript-eslint/type-utils@5.59.7":
version "5.59.7"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.7.tgz#89c97291371b59eb18a68039857c829776f1426d"
integrity sha512-ozuz/GILuYG7osdY5O5yg0QxXUAEoI4Go3Do5xeu+ERH9PorHBPSdvD3Tjp2NN2bNLh1NJQSsQu2TPu/Ly+HaQ==
"@typescript-eslint/scope-manager@5.62.0":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
dependencies:
"@typescript-eslint/typescript-estree" "5.59.7"
"@typescript-eslint/utils" "5.59.7"
"@typescript-eslint/types" "5.62.0"
"@typescript-eslint/visitor-keys" "5.62.0"

"@typescript-eslint/[email protected]":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
dependencies:
"@typescript-eslint/typescript-estree" "5.62.0"
"@typescript-eslint/utils" "5.62.0"
debug "^4.3.4"
tsutils "^3.21.0"

Expand All @@ -2810,6 +2818,11 @@
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.7.tgz#6f4857203fceee91d0034ccc30512d2939000742"
integrity sha512-UnVS2MRRg6p7xOSATscWkKjlf/NDKuqo5TdbWck6rIRZbmKpVNTLALzNvcjIfHBE7736kZOFc/4Z3VcZwuOM/A==

"@typescript-eslint/[email protected]":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==

"@typescript-eslint/[email protected]":
version "5.59.7"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.7.tgz#b887acbd4b58e654829c94860dbff4ac55c5cff8"
Expand All @@ -2823,7 +2836,20 @@
semver "^7.3.7"
tsutils "^3.21.0"

"@typescript-eslint/[email protected]", "@typescript-eslint/utils@^5.58.0":
"@typescript-eslint/[email protected]":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
dependencies:
"@typescript-eslint/types" "5.62.0"
"@typescript-eslint/visitor-keys" "5.62.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
semver "^7.3.7"
tsutils "^3.21.0"

"@typescript-eslint/[email protected]":
version "5.59.7"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.7.tgz#7adf068b136deae54abd9a66ba5a8780d2d0f898"
integrity sha512-yCX9WpdQKaLufz5luG4aJbOpdXf/fjwGMcLFXZVPUz3QqLirG5QcwwnIHNf8cjLjxK4qtzTO8udUtMQSAToQnQ==
Expand All @@ -2837,6 +2863,20 @@
eslint-scope "^5.1.1"
semver "^7.3.7"

"@typescript-eslint/[email protected]", "@typescript-eslint/utils@^5.58.0":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
"@types/json-schema" "^7.0.9"
"@types/semver" "^7.3.12"
"@typescript-eslint/scope-manager" "5.62.0"
"@typescript-eslint/types" "5.62.0"
"@typescript-eslint/typescript-estree" "5.62.0"
eslint-scope "^5.1.1"
semver "^7.3.7"

"@typescript-eslint/[email protected]":
version "5.59.7"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.7.tgz#09c36eaf268086b4fbb5eb9dc5199391b6485fc5"
Expand All @@ -2845,6 +2885,14 @@
"@typescript-eslint/types" "5.59.7"
eslint-visitor-keys "^3.3.0"

"@typescript-eslint/[email protected]":
version "5.62.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
dependencies:
"@typescript-eslint/types" "5.62.0"
eslint-visitor-keys "^3.3.0"

"@webassemblyjs/[email protected]", "@webassemblyjs/ast@^1.11.5":
version "1.11.6"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
Expand Down Expand Up @@ -5544,11 +5592,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==

grapheme-splitter@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==

graphemer@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
Expand Down
2 changes: 1 addition & 1 deletion login-workflow/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brightlayer-ui/react-auth-workflow",
"version": "4.0.1",
"version": "4.0.2",
"author": "Brightlayer UI <[email protected]> (https://github.com/brightlayer-ui)",
"license": "BSD-3-Clause",
"description": "Re-usable workflow components for Authentication and Registration within Eaton applications.",
Expand Down
7 changes: 5 additions & 2 deletions login-workflow/src/components/Error/ErrorManager.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useCallback } from 'react';
import { BasicDialog } from '../Dialog/BasicDialog';
import ErrorMessageBox from './ErrorMessageBox';
import { SxProps } from '@mui/material/styles';
import { SxProps, Theme } from '@mui/material/styles';
import { useTranslation } from 'react-i18next';

export type AuthError = { cause: { title: string; errorMessage: string } };
Expand Down Expand Up @@ -36,14 +36,15 @@ export type ErrorManagerProps = {
dialogConfig?: {
dismissLabel?: string;
title?: string;
sx?: SxProps<Theme>;
};
messageBoxConfig?: {
title?: string;
dismissible?: boolean;
position?: 'top' | 'bottom';
fontColor?: string;
backgroundColor?: string;
sx?: SxProps;
sx?: SxProps<Theme>;
};
children?: React.ReactNode;
};
Expand All @@ -57,6 +58,7 @@ export type ErrorManagerProps = {
* @param dialogConfig configuration for the error dialog
* @param dialogConfig.title text to show in the title of the dialog
* @param dialogConfig.dismissLabel text to show in the close button
* @param dialogConfig.sx sx styles passed to the underlying root(Dialog) component
* @param messageBoxConfig configuration for the error message box
* @param messageBoxConfig.dismissible whether the message box can be dismissed
* @param messageBoxConfig.position determines whether the message box should be displayed at the top or bottom of the screen
Expand Down Expand Up @@ -89,6 +91,7 @@ const ErrorManager: React.FC<ErrorManagerProps> = (props): JSX.Element => {
body={t(error)}
onClose={onClose}
dismissButtonText={dialogConfig?.dismissLabel}
sx={dialogConfig?.sx}
/>
),
[dialogConfig, title, error, onClose, t]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ export const VerifyCodeScreen: React.FC<VerifyCodeScreenProps> = (props) => {
} = props;

const handleOnNext = useCallback(
async (code: string) => {
async (code: string, email?: string) => {
try {
setIsLoading(true);
if (actions?.validateUserRegistrationRequest) {
// eslint-disable-next-line no-unsafe-optional-chaining
const { codeValid, accountExists } = await actions?.validateUserRegistrationRequest(code);
const { codeValid, accountExists } = await actions?.validateUserRegistrationRequest(code, email);

if (accountExists) {
updateScreenData({ screenId: 'VerifyCode', values: { code }, isAccountExist: accountExists });
Expand Down Expand Up @@ -141,7 +141,7 @@ export const VerifyCodeScreen: React.FC<VerifyCodeScreenProps> = (props) => {
...WorkflowCardActionsProps,
onNext: (data: any): void => {
setVerifyCode(data.code);
void handleOnNext(data.code);
void handleOnNext(data.code, emailAddress);
WorkflowCardActionsProps?.onNext?.();
},
onPrevious: (data: any): void => {
Expand Down
Loading
Loading