From 4f7633be7f85d2d95daf42a3a8c4034ef9754bae Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Sun, 2 Feb 2025 19:39:39 -0600 Subject: [PATCH 1/4] fixing log view edit error --- api/src/auth/auth.strategy.ts | 1 - app/src/components/logForm/LogForm.tsx | 2 +- app/src/components/siteNav/SiteNav.tsx | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/api/src/auth/auth.strategy.ts b/api/src/auth/auth.strategy.ts index 05d86b0..cd521a4 100644 --- a/api/src/auth/auth.strategy.ts +++ b/api/src/auth/auth.strategy.ts @@ -10,7 +10,6 @@ export class AzureAdStrategy extends PassportStrategy( 'azure-ad' ) { constructor(@Inject(MODULE_OPTIONS_TOKEN) authModuleOptions: AuthModuleOptions) { - console.log(authModuleOptions) super({ identityMetadata: `https://login.microsoftonline.com/${authModuleOptions.tenantId}/.well-known/openid-configuration`, clientID: authModuleOptions.clientId, diff --git a/app/src/components/logForm/LogForm.tsx b/app/src/components/logForm/LogForm.tsx index 4253c1c..00b0b79 100644 --- a/app/src/components/logForm/LogForm.tsx +++ b/app/src/components/logForm/LogForm.tsx @@ -118,7 +118,7 @@ const LogForm: React.FC = ({ ? { headers: { Authorization: await getAccessToken() } } : {}; const response: AxiosResponse = await httpClient.get( - `api/logs/${entryId}`, + `api/logs/log/${entryId}`, config ); const entry = response.data; diff --git a/app/src/components/siteNav/SiteNav.tsx b/app/src/components/siteNav/SiteNav.tsx index d6f51c7..6830110 100644 --- a/app/src/components/siteNav/SiteNav.tsx +++ b/app/src/components/siteNav/SiteNav.tsx @@ -67,7 +67,6 @@ const SiteNav: React.FC = () => { } }; const getUserPhoto = async (accessToken: string): Promise => { - console.log(accessToken) try { const response: AxiosResponse = await httpClient.get(`api/userPhoto`, { headers: { -- 2.49.1 From 38d046eb0565fe99c4fd47781043891fa58f850e Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Sun, 2 Feb 2025 19:42:07 -0600 Subject: [PATCH 2/4] fixing log view edit error --- .github/workflows/changes.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/changes.yaml diff --git a/.github/workflows/changes.yaml b/.github/workflows/changes.yaml new file mode 100644 index 0000000..917786e --- /dev/null +++ b/.github/workflows/changes.yaml @@ -0,0 +1,28 @@ +name: Changes +on: + workflow_call: + outputs: + api: + value: ${{ jobs.changes.outputs.api }} + app: + value: ${{ jobs.changes.outputs.app }} + +jobs: + changes: + name: filter + runs-on: ubuntu-latest + outputs: + api: ${{ steps.filter.outputs.api }} + app: ${{ steps.filter.outputs.app }} + steps: + - uses: actions/checkout@v3 + + - uses: dorny/paths-filter@v3 + id: filter + with: + initial-fetch-depth: 2 + filters: | + api: + - 'api/**' + app: + - 'app/**' \ No newline at end of file -- 2.49.1 From b04b67ea70f48277247e7ea8eeb2de784e483c37 Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Sun, 2 Feb 2025 19:46:29 -0600 Subject: [PATCH 3/4] fixing log view edit error --- .github/workflows/main.yaml | 15 +++++++++++++-- .github/workflows/pull_request.yaml | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 0b813d9..02b1304 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,8 +5,13 @@ on: - main jobs: + changes: + uses: ./.github/workflows/changes.yaml + build-api: name: build-api + needs: + - changes uses: ./.github/workflows/api_build.yaml with: environment_name: test @@ -15,7 +20,9 @@ jobs: deploy-api: name: deploy-api - needs: build-api + needs: + - changes + - build-api uses: ./.github/workflows/deploy.yaml with: app_name: flying-app @@ -25,6 +32,8 @@ jobs: build-app: name: build-app + needs: + - changes uses: ./.github/workflows/app_build.yaml with: environment_name: test @@ -33,7 +42,9 @@ jobs: deploy-app: name: deploy-app - needs: build-app + needs: + - changes + - build-app uses: ./.github/workflows/deploy.yaml with: app_name: flying-app diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 20549c0..77739c6 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -4,8 +4,13 @@ on: pull_request: jobs: + changes: + uses: ./.github/workflows/changes.yaml + build-api: name: build-api + needs: + - changes uses: ./.github/workflows/api_build.yaml with: environment_name: pull_request @@ -14,6 +19,8 @@ jobs: build-app: name: build-app + needs: + - changes uses: ./.github/workflows/app_build.yaml with: environment_name: pull_request -- 2.49.1 From 590803130234df337aef3547ed535fae220e385b Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Sun, 2 Feb 2025 19:49:07 -0600 Subject: [PATCH 4/4] fixing log view edit error --- .github/workflows/main.yaml | 2 ++ .github/workflows/pull_request.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 02b1304..b40eb2a 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,6 +9,7 @@ jobs: uses: ./.github/workflows/changes.yaml build-api: + if: ${{ needs.changes.outputs.api == 'true' }} name: build-api needs: - changes @@ -31,6 +32,7 @@ jobs: secrets: inherit build-app: + if: ${{ needs.changes.outputs.app == 'true' }} name: build-app needs: - changes diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 77739c6..3de7e68 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -8,6 +8,7 @@ jobs: uses: ./.github/workflows/changes.yaml build-api: + if: ${{ needs.changes.outputs.api == 'true' }} name: build-api needs: - changes @@ -18,6 +19,7 @@ jobs: secrets: inherit build-app: + if: ${{ needs.changes.outputs.app == 'true' }} name: build-app needs: - changes -- 2.49.1