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

Rebasing feature branch with main #659

Merged
merged 8 commits into from
Aug 24, 2023

Conversation

JazzarKarim
Copy link
Collaborator

@JazzarKarim JazzarKarim commented Aug 24, 2023

Issue #: /bcgov/entity#16641

Description of changes:

  • Rebasing the branch with main. This is to pull the latest changes of main into the feature branch.

This was a very weird rebase and it took more time than I had hoped it would.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).

eve-git and others added 7 commits August 24, 2023 10:24
…v#637)

* remove currentAccount from session storage if token has expired
* 17088-update wording.

* Update package.json

* Update font.

* remove currentAccount from session storage if token has expired (bcgov#637)

* remove currentAccount from session storage if token has expired

* Update package-lock.json

* 17088-update wording.

* Update font.

* Update package-lock.json

* Update package-lock.json

* Update version.

---------

Co-authored-by: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>
…-5.0.0") (bcgov#614)

* - app version = 5.0.0
- used latest node version
- updated browserslist
- fixed a lint warning
- created mixin-tester.vue
- fixed date-mixin unit test errors
- added babel plugin
- updated axios, core-js, etc
- updated types, test utils, etc
- updated ts config
- added volar config
- changed some imports that gave errors
- removed some "private" modifiers
- added components.d.ts
- deleted shims-tsx.d.ts
- added vue-test-utils-helpers.d.ts
- removed extra Vue.use()
- misc cleanup

* - moved mixin-tester.vue from src/ to tests/
- moved interceptors.ts from sbc-common to local plugins to fix Axios version issue
- other strict:true fixes
- fixed property visibility issue
- fixed catch clause variable issues
- capitalized some plugin functions (eg, navigate -> Navigate)
- fixed some visibility issues
- misc cleanup

* - fixed whitespace around v-rows
- fixed empty object error
- added misc code comments
- changed some class property/method visibilities
* - app version = 5.0.2
- imported latest shared enums
- changed RequestCode to shared NrRequestActionCodes enum
- fixed some whitespace and alignment
- fixed some property/method visibilities
- cleanup up Pick Request Type dialog (removed blurbs, reformatted layout, filtered items)
- implemented new v-select with list items for nested menus
- implemented NameType enum for extraprovincial / assumed names
- updated RequestActions data structure to support nested groups (and new text, etc)
- fixed mobile spacing above nav buttons
- fixed mobile spacing above existing NR buttons
- misc cleanup
- deleted obsolete code

* - fixed slot item variable issues

* - renamed new enum
- reverted declarations

* - removed await from non-async function
- fixed another property visibility issue
- fixed up PickRequestType modal
- implemented some unit tests
- moved and renamed some unit tests
- misc cleanup
* - app version = 5.0.9
- imported latest shared enums
- restored conversion types ULCB and ULBE

* - fixed conversion desc and text capitalizations
@JazzarKarim JazzarKarim self-assigned this Aug 24, 2023
@bcgov bcgov deleted a comment from pwei1018 Aug 24, 2023
@JazzarKarim
Copy link
Collaborator Author

/gcbrun

@pwei1018
Copy link
Collaborator

Temporary Url for review: https://namerequest-dev--pr-659-lvih9we3.web.app

Copy link
Collaborator

@severinbeauvais severinbeauvais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I compared these PR changes with feature-way-of-navigating...main and they match (except for the change in conversion-types.ts which is already in the feature branch).

Copy link
Collaborator

@ketaki-deodhar ketaki-deodhar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cross checked commits with main (there were only 3). Looks good

Copy link
Collaborator

@chenhongjing chenhongjing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐱

@severinbeauvais severinbeauvais merged commit b5be8e5 into bcgov:feature-way-of-navigating Aug 24, 2023
5 checks passed
severinbeauvais added a commit to severinbeauvais/namerequest that referenced this pull request Aug 29, 2023
* add two new alteration request types (bcgov#621)

* remove currentAccount from session storage if token has expired (bcgov#637)

* remove currentAccount from session storage if token has expired

* 17088-update wording. (bcgov#634)

* 17088-update wording.

* Update package.json

* Update font.

* remove currentAccount from session storage if token has expired (bcgov#637)

* remove currentAccount from session storage if token has expired

* Update package-lock.json

* 17088-update wording.

* Update font.

* Update package-lock.json

* Update package-lock.json

* Update version.

---------

Co-authored-by: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>

* 16634 Base changes for "way of navigating" story (new branch "release-5.0.0") (bcgov#614)

* - app version = 5.0.0
- used latest node version
- updated browserslist
- fixed a lint warning
- created mixin-tester.vue
- fixed date-mixin unit test errors
- added babel plugin
- updated axios, core-js, etc
- updated types, test utils, etc
- updated ts config
- added volar config
- changed some imports that gave errors
- removed some "private" modifiers
- added components.d.ts
- deleted shims-tsx.d.ts
- added vue-test-utils-helpers.d.ts
- removed extra Vue.use()
- misc cleanup

* - moved mixin-tester.vue from src/ to tests/
- moved interceptors.ts from sbc-common to local plugins to fix Axios version issue
- other strict:true fixes
- fixed property visibility issue
- fixed catch clause variable issues
- capitalized some plugin functions (eg, navigate -> Navigate)
- fixed some visibility issues
- misc cleanup

* - fixed whitespace around v-rows
- fixed empty object error
- added misc code comments
- changed some class property/method visibilities

* 16634 Implemented new actions menu + cleanup (bcgov#616)

* - app version = 5.0.2
- imported latest shared enums
- changed RequestCode to shared NrRequestActionCodes enum
- fixed some whitespace and alignment
- fixed some property/method visibilities
- cleanup up Pick Request Type dialog (removed blurbs, reformatted layout, filtered items)
- implemented new v-select with list items for nested menus
- implemented NameType enum for extraprovincial / assumed names
- updated RequestActions data structure to support nested groups (and new text, etc)
- fixed mobile spacing above nav buttons
- fixed mobile spacing above existing NR buttons
- misc cleanup
- deleted obsolete code

* - fixed slot item variable issues

* - renamed new enum
- reverted declarations

* - removed await from non-async function
- fixed another property visibility issue
- fixed up PickRequestType modal
- implemented some unit tests
- moved and renamed some unit tests
- misc cleanup

* Imported latest codes + restored ULCB and ULBE (bcgov#630)

* - app version = 5.0.9
- imported latest shared enums
- restored conversion types ULCB and ULBE

* - fixed conversion desc and text capitalizations

* Fixed rebase issues + package version

* fixed super small rebase issue

---------

Co-authored-by: eve-git <54647458+eve-git@users.noreply.github.com>
Co-authored-by: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>
Co-authored-by: mengdong19 <meng.dong@gov.bc.ca>
Co-authored-by: Séverin Beauvais <severinbeauvais@users.noreply.github.com>
JazzarKarim added a commit to JazzarKarim/namerequest that referenced this pull request Sep 8, 2023
* add two new alteration request types (bcgov#621)

* remove currentAccount from session storage if token has expired (bcgov#637)

* remove currentAccount from session storage if token has expired

* 17088-update wording. (bcgov#634)

* 17088-update wording.

* Update package.json

* Update font.

* remove currentAccount from session storage if token has expired (bcgov#637)

* remove currentAccount from session storage if token has expired

* Update package-lock.json

* 17088-update wording.

* Update font.

* Update package-lock.json

* Update package-lock.json

* Update version.

---------

Co-authored-by: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>

* 16634 Base changes for "way of navigating" story (new branch "release-5.0.0") (bcgov#614)

* - app version = 5.0.0
- used latest node version
- updated browserslist
- fixed a lint warning
- created mixin-tester.vue
- fixed date-mixin unit test errors
- added babel plugin
- updated axios, core-js, etc
- updated types, test utils, etc
- updated ts config
- added volar config
- changed some imports that gave errors
- removed some "private" modifiers
- added components.d.ts
- deleted shims-tsx.d.ts
- added vue-test-utils-helpers.d.ts
- removed extra Vue.use()
- misc cleanup

* - moved mixin-tester.vue from src/ to tests/
- moved interceptors.ts from sbc-common to local plugins to fix Axios version issue
- other strict:true fixes
- fixed property visibility issue
- fixed catch clause variable issues
- capitalized some plugin functions (eg, navigate -> Navigate)
- fixed some visibility issues
- misc cleanup

* - fixed whitespace around v-rows
- fixed empty object error
- added misc code comments
- changed some class property/method visibilities

* 16634 Implemented new actions menu + cleanup (bcgov#616)

* - app version = 5.0.2
- imported latest shared enums
- changed RequestCode to shared NrRequestActionCodes enum
- fixed some whitespace and alignment
- fixed some property/method visibilities
- cleanup up Pick Request Type dialog (removed blurbs, reformatted layout, filtered items)
- implemented new v-select with list items for nested menus
- implemented NameType enum for extraprovincial / assumed names
- updated RequestActions data structure to support nested groups (and new text, etc)
- fixed mobile spacing above nav buttons
- fixed mobile spacing above existing NR buttons
- misc cleanup
- deleted obsolete code

* - fixed slot item variable issues

* - renamed new enum
- reverted declarations

* - removed await from non-async function
- fixed another property visibility issue
- fixed up PickRequestType modal
- implemented some unit tests
- moved and renamed some unit tests
- misc cleanup

* Imported latest codes + restored ULCB and ULBE (bcgov#630)

* - app version = 5.0.9
- imported latest shared enums
- restored conversion types ULCB and ULBE

* - fixed conversion desc and text capitalizations

* Fixed rebase issues + package version

* fixed super small rebase issue

---------

Co-authored-by: eve-git <54647458+eve-git@users.noreply.github.com>
Co-authored-by: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>
Co-authored-by: mengdong19 <meng.dong@gov.bc.ca>
Co-authored-by: Séverin Beauvais <severinbeauvais@users.noreply.github.com>
JazzarKarim added a commit that referenced this pull request Sep 11, 2023
* add two new alteration request types (#621)

* remove currentAccount from session storage if token has expired (#637)

* remove currentAccount from session storage if token has expired

* 17088-update wording. (#634)

* 17088-update wording.

* Update package.json

* Update font.

* remove currentAccount from session storage if token has expired (#637)

* remove currentAccount from session storage if token has expired

* Update package-lock.json

* 17088-update wording.

* Update font.

* Update package-lock.json

* Update package-lock.json

* Update version.

---------

Co-authored-by: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>

* 16634 Base changes for "way of navigating" story (new branch "release-5.0.0") (#614)

* - app version = 5.0.0
- used latest node version
- updated browserslist
- fixed a lint warning
- created mixin-tester.vue
- fixed date-mixin unit test errors
- added babel plugin
- updated axios, core-js, etc
- updated types, test utils, etc
- updated ts config
- added volar config
- changed some imports that gave errors
- removed some "private" modifiers
- added components.d.ts
- deleted shims-tsx.d.ts
- added vue-test-utils-helpers.d.ts
- removed extra Vue.use()
- misc cleanup

* - moved mixin-tester.vue from src/ to tests/
- moved interceptors.ts from sbc-common to local plugins to fix Axios version issue
- other strict:true fixes
- fixed property visibility issue
- fixed catch clause variable issues
- capitalized some plugin functions (eg, navigate -> Navigate)
- fixed some visibility issues
- misc cleanup

* - fixed whitespace around v-rows
- fixed empty object error
- added misc code comments
- changed some class property/method visibilities

* 16634 Implemented new actions menu + cleanup (#616)

* - app version = 5.0.2
- imported latest shared enums
- changed RequestCode to shared NrRequestActionCodes enum
- fixed some whitespace and alignment
- fixed some property/method visibilities
- cleanup up Pick Request Type dialog (removed blurbs, reformatted layout, filtered items)
- implemented new v-select with list items for nested menus
- implemented NameType enum for extraprovincial / assumed names
- updated RequestActions data structure to support nested groups (and new text, etc)
- fixed mobile spacing above nav buttons
- fixed mobile spacing above existing NR buttons
- misc cleanup
- deleted obsolete code

* - fixed slot item variable issues

* - renamed new enum
- reverted declarations

* - removed await from non-async function
- fixed another property visibility issue
- fixed up PickRequestType modal
- implemented some unit tests
- moved and renamed some unit tests
- misc cleanup

* Imported latest codes + restored ULCB and ULBE (#630)

* - app version = 5.0.9
- imported latest shared enums
- restored conversion types ULCB and ULBE

* - fixed conversion desc and text capitalizations

* Fixed rebase issues + package version

* fixed super small rebase issue

---------

Co-authored-by: eve-git <54647458+eve-git@users.noreply.github.com>
Co-authored-by: Andrew Bolyachevets <Andriy.Bolyachevets@gov.bc.ca>
Co-authored-by: mengdong19 <meng.dong@gov.bc.ca>
Co-authored-by: Séverin Beauvais <severinbeauvais@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants