From 36241a42cc292056eb27189c8f64a6f1d01d4204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 10:18:58 -0700 Subject: [PATCH 01/47] Bump path-parse from 1.0.6 to 1.0.7 in /vue/sbc-common-components (#238) Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From a8a2074b12dbf36cc23634206e37d57ccfa5a33d Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Fri, 17 Mar 2023 14:33:11 -0700 Subject: [PATCH 02/47] Update nodejs.yml (#321) --- .github/workflows/nodejs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 9cde1381..01edc4da 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -5,6 +5,7 @@ on: branches: master paths: - '**package.json' + workflow_dispatch: jobs: build: From 4797a3dc317382a44bf12a805dec663363444541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9verin=20Beauvais?= Date: Thu, 27 Apr 2023 13:14:22 -0700 Subject: [PATCH 03/47] Update common-util.ts changed a "var" to a "let" --- vue/sbc-common-components/src/util/common-util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/sbc-common-components/src/util/common-util.ts b/vue/sbc-common-components/src/util/common-util.ts index 3878f458..799e61fe 100644 --- a/vue/sbc-common-components/src/util/common-util.ts +++ b/vue/sbc-common-components/src/util/common-util.ts @@ -5,7 +5,7 @@ import { SessionStorageKeys, ACCOUNT_ID } from './constants' * Place to put all the custom utility methods */ export function getBoolean (value: boolean | string | number): boolean { - var resultVal = value + let resultVal = value if (typeof value === 'string') { resultVal = value.toLowerCase() } From b93585ea3ac273b9e51c4dd5ddbc8190fd95da6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9verin=20Beauvais?= Date: Thu, 27 Apr 2023 13:42:26 -0700 Subject: [PATCH 04/47] Update config-helper.ts fixed a redundant string declaration --- vue/sbc-common-components/src/util/config-helper.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vue/sbc-common-components/src/util/config-helper.ts b/vue/sbc-common-components/src/util/config-helper.ts index 0979e5c2..85ec420a 100644 --- a/vue/sbc-common-components/src/util/config-helper.ts +++ b/vue/sbc-common-components/src/util/config-helper.ts @@ -2,7 +2,8 @@ import { SessionStorageKeys } from './constants' import { trimTrailingSlashURL } from './common-util' export default class ConfigHelper { - static keycloakConfigUrl: string = '' + static keycloakConfigUrl = '' + static addToSession (key: string, value: any): void { sessionStorage.setItem(key, value) } From 9a91dad132594ff436651744188c237aa352fc1f Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Fri, 28 Jul 2023 12:28:11 -0700 Subject: [PATCH 05/47] Update vue-ci.yml (#331) --- .github/workflows/vue-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/vue-ci.yml b/.github/workflows/vue-ci.yml index a5a30918..8b87fefd 100644 --- a/.github/workflows/vue-ci.yml +++ b/.github/workflows/vue-ci.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - 4.0.0-vue3 paths: - "vue/sbc-common-components/**" From 594804a40292840f91c596b034a7574ca96ce5fc Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Wed, 27 Sep 2023 10:14:09 -0700 Subject: [PATCH 06/47] Fix default for getFlag. (#334) --- vue/sbc-common-components/package-lock.json | 4 ++-- vue/sbc-common-components/package.json | 2 +- .../src/services/launchdarkly.services.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vue/sbc-common-components/package-lock.json b/vue/sbc-common-components/package-lock.json index b6016473..d310fbc7 100644 --- a/vue/sbc-common-components/package-lock.json +++ b/vue/sbc-common-components/package-lock.json @@ -1,12 +1,12 @@ { "name": "sbc-common-components", - "version": "3.0.8", + "version": "3.0.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sbc-common-components", - "version": "3.0.8", + "version": "3.0.9", "license": "Apache-2.0", "dependencies": { "@mdi/font": "^4.5.95", diff --git a/vue/sbc-common-components/package.json b/vue/sbc-common-components/package.json index 6e850a6f..26d19351 100644 --- a/vue/sbc-common-components/package.json +++ b/vue/sbc-common-components/package.json @@ -1,6 +1,6 @@ { "name": "sbc-common-components", - "version": "3.0.8", + "version": "3.0.9", "private": false, "description": "Common Vue Components to be used across BC Registries and Online Services.", "license": "Apache-2.0", diff --git a/vue/sbc-common-components/src/services/launchdarkly.services.ts b/vue/sbc-common-components/src/services/launchdarkly.services.ts index b9c66cb1..50b53faf 100644 --- a/vue/sbc-common-components/src/services/launchdarkly.services.ts +++ b/vue/sbc-common-components/src/services/launchdarkly.services.ts @@ -47,9 +47,9 @@ class LaunchDarklyService { ConfigHelper.addToSession(SessionStorageKeys.LaunchDarklyFlags, JSON.stringify(this.ldClient.allFlags())) } - public getFlag (flagName: string): any { + public getFlag (flagName: string, defaultValue = null): any { const ldFlags = JSON.parse(ConfigHelper.getFromSession(SessionStorageKeys.LaunchDarklyFlags) || '{}') - return (this.flags && this.flags[flagName]) || (ldFlags && ldFlags[flagName]) + return (this.flags && this.flags[flagName]) || (ldFlags && ldFlags[flagName]) || defaultValue } } From 1aa7dc8ed3897ad4bf679c789ac6c66c88550bfe Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Tue, 3 Oct 2023 11:45:07 -0700 Subject: [PATCH 07/47] Fix serialize array (#335) * Fix serialize array * Fix type hint * use list comprehension --- .../src/sbc_common_components/utils/camel_case_response.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/src/sbc_common_components/utils/camel_case_response.py b/python/src/sbc_common_components/utils/camel_case_response.py index 0a983bcb..3fa283e4 100644 --- a/python/src/sbc_common_components/utils/camel_case_response.py +++ b/python/src/sbc_common_components/utils/camel_case_response.py @@ -39,9 +39,12 @@ def camelcase(string): ]) -def camelcase_dict(data: Dict[str, any], camel_dict: Dict[str, any]): +def camelcase_dict(data, camel_dict: Dict[str, any]): """Iterate through the dict and convert to camel case.""" if data: + # Handle the scenario where we aren't a dict + if isinstance(data, list): + return [camelcase_dict(item, {}) for item in data] for key, value in data.items(): key = camelcase(key) if isinstance(value, dict): From d5053bda674795c0440ac843754f7e4683e78305 Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Tue, 5 Dec 2023 13:10:28 -0800 Subject: [PATCH 08/47] Add in http_logger, we can use this in DEV/TEST, but not PROD. (#342) --- .../exception_handling/exception_handler.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/src/sbc_common_components/exception_handling/exception_handler.py b/python/src/sbc_common_components/exception_handling/exception_handler.py index 8a2ab2fb..4c3cec46 100644 --- a/python/src/sbc_common_components/exception_handling/exception_handler.py +++ b/python/src/sbc_common_components/exception_handling/exception_handler.py @@ -17,6 +17,7 @@ from werkzeug.exceptions import HTTPException, default_exceptions import logging logger = logging.getLogger('api-exceptions') +http_logger = logging.getLogger('api-exceptions-http') RESPONSE_HEADERS = {'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*'} @@ -31,7 +32,7 @@ def __init__(self, app=None): def auth_handler(self, error): # pylint: disable=no-self-use """Handle AuthError.""" - logger.error(error.error) + http_logger.error(error.error) return error.error, error.status_code, RESPONSE_HEADERS def db_handler(self, error): # pylint: disable=no-self-use @@ -46,7 +47,7 @@ def db_handler(self, error): # pylint: disable=no-self-use def std_handler(self, error): # pylint: disable=no-self-use """Handle standard exception.""" if isinstance(error, HTTPException): - logger.error(error) + http_logger.error(error) message = dict(message=error.message if hasattr(error, 'message') else error.description) else: logger.exception(error) From 87a5ee9eac495530307c9c03b940464816d73084 Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Thu, 4 Jan 2024 11:03:20 -0800 Subject: [PATCH 09/47] Allow signout (#345) --- vue/sbc-common-components/package-lock.json | 4 ++-- vue/sbc-common-components/package.json | 2 +- vue/sbc-common-components/src/util/constants.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vue/sbc-common-components/package-lock.json b/vue/sbc-common-components/package-lock.json index d310fbc7..a093da69 100644 --- a/vue/sbc-common-components/package-lock.json +++ b/vue/sbc-common-components/package-lock.json @@ -1,12 +1,12 @@ { "name": "sbc-common-components", - "version": "3.0.9", + "version": "3.0.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sbc-common-components", - "version": "3.0.9", + "version": "3.0.10", "license": "Apache-2.0", "dependencies": { "@mdi/font": "^4.5.95", diff --git a/vue/sbc-common-components/package.json b/vue/sbc-common-components/package.json index 26d19351..c163ce1d 100644 --- a/vue/sbc-common-components/package.json +++ b/vue/sbc-common-components/package.json @@ -1,6 +1,6 @@ { "name": "sbc-common-components", - "version": "3.0.9", + "version": "3.0.10", "private": false, "description": "Common Vue Components to be used across BC Registries and Online Services.", "license": "Apache-2.0", diff --git a/vue/sbc-common-components/src/util/constants.ts b/vue/sbc-common-components/src/util/constants.ts index 666ec447..cda708e8 100644 --- a/vue/sbc-common-components/src/util/constants.ts +++ b/vue/sbc-common-components/src/util/constants.ts @@ -62,6 +62,6 @@ export enum Pages { REGISTRY_DASHBOARD = 'dashboard' } -export const ALLOWED_URIS_FOR_PENDING_ORGS: string[] = ['setup-non-bcsc-account'] +export const ALLOWED_URIS_FOR_PENDING_ORGS: string[] = ['setup-non-bcsc-account', 'signout'] export const ACCOUNT_ID = 'accountid' From 2258ec648ce096ff0ac5f06b06551741664e602e Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Thu, 4 Jan 2024 11:30:52 -0800 Subject: [PATCH 10/47] Minor changes (#346) --- vue/sbc-common-components/package-lock.json | 4 +-- vue/sbc-common-components/package.json | 2 +- .../src/components/BaseAddress.vue | 2 +- .../tests/unit/notification.services.spec.ts | 34 ------------------- 4 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 vue/sbc-common-components/tests/unit/notification.services.spec.ts diff --git a/vue/sbc-common-components/package-lock.json b/vue/sbc-common-components/package-lock.json index a093da69..f7cdeb76 100644 --- a/vue/sbc-common-components/package-lock.json +++ b/vue/sbc-common-components/package-lock.json @@ -1,12 +1,12 @@ { "name": "sbc-common-components", - "version": "3.0.10", + "version": "3.0.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sbc-common-components", - "version": "3.0.10", + "version": "3.0.11", "license": "Apache-2.0", "dependencies": { "@mdi/font": "^4.5.95", diff --git a/vue/sbc-common-components/package.json b/vue/sbc-common-components/package.json index c163ce1d..bffd0e85 100644 --- a/vue/sbc-common-components/package.json +++ b/vue/sbc-common-components/package.json @@ -1,6 +1,6 @@ { "name": "sbc-common-components", - "version": "3.0.10", + "version": "3.0.11", "private": false, "description": "Common Vue Components to be used across BC Registries and Online Services.", "license": "Apache-2.0", diff --git a/vue/sbc-common-components/src/components/BaseAddress.vue b/vue/sbc-common-components/src/components/BaseAddress.vue index c9978949..be242c09 100644 --- a/vue/sbc-common-components/src/components/BaseAddress.vue +++ b/vue/sbc-common-components/src/components/BaseAddress.vue @@ -199,7 +199,7 @@ export default class BaseAddress extends Mixins(ValidationMixin, CountriesProvin @Prop({ default: false }) readonly noPoBox: boolean - resetRegion() { + resetRegion () { this.addressLocal['addressRegion'] = '' } diff --git a/vue/sbc-common-components/tests/unit/notification.services.spec.ts b/vue/sbc-common-components/tests/unit/notification.services.spec.ts deleted file mode 100644 index 8fc98d5e..00000000 --- a/vue/sbc-common-components/tests/unit/notification.services.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -// users.test.js -import Axios from 'axios' -import NotificationServices from '../../src/services/notification.services' -import { SessionStorageKeys } from '@/util/constants' - -jest.mock('axios', () => ({ - get: jest.fn(), - all: jest.fn(), - spread: jest.fn() -}), { - virtual: true -}) - -const API_URL = 'https://status-api-dev.pathfinder.gov.bc.ca/api/v1' - -describe('get status for notification service', () => { - const results: any = [] - const mockAxiosSpreadResult = jest.fn() - beforeAll(() => { - // @ts-ignore - Axios.get.mockClear() - // @ts-ignore - Axios.all.mockResolvedValue(results) - // @ts-ignore - Axios.spread.mockReturnValue(mockAxiosSpreadResult) - sessionStorage.__STORE__[SessionStorageKeys.ApiConfigKey] = JSON.stringify({ VUE_APP_STATUS_ROOT_API: API_URL }) - NotificationServices.getNotifications() - }) - - // Broken, skip - it.skip('should call Axios.get once for status ', () => { - expect(Axios.get).toHaveBeenCalledWith(`${API_URL}/whatsnew`) - }) -}) From 5807c201b057875f9061f60b408ab765ebaa4235 Mon Sep 17 00:00:00 2001 From: kris-daxiom <143851280+kris-daxiom@users.noreply.github.com> Date: Mon, 4 Mar 2024 19:09:17 -0800 Subject: [PATCH 11/47] no message (#349) --- python/src/sbc_common_components/__init__.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 python/src/sbc_common_components/__init__.py diff --git a/python/src/sbc_common_components/__init__.py b/python/src/sbc_common_components/__init__.py new file mode 100644 index 00000000..9b5291da --- /dev/null +++ b/python/src/sbc_common_components/__init__.py @@ -0,0 +1,14 @@ +# Copyright © 2019 Province of British Columbia +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""This module holds general utility functions and helpers for the main package.""" From 5f99e135214ae949c9af951d4aa0b88b1067d853 Mon Sep 17 00:00:00 2001 From: Travis Semple Date: Mon, 11 Mar 2024 11:29:23 -0700 Subject: [PATCH 12/47] Fix sbc-auth unit tests (#350) --- python/requirements.txt | 2 +- python/requirements/prod.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/requirements.txt b/python/requirements.txt index d02b6448..3a7de01f 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,4 +1,4 @@ -Flask-OpenTracing +Flask-OpenTracing==1.1.0 Flask-SQLAlchemy Flask Jinja2 diff --git a/python/requirements/prod.txt b/python/requirements/prod.txt index 7c2b776e..bd31aed8 100644 --- a/python/requirements/prod.txt +++ b/python/requirements/prod.txt @@ -1,5 +1,5 @@ flask Flask-SQLAlchemy flask-jwt-oidc>=0.1.5 -Flask-OpenTracing -jaeger-client \ No newline at end of file +Flask-OpenTracing==1.1.0 +jaeger-client From 8871ffcce8cc2232a5d7a3adb6103dfaf0d7689f Mon Sep 17 00:00:00 2001 From: eve-git <54647458+eve-git@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:28:00 -0700 Subject: [PATCH 13/47] add release notes (#351) --- vue/sbc-common-components/package-lock.json | 4 ++-- vue/sbc-common-components/package.json | 2 +- vue/sbc-common-components/src/components/SbcFooter.vue | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vue/sbc-common-components/package-lock.json b/vue/sbc-common-components/package-lock.json index f7cdeb76..0f6a71fd 100644 --- a/vue/sbc-common-components/package-lock.json +++ b/vue/sbc-common-components/package-lock.json @@ -1,12 +1,12 @@ { "name": "sbc-common-components", - "version": "3.0.11", + "version": "3.0.12", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "sbc-common-components", - "version": "3.0.11", + "version": "3.0.12", "license": "Apache-2.0", "dependencies": { "@mdi/font": "^4.5.95", diff --git a/vue/sbc-common-components/package.json b/vue/sbc-common-components/package.json index bffd0e85..11b9fabc 100644 --- a/vue/sbc-common-components/package.json +++ b/vue/sbc-common-components/package.json @@ -1,6 +1,6 @@ { "name": "sbc-common-components", - "version": "3.0.11", + "version": "3.0.12", "private": false, "description": "Common Vue Components to be used across BC Registries and Online Services.", "license": "Apache-2.0", diff --git a/vue/sbc-common-components/src/components/SbcFooter.vue b/vue/sbc-common-components/src/components/SbcFooter.vue index 15cacbee..6fa4d230 100644 --- a/vue/sbc-common-components/src/components/SbcFooter.vue +++ b/vue/sbc-common-components/src/components/SbcFooter.vue @@ -4,6 +4,7 @@