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

PR for merging Dev branch against master #590

Merged
merged 137 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
13f28be
Bump i18next from 23.2.11 to 23.7.13 in /login-workflow/example
dependabot[bot] Jan 1, 2024
1812c40
Bump date-fns from 2.30.0 to 3.0.6 in /login-workflow
dependabot[bot] Jan 1, 2024
7a2b9da
Merge pull request #537 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Jan 2, 2024
d7970f9
update import for Locale & bump date-fns version to match
JeffGreiner-eaton Jan 2, 2024
8785ed9
fix conflict on i18next version
JeffGreiner-eaton Jan 2, 2024
4b8933d
Merge branch 'dev' into dependabot/npm_and_yarn/login-workflow/dev/da…
JeffGreiner-eaton Jan 2, 2024
c332497
Merge pull request #538 from etn-ccis/dependabot/npm_and_yarn/login-w…
ektaghag-eaton Jan 3, 2024
ec2656a
Bump follow-redirects from 1.15.2 to 1.15.4 in /login-workflow/example
dependabot[bot] Jan 10, 2024
f22cf0b
Merge pull request #539 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Jan 10, 2024
edf661a
Fix persist coverage & require test result
JeffGreiner-eaton Jan 24, 2024
86a9b8d
remove dup key
JeffGreiner-eaton Jan 24, 2024
c0f3f84
format step
JeffGreiner-eaton Jan 24, 2024
7c1b5ba
turn filters on
JeffGreiner-eaton Jan 24, 2024
cf8da61
Merge pull request #541 from etn-ccis/fix/persist-coverage
ektaghag-eaton Jan 25, 2024
432612b
Add vite example project
daileytj Jan 30, 2024
0d7110a
Update scripts to link workflows and start example-vite
daileytj Jan 31, 2024
23d8de2
Fix linting and prettier issues
daileytj Jan 31, 2024
a6ff74c
Bump @mui/icons-material in /login-workflow/example
dependabot[bot] Feb 1, 2024
9e9bf08
Bump ts-jest from 29.1.1 to 29.1.2 in /login-workflow
dependabot[bot] Feb 1, 2024
5cddc85
Merge pull request #544 from etn-ccis/dependabot/npm_and_yarn/login-w…
joebochill Feb 1, 2024
ef264aa
Merge pull request #545 from etn-ccis/dependabot/npm_and_yarn/login-w…
joebochill Feb 1, 2024
689d686
Run prettier
daileytj Feb 1, 2024
1e03308
Remove tsc from build command
daileytj Feb 1, 2024
fe78039
Merge pull request #542 from daileytj/feature/convert-example-project…
JeffGreiner-eaton Feb 1, 2024
e24de09
Bump ip from 1.1.8 to 1.1.9 in /login-workflow
dependabot[bot] Feb 20, 2024
2716304
Merge pull request #548 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton Feb 21, 2024
f8c155b
Fix typo success screen read me
JeffGreiner-eaton Feb 27, 2024
4be3218
Remove react router dom from types
JeffGreiner-eaton Feb 27, 2024
0d2295b
Merge pull request #550 from etn-ccis/fix/blui-5376-typo
ektaghag-eaton Feb 28, 2024
e6b2390
Merge pull request #551 from etn-ccis/fix/blui-5377-remove-dependency
JeffGreiner-eaton Feb 29, 2024
83c4926
Bump @brightlayer-ui/react-themes in /login-workflow/example
dependabot[bot] Mar 1, 2024
f1346a6
Bump @testing-library/jest-dom from 5.17.0 to 6.4.2 in /login-workflow
dependabot[bot] Mar 1, 2024
53f2d8f
Merge pull request #555 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton Mar 1, 2024
02ed02b
Merge pull request #553 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton Mar 1, 2024
8d13bac
Error manager translate dismissLabel for dialog
JeffGreiner-eaton Mar 5, 2024
ec39c8e
lint prettier
JeffGreiner-eaton Mar 5, 2024
a4234c8
merge props and update providers
JeffGreiner-eaton Mar 6, 2024
81c19fc
Update unit tests with act and clean up console
JeffGreiner-eaton Mar 6, 2024
72cbd33
fix typo
JeffGreiner-eaton Mar 7, 2024
aa42a04
update navigate description
JeffGreiner-eaton Mar 7, 2024
44a9991
update providers & add t function prop
JeffGreiner-eaton Mar 7, 2024
8381198
revert action failure
JeffGreiner-eaton Mar 7, 2024
fab13c0
revert to default message-box in example
JeffGreiner-eaton Mar 7, 2024
7dd2edb
update TFunction prop & docs
JeffGreiner-eaton Mar 7, 2024
9de9fa5
Merge pull request #559 from etn-ccis/fix/blui-5376-typo
surajeaton Mar 8, 2024
5a807c3
Merge pull request #557 from etn-ccis/fix/blui-5378-translate-dialog-…
ektaghag-eaton Mar 8, 2024
0128dfb
update tests
JeffGreiner-eaton Mar 8, 2024
2cf4dac
Merge branch 'dev' into feature/blui-5380-update-unit-test-warnings
JeffGreiner-eaton Mar 8, 2024
3771e99
update act
JeffGreiner-eaton Mar 8, 2024
e6a84dd
update reg workflow tests
JeffGreiner-eaton Mar 8, 2024
e518925
prettier & lint
JeffGreiner-eaton Mar 8, 2024
bb59fa7
Merge pull request #558 from etn-ccis/feature/blui-5380-update-unit-t…
ektaghag-eaton Mar 12, 2024
846f89c
Error manager with dynamic values
JeffGreiner-eaton Mar 12, 2024
3af4582
prettier
JeffGreiner-eaton Mar 12, 2024
ae663ee
remove test code and update change log
JeffGreiner-eaton Mar 15, 2024
8b3df17
Merge pull request #561 from etn-ccis/feature/blui-5379-error-manager…
JeffGreiner-eaton Mar 15, 2024
392f8e5
Bump follow-redirects from 1.15.4 to 1.15.6 in /login-workflow/example
dependabot[bot] Mar 16, 2024
c679d11
Bump follow-redirects in /login-workflow/example-vite
dependabot[bot] Mar 16, 2024
cecf056
Merge pull request #563 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Mar 19, 2024
12b1a29
Merge pull request #562 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Mar 19, 2024
ac3743a
Revert commented code
JeffGreiner-eaton Mar 22, 2024
c6f3b67
Merge pull request #564 from etn-ccis/fix/update-throw-error
joebochill Mar 22, 2024
7a4a707
Bump webpack-dev-middleware in /login-workflow/example
dependabot[bot] Mar 23, 2024
ccac261
Bump webpack-dev-middleware in /login-workflow/example-vite
dependabot[bot] Mar 24, 2024
0798c4c
updated password validation callback function
manojleaton Mar 27, 2024
ef2a932
Merge pull request #566 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Mar 27, 2024
96ed29e
Bump express from 4.18.2 to 4.19.2 in /login-workflow/example-vite
dependabot[bot] Mar 27, 2024
fcc43e4
Bump express from 4.18.2 to 4.19.2 in /login-workflow
dependabot[bot] Mar 27, 2024
5825b94
Bump express from 4.18.2 to 4.19.2 in /login-workflow/example
dependabot[bot] Mar 27, 2024
3ad931e
Merge pull request #565 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Mar 27, 2024
c2dc92c
Merge pull request #568 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Mar 27, 2024
183ddb2
Merge pull request #570 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Mar 27, 2024
1a8a669
Merge pull request #569 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Mar 27, 2024
7fcedd3
Add blui-ci github action
JeffGreiner-eaton Mar 28, 2024
6bfaea3
Merge pull request #567 from etn-ccis/bug/5510-Password-Validation-issue
JeffGreiner-eaton Mar 28, 2024
82abc13
Test commit
ektaghag-eaton Mar 29, 2024
9e33485
update codecov config
JeffGreiner-eaton Mar 29, 2024
91c4b92
update a test to verify diff coverage
JeffGreiner-eaton Mar 29, 2024
f108a11
remove fake test for coverage
JeffGreiner-eaton Mar 29, 2024
a44f11a
Bump eslint from 8.41.0 to 8.57.0 in /login-workflow/example
dependabot[bot] Apr 1, 2024
4122b5b
Merge pull request #572 from etn-ccis/feature/blui-5563-blui-ci
ektaghag-eaton Apr 2, 2024
5a7f06d
Merge pull request #574 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Apr 2, 2024
4a69e63
Bump react-router-dom from 6.16.0 to 6.22.3 in /login-workflow
dependabot[bot] Apr 2, 2024
298c90d
update work dir
JeffGreiner-eaton Apr 2, 2024
4f74733
Merge pull request #573 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Apr 2, 2024
1fa753d
Bump vite from 5.0.12 to 5.0.13 in /login-workflow/example-vite
dependabot[bot] Apr 3, 2024
8bb6570
Merge pull request #575 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Apr 4, 2024
166f6f9
Bump tar from 6.2.0 to 6.2.1 in /login-workflow
dependabot[bot] Apr 11, 2024
ca8eea6
Merge pull request #576 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton Apr 11, 2024
a16149b
remove workflowFinishState
priyankakmEaton Apr 16, 2024
28c7a28
reload eula content
priyankakmEaton Apr 18, 2024
3446ced
reload eulastate
priyankakmEaton Apr 18, 2024
1c56b11
Use npm publish
JeffGreiner-eaton Apr 18, 2024
5c4aef8
Merge pull request #578 from etn-ccis/bug/5682_reloadEulaState
priyankakmEaton Apr 19, 2024
1125b92
type docs
priyankakmEaton Apr 19, 2024
cb43bc7
Merge pull request #579 from etn-ccis/fix/use-npm-publish
JeffGreiner-eaton Apr 19, 2024
393fd9f
adding emptyState props
priyankakmEaton Apr 22, 2024
705ecb8
Merge branch 'dev' into bug/5681_removeWorkflowFinishState
priyankakmEaton Apr 22, 2024
2284a9a
adding emptyStateprops
priyankakmEaton Apr 22, 2024
8cbece5
update docs
priyankakmEaton Apr 22, 2024
b5918e4
update js docs
priyankakmEaton Apr 23, 2024
78c9741
update js docs
priyankakmEaton Apr 23, 2024
e606294
update js docs
priyankakmEaton Apr 23, 2024
6aad9da
update js docs
priyankakmEaton Apr 23, 2024
ed70767
update js docs
priyankakmEaton Apr 24, 2024
3e83bd1
update js docs
priyankakmEaton Apr 24, 2024
6681c25
testcase on EulaScreen
priyankakmEaton Apr 24, 2024
3fdd34b
emptyStateprops
priyankakmEaton Apr 24, 2024
fd8a8a2
Merge pull request #577 from etn-ccis/bug/5681_removeWorkflowFinishState
surajeaton Apr 24, 2024
ed9268c
type docs
priyankakmEaton Apr 24, 2024
210fd49
Merge branch 'dev' into bug/5466_updateJSdocs
priyankakmEaton Apr 24, 2024
c01b1d8
Merge pull request #580 from etn-ccis/bug/5680_typeDocs
surajeaton Apr 24, 2024
5d2d997
Merge branch 'dev' into bug/5466_updateJSdocs
priyankakmEaton Apr 24, 2024
b9ae551
update js docs
priyankakmEaton Apr 25, 2024
017bdcd
Merge pull request #581 from etn-ccis/bug/5466_updateJSdocs
ektaghag-eaton Apr 25, 2024
be5da0e
update Eula docs
priyankakmEaton Apr 25, 2024
eb9429d
Merge pull request #582 from etn-ccis/bug/5682_updateEulaDocs
ektaghag-eaton Apr 26, 2024
72c37c5
add build badge & remove reference to circleCI
JeffGreiner-eaton Apr 30, 2024
4c1d726
cache path
JeffGreiner-eaton Apr 30, 2024
4d2acb5
Bump typescript from 5.2.2 to 5.4.5 in /login-workflow
dependabot[bot] May 1, 2024
507f598
Bump date-fns from 3.0.6 to 3.6.0 in /login-workflow/example
dependabot[bot] May 1, 2024
81b13b8
Merge pull request #585 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton May 1, 2024
d4039b9
Bump ejs from 3.1.9 to 3.1.10 in /login-workflow/example-vite
dependabot[bot] May 1, 2024
b736ec4
Bump ejs from 3.1.9 to 3.1.10 in /login-workflow/example
dependabot[bot] May 1, 2024
2eb7c68
Merge pull request #584 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton May 1, 2024
9d52d76
Merge pull request #586 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton May 1, 2024
29622cd
Merge pull request #587 from etn-ccis/dependabot/npm_and_yarn/login-w…
JeffGreiner-eaton May 1, 2024
4b909e2
use yarn --immutable
JeffGreiner-eaton May 1, 2024
e91f6fe
Merge pull request #583 from etn-ccis/fix/blui-5710-update-badge
JeffGreiner-eaton May 2, 2024
fb2f6ee
Bump firebase-tools from 11.30.0 to 13.6.0 in /login-workflow
dependabot[bot] May 3, 2024
23fdc0c
Merge pull request #588 from etn-ccis/dependabot/npm_and_yarn/login-w…
surajeaton May 6, 2024
27ee219
React auth workflow Version Update
priyankakmEaton May 8, 2024
56c1833
Merge branch 'dev' into task/5589_reactAuthWorkflow_versionUpdate
priyankakmEaton May 8, 2024
c2d0896
version update
priyankakmEaton May 8, 2024
96d23cf
Merge pull request #589 from etn-ccis/task/5589_reactAuthWorkflow_ver…
priyankakmEaton May 9, 2024
17d76b6
Fix publish command
JeffGreiner-eaton May 9, 2024
66cd8ad
Merge pull request #591 from etn-ccis/fix/publish
joebochill May 9, 2024
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
176 changes: 0 additions & 176 deletions .circleci/config.yml

