diff --git a/.github/workflows/alert-dolly.yml b/.github/workflows/alert-dolly.yml index c10a4f3fdc3..daf429a742d 100644 --- a/.github/workflows/alert-dolly.yml +++ b/.github/workflows/alert-dolly.yml @@ -7,6 +7,7 @@ on: jobs: apply-alerts: name: Apply alerts to cluster + if: github.event.pull_request.draft == false runs-on: ubuntu-latest permissions: contents: read @@ -18,4 +19,4 @@ jobs: uses: nais/deploy/actions/deploy@v2 env: CLUSTER: dev-gcp - RESOURCE: .nais/alerting-dolly.yml \ No newline at end of file + RESOURCE: ".nais/alerting-dolly.yml" \ No newline at end of file diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml index 0d7e273dd1f..e773ca59994 100644 --- a/.github/workflows/app.team-dolly-lokal-app.yml +++ b/.github/workflows/app.team-dolly-lokal-app.yml @@ -9,6 +9,7 @@ on: jobs: deploy: name: Deploy team-dolly-lokal-app + if: github.event.pull_request.draft == false runs-on: ubuntu-latest permissions: contents: read @@ -18,4 +19,4 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: CLUSTER: dev-gcp - RESOURCE: .nais/team-dolly-lokal-app.yml \ No newline at end of file + RESOURCE: ".nais/team-dolly-lokal-app.yml" \ No newline at end of file diff --git a/.github/workflows/common.workflow.backend.yml b/.github/workflows/common.workflow.backend.yml index ed4dcb3536a..bfad19a2071 100644 --- a/.github/workflows/common.workflow.backend.yml +++ b/.github/workflows/common.workflow.backend.yml @@ -54,6 +54,7 @@ on: jobs: start: + if: github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - name: "Logging" @@ -127,7 +128,7 @@ jobs: uses: nais/deploy/actions/deploy@v2 env: CLUSTER: ${{ inputs.cluster }} - RESOURCE: ${{ inputs.working-directory }}/${{ inputs.nais-manifest }} + RESOURCE: "${{ inputs.working-directory }}/${{ inputs.nais-manifest }}" VAR: image=${{ needs.build.outputs.image }} deploy-test: @@ -142,5 +143,5 @@ jobs: uses: nais/deploy/actions/deploy@v2 env: CLUSTER: ${{ inputs.cluster }} - RESOURCE: ${{ inputs.working-directory }}/config.test.yml + RESOURCE: "${{ inputs.working-directory }}/config.test.yml" VAR: image=${{ needs.build.outputs.image }} \ No newline at end of file diff --git a/.github/workflows/common.workflow.frontend.yml b/.github/workflows/common.workflow.frontend.yml index 4dc4e688ee2..2a5d07c59d0 100644 --- a/.github/workflows/common.workflow.frontend.yml +++ b/.github/workflows/common.workflow.frontend.yml @@ -69,6 +69,7 @@ on: jobs: start: + if: github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - name: "Logging" @@ -164,7 +165,7 @@ jobs: uses: nais/deploy/actions/deploy@v2 env: CLUSTER: ${{ inputs.cluster }} - RESOURCE: ${{ inputs.working-directory }}/config.yml + RESOURCE: "${{ inputs.working-directory }}/config.yml" VAR: image=${{ needs.build.outputs.image }} deploy-test: @@ -179,7 +180,7 @@ jobs: uses: nais/deploy/actions/deploy@v2 env: CLUSTER: ${{ inputs.cluster }} - RESOURCE: ${{ inputs.working-directory }}/config.test.yml + RESOURCE: "${{ inputs.working-directory }}/config.test.yml" VAR: image=${{ needs.build.outputs.image }} # Only used by dolly-frontend. @@ -195,7 +196,7 @@ jobs: uses: nais/deploy/actions/deploy@v2 env: CLUSTER: ${{ inputs.cluster }} - RESOURCE: ${{ inputs.working-directory }}/config.idporten.yml + RESOURCE: "${{ inputs.working-directory }}/config.idporten.yml" VAR: image=${{ needs.build.outputs.image }} # Only used by dolly-frontend. @@ -211,5 +212,5 @@ jobs: uses: nais/deploy/actions/deploy@v2 env: CLUSTER: ${{ inputs.cluster }} - RESOURCE: ${{ inputs.working-directory }}/config.unstable.yml + RESOURCE: "${{ inputs.working-directory }}/config.unstable.yml" VAR: image=${{ needs.build.outputs.image }} \ No newline at end of file diff --git a/.github/workflows/common.workflow.libs.backend.yml b/.github/workflows/common.workflow.libs.backend.yml index fc39c8ee9fd..9231075c4c7 100644 --- a/.github/workflows/common.workflow.libs.backend.yml +++ b/.github/workflows/common.workflow.libs.backend.yml @@ -19,6 +19,7 @@ on: jobs: start: + if: github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - name: "Logging" diff --git a/.github/workflows/common.workflow.libs.frontend.yml b/.github/workflows/common.workflow.libs.frontend.yml index 2045a21a9e5..41b4351a52e 100644 --- a/.github/workflows/common.workflow.libs.frontend.yml +++ b/.github/workflows/common.workflow.libs.frontend.yml @@ -12,6 +12,7 @@ on: jobs: start: + if: github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - name: "Logging" diff --git a/.github/workflows/idporten.yml b/.github/workflows/idporten.yml index f7f74d0b59e..0b21f978cf2 100644 --- a/.github/workflows/idporten.yml +++ b/.github/workflows/idporten.yml @@ -9,6 +9,7 @@ on: jobs: deploy-idporten: + if: github.event.pull_request.draft == false name: Deploy idporten runs-on: ubuntu-latest permissions: @@ -19,4 +20,4 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: CLUSTER: prod-gcp - RESOURCE: .nais/idporten.yml + RESOURCE: ".nais/idporten.yml" diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index cecb9bed8d1..68d139b3d80 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -3,16 +3,19 @@ on: push: branches: - master - paths-ignore: - - 'navikt/**' - - '.github/**' - - '.nais/alerting-dolly.yml' + paths: + - 'apps/bruker-service/**' + - 'apps/person-organisasjon-tilgang-service/**' pull_request: - types: [ assigned, opened, synchronize, reopened ] + paths: + - 'apps/bruker-service/**' + - 'apps/person-organisasjon-tilgang-service/**' + types: [ ready_for_review, review_requested ] workflow_dispatch: jobs: bruker-service: + if: github.event.pull_request.draft == false uses: ./.github/workflows/common.integration-test.yml with: working-directory: 'apps/bruker-service/' @@ -20,6 +23,7 @@ jobs: secrets: NAV_TOKEN: ${{ secrets.NAV_TOKEN }} person-organisasjon-tilgang-service: + if: github.event.pull_request.draft == false uses: ./.github/workflows/common.integration-test.yml with: working-directory: 'apps/person-organisasjon-tilgang-service/' diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml deleted file mode 100644 index 1f45024fdbd..00000000000 --- a/.github/workflows/jekyll-gh-pages.yml +++ /dev/null @@ -1,54 +0,0 @@ -# Sample workflow for building and deploying a Jekyll site to GitHub Pages -name: Deploy Jekyll with GitHub Pages dependencies preinstalled - -on: - # Runs on pushes targeting the default branch - push: - branches: ["master"] - # Added paths to trigger the workflow only when the content in the docs folder changes. - paths: - - "docs/**" - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. -concurrency: - group: "pages" - cancel-in-progress: false - -jobs: - # Build job - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Setup Pages - uses: actions/configure-pages@v5 - - name: Build with Jekyll - uses: actions/jekyll-build-pages@v1 - with: - source: ./ - destination: ./_site - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - - # Deployment job - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 diff --git a/.github/workflows/kafka-topics.yml b/.github/workflows/kafka-topics.yml index cbeeeb676d3..b3d24d0d682 100644 --- a/.github/workflows/kafka-topics.yml +++ b/.github/workflows/kafka-topics.yml @@ -12,6 +12,7 @@ on: jobs: deploy-kafka-topics-dev: name: Deploy to Aiven Dev + if: github.event.pull_request.draft == false runs-on: ubuntu-latest permissions: contents: read @@ -22,4 +23,4 @@ jobs: env: CLUSTER: dev-gcp VAR: kafka-pool=nav-dev - RESOURCE: .nais/topics.yml \ No newline at end of file + RESOURCE: ".nais/topics.yml" \ No newline at end of file diff --git a/.github/workflows/lib.integration-test.yml b/.github/workflows/lib.integration-test.yml index 04074566673..479fc9cefcd 100644 --- a/.github/workflows/lib.integration-test.yml +++ b/.github/workflows/lib.integration-test.yml @@ -8,6 +8,7 @@ on: jobs: workflow: + if: github.event.pull_request.draft == false uses: ./.github/workflows/common.workflow.libs.backend.yml with: working-directory: 'libs/integration-test' diff --git a/.github/workflows/maskinporten.yml b/.github/workflows/maskinporten.yml index d17fe4bfaf5..9d1b7007cc8 100644 --- a/.github/workflows/maskinporten.yml +++ b/.github/workflows/maskinporten.yml @@ -19,4 +19,4 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: CLUSTER: prod-gcp - RESOURCE: .nais/maskinporten.yml + RESOURCE: ".nais/maskinporten.yml" diff --git a/.github/workflows/opensearch.yml b/.github/workflows/opensearch.yml index 0a0a7fad174..e33362b366d 100644 --- a/.github/workflows/opensearch.yml +++ b/.github/workflows/opensearch.yml @@ -21,4 +21,4 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: CLUSTER: dev-gcp - RESOURCE: .nais/opensearch.yml \ No newline at end of file + RESOURCE: ".nais/opensearch.yml" \ No newline at end of file diff --git a/.github/workflows/pages-build-deploy.yml b/.github/workflows/pages-build-deploy.yml new file mode 100644 index 00000000000..8dbfc07c680 --- /dev/null +++ b/.github/workflows/pages-build-deploy.yml @@ -0,0 +1,43 @@ +name: GitHub Pages + +on: + push: + branches: ["master"] + paths: + - "docs/**" + workflow_dispatch: + +permissions: + contents: read + pages: write + id-token: write + +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Configure + uses: actions/configure-pages@v5 + - name: Jekyll + uses: actions/jekyll-build-pages@v1 + with: + source: ./ + destination: ./_site + - name: Upload + uses: actions/upload-pages-artifact@v3 + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy + id: deployment + uses: actions/deploy-pages@v4 \ No newline at end of file diff --git a/.github/workflows/redis-dev.yml b/.github/workflows/redis-dev.yml index 8d81f66df80..1b457f1f5f9 100644 --- a/.github/workflows/redis-dev.yml +++ b/.github/workflows/redis-dev.yml @@ -18,4 +18,4 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: CLUSTER: dev-gcp - RESOURCE: .nais/redis-dev.yml \ No newline at end of file + RESOURCE: ".nais/redis-dev.yml" \ No newline at end of file diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml index 9b5521f36dd..5ab2851400e 100644 --- a/.github/workflows/redis.yml +++ b/.github/workflows/redis.yml @@ -20,4 +20,4 @@ jobs: - uses: nais/deploy/actions/deploy@v2 env: CLUSTER: dev-gcp - RESOURCE: .nais/redis.yml \ No newline at end of file + RESOURCE: ".nais/redis.yml" \ No newline at end of file diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 26e015243b7..926feba0ff5 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -93,7 +93,6 @@ dependencies { implementation 'org.ehcache:ehcache:3.10.8' implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' -// implementation 'com.fasterxml.jackson.datatype:jackson-core:2.17.1' implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' implementation 'io.micrometer:micrometer-registry-prometheus' diff --git a/apps/dolly-frontend/src/main/js/src/components/layout/blankHeader/BlankHeader.tsx b/apps/dolly-frontend/src/main/js/src/components/layout/blankHeader/BlankHeader.tsx index 5cd09fc8617..27e0e2a99f5 100644 --- a/apps/dolly-frontend/src/main/js/src/components/layout/blankHeader/BlankHeader.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/layout/blankHeader/BlankHeader.tsx @@ -14,7 +14,7 @@ export default () => {

