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.

Sign up for GitHub

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

Updating dev with new main changes #6

Merged
merged 7 commits into from
Dec 24, 2024
Merged

Updating dev with new main changes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5bf5b35
Merge pull request #2 from bcgov/dev
npham49 Nov 18, 2024
136853f
adding the Role indicator back to the Generator and removing redundan…
npham49 Nov 25, 2024
a89d177
Merge pull request #3 from bcgov/dev
npham49 Nov 28, 2024
f5aa6af
Merge pull request #4 from bcgov/test
npham49 Nov 28, 2024
cf33109
Small hotfix on prod
npham49 Dec 24, 2024
4ec82ae
Update worksheet.ts with triming logic
npham49 Dec 24, 2024
436bdfc
Merge pull request #5 from bcgov/adding-trim
npham49 Dec 24, 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
4 changes: 2 additions & 2 deletions client/src/components/bcgov/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ const environment = import.meta.env.VITE_ENVIRONMENT || "local";
id="roleButton"
color="secondary"
variant="plain"
v-if="authStore.authenticated && environment === 'dev'"
v-if="authStore.authenticated"
readonly
>
({{ environment }}) Role: {{ authStore.user.role }}
Role: {{ authStore.user.role }}
</v-btn>
<v-btn
id="loginButton"
Expand Down
4 changes: 4 additions & 0 deletions client/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ router.beforeEach(async (to, _from, next) => {
}
});

if (to.name === "NotInitialized") {
destination = "Financial";
}

authStore.updateRole(role[0].role);
} catch (error) {
console.error("Error fetching RLS Role", error);
Expand Down
Loading