This file was deleted.

120 changes: 120 additions & 0 deletions .github/workflows/blui-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
name: Build

on:
push:
branches: [ "dev", "master" ]
pull_request:
branches: [ "dev", "master" ]
pull_request_target:
types:
- opened
branches:
- '*/*'

permissions:
pull-requests: write
contents: read

jobs:
prettier_lint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: login-workflow
- run: yarn install:dependencies
working-directory: login-workflow
- run: yarn prettier
working-directory: login-workflow
- run: yarn lint
working-directory: login-workflow

unit_test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: login-workflow
- run: yarn --immutable
working-directory: login-workflow
- run: yarn test:ci --coverage --watchAll=false
working-directory: login-workflow
- name: Upload to Codecov
uses: codecov/codecov-action@v3
with:
directory: ./login-workflow/coverage/
files: clover.xml
flags: unittests
name: codecov-report
verbose: true

build_login_workflow:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: login-workflow
- run: yarn --immutable
working-directory: login-workflow
- run: yarn build
working-directory: login-workflow
- name: Save build
uses: actions/upload-artifact@v3
with:
name: dist
if-no-files-found: error
path: login-workflow/dist

publish_login_workflow:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: [prettier_lint, unit_test, build_login_workflow]
strategy:
matrix:
node-version: [18.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- uses: actions/checkout@v4
- name: Download dist
uses: actions/download-artifact@v3
with:
name: dist
path: login-workflow/dist
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
cache-dependency-path: login-workflow
- run: yarn --immutable
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: login-workflow
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.3 (May 9, 2024)

### Fixed

- Error Manager with dynamic values ([#540](https://github.com/etn-ccis/blui-react-workflows/issues/540)).
- Eula screen tests throws console warnings to wrap ([#390](https://github.com/etn-ccis/blui-react-workflows/issues/390)).
- Hardcoded dismissible Dialog button text ([#543](https://github.com/etn-ccis/blui-react-workflows/issues/543)).
- Fix dependency on react-router ([#546](https://github.com/etn-ccis/blui-react-workflows/issues/546)).
- Typo in Success screen readme ([#567](https://github.com/etn-ccis/blui-react-workflows/issues/547)).

## v4.0.2 (December 18, 2023)

### Added
Expand Down
4 changes: 2 additions & 2 deletions login-workflow/PUBLISHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Automatic Publishing

This package is published to NPM automatically by CircleCI when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.
This package is published to NPM automatically by Github when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.
- The `dev` branch will publish versions marked as `alpha` or `beta`.
- The `master` branch will publish any version (`alpha`, `beta`, or `latest`).
In both cases, the code will only be published if the version number differs from the current version published under the respective dist tag.
Expand All @@ -27,4 +27,4 @@ yarn build
npm adduser && yarn publish:package
```

> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in CircleCI.
> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in Github.
4 changes: 2 additions & 2 deletions login-workflow/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# React Auth Workflow
# Test React Auth Workflow

[![](https://img.shields.io/circleci/project/github/etn-ccis/blui-react-workflows/master.svg?style=flat)](https://circleci.com/gh/etn-ccis/blui-react-workflows/tree/master) ![npm (scoped)](https://img.shields.io/npm/v/@brightlayer-ui/react-auth-workflow) [![codecov](https://codecov.io/gh/etn-ccis/blui-react-workflows/branch/master/graph/badge.svg?token=H18T75WBFS)](https://codecov.io/gh/etn-ccis/blui-react-workflows)
[![Build](https://github.com/etn-ccis/blui-react-workflows/actions/workflows/blui-ci.yml/badge.svg?branch=master)](https://github.com/etn-ccis/blui-react-workflows/actions/workflows/blui-ci.yml) ![npm (scoped)](https://img.shields.io/npm/v/@brightlayer-ui/react-auth-workflow) [![codecov](https://codecov.io/gh/etn-ccis/blui-react-workflows/branch/master/graph/badge.svg?token=H18T75WBFS)](https://codecov.io/gh/etn-ccis/blui-react-workflows)

The React Auth Workflow package provides a consistent UI implementation of authentication-related capabilities for use in Eaton web applications built with React.

Expand Down
52 changes: 12 additions & 40 deletions login-workflow/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,13 @@
codecov:
require_ci_to_pass: yes
coverage:
precision: 2
round: down
range: "50...75"
status:
project: yes
patch: yes
changes: no
parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no
comment:
layout: "reach,diff,flags,tree"
behavior: default
require_changes: no
# - "::login-workflow/" # move root e.g., "path/" => "after/path/" leaving this here for now, it might need turned on later
flag_management:
default_rules:
carryforward: true
statuses:
- type: project
target: auto
threshold: 30%
- type: patch
target: 80%
individual_flags:
- name: unit_tests
paths:
- ./login-workflow/src
carryforward: true
statuses:
- type: project
target: 20%
- type: patch
target: 80%
coverage:
status:
project:
default:
target: 70%
threshold: 5%
informational: true
patch:
default:
target: 70%
threshold: 5%
informational: true
Loading
Loading