Dolly

- + Dokumentasjon
diff --git a/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx b/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx index 31f08a302ed..a0c6e52356c 100644 --- a/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx @@ -47,7 +47,7 @@ export const DokumentasjonDropdown = () => { window.open( - 'https://navikt.github.io/testnorge/applications/dolly/', + 'https://navikt.github.io/testnorge/docs/applications/dolly/brukerveiledning', '_blank', 'noopener', ) @@ -60,7 +60,8 @@ export const DokumentasjonDropdown = () => { window.open( - window.location.hostname.includes('frontend') + window.location.hostname.includes('frontend') || + window.location.hostname.includes('localhost') ? 'https://dolly-backend-dev.intern.dev.nav.no/swagger' : 'https://dolly-backend.intern.dev.nav.no/swagger', '_blank', diff --git a/apps/dolly-frontend/src/main/js/src/components/varslinger/VarslingerTekster.tsx b/apps/dolly-frontend/src/main/js/src/components/varslinger/VarslingerTekster.tsx index c2ec61119a1..d4c3ee25dd1 100644 --- a/apps/dolly-frontend/src/main/js/src/components/varslinger/VarslingerTekster.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/varslinger/VarslingerTekster.tsx @@ -11,14 +11,17 @@ export const VarslingerTekster = ({ varslingId }: VarslingId) => { const brukerveiledning = ( her ) const retningslinjer = ( - + her ) diff --git a/apps/dolly-frontend/src/main/js/src/pages/loginPage/LoginModal.tsx b/apps/dolly-frontend/src/main/js/src/pages/loginPage/LoginModal.tsx index 85c2dd25633..fbf83bb4a0f 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/loginPage/LoginModal.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/loginPage/LoginModal.tsx @@ -7,7 +7,7 @@ import { CypressSelector } from '../../../cypress/mocks/Selectors' const brukerveiledning = ( brukerveiledningen diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 3c31ec89cba..f565c55dd44 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -59,6 +59,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' implementation 'org.opensearch.client:spring-data-opensearch:1.4.0' + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' + implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' diff --git a/dummy.placeholder.file b/dummy.placeholder.file new file mode 100644 index 00000000000..e69de29bb2d