navikt · krharum · Mar 20, 2025 · Mar 20, 2025 · Mar 21, 2025 · Mar 21, 2025
@@ -14,11 +14,22 @@ on:
       - "libs/security-core/**"
       - "apps/dolly-frontend/**"
       - ".github/workflows/app.dolly-frontend.yml"
-      - ".github/workflows/common.playwright-vitest.yml"
+      - ".github/workflows/common.playwright.yml"
+      - ".github/workflows/common.vitest.yml"
 
 jobs:
   playwright:
-    uses: ./.github/workflows/common.playwright-vitest.yml
+    uses: ./.github/workflows/common.playwright.yml
+    permissions:
+      packages: write
+      id-token: write
+      contents: read
+    with:
+      working-directory: "apps/dolly-frontend"
+    secrets:
+      READER_TOKEN: ${{ secrets.READER_TOKEN }}
+  vitest:
+    uses: ./.github/workflows/common.vitest.yml
     permissions:
       packages: write
       id-token: write

@@ -0,0 +1,34 @@
+name: tps-messaging-frontend
+
+on:
+  push:
+    paths:
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-frontend/**"
+      - "libs/reactive-session-security/**"
+      - "libs/security-core/**"
+      - "apps/tps-messaging-frontend/**"
+      - ".github/workflows/app.tps-messaging-frontend.yml"
+      - ".github/workflows/common.vitest.yml"
+
+jobs:
+  vitest:
+    uses: ./.github/workflows/common.vitest.yml
+    permissions:
+      packages: write
+      id-token: write
+      contents: read
+    with:
+      working-directory: "apps/tps-messaging-frontend"
+    secrets:
+      READER_TOKEN: ${{ secrets.READER_TOKEN }}
+  workflow:
+    uses: ./.github/workflows/common.workflow.frontend.yml
+    with:
+      working-directory: "apps/tps-messaging-frontend"
+      deploy-tag: "#deploy-tps-messaging-frontend"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
@@ -1,4 +1,4 @@
-name: Playwright/Vitest Tests
+name: Playwright Tests
 on:
   workflow_call:
     inputs:
@@ -44,11 +44,6 @@ jobs:
           name: blob-report-${{ matrix.shardIndex }}
           path: ${{ inputs.working-directory }}/src/main/js/blob-report
           retention-days: 1
-
-      - name: Run Vitest/RTL tests
-        if: ${{ matrix.shardIndex == 1 }}
-        working-directory: ${{ inputs.working-directory }}/src/main/js
-        run: npm run test:vitest-run
 
   merge-reports:
     if: ${{ !cancelled() }}
@@ -85,7 +80,6 @@ jobs:
           source: ${{ inputs.working-directory }}/src/main/js/playwright-report
           destination: /${{ github.repository }}/${{ github.run_number }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-      #          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
 
       - name: Merge to json report
         working-directory: ${{ inputs.working-directory }}/src/main/js

@@ -0,0 +1,33 @@
+name: Vitest Tests
+on:
+  workflow_call:
+    inputs:
+      working-directory:
+        type: string
+        description: "The working directory for the job, e.g. apps/dolly-frontend (without leading/trailing slash)."
+        required: true
+    secrets:
+      READER_TOKEN:
+        required: true
+
+jobs:
+  vitest:
+    runs-on: ubuntu-latest
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          registry-url: https://npm.pkg.github.com/
+          scope: "@navikt"
+      - name: Install dependencies
+        working-directory: ${{ inputs.working-directory }}/src/main/js
+        run: npm ci
+      - name: Install Playwright Browsers
+        working-directory: ${{ inputs.working-directory }}/src/main/js
+        run: npx playwright install --with-deps
+      - name: Run Vitest/RTL tests
+        working-directory: ${{ inputs.working-directory }}/src/main/js
+        run: npm run test:vitest-run
@@ -5,6 +5,9 @@
 
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+# testing
+*vitest-result.json
+
 # dependencies
 *node_modules/
 

@@ -23,6 +23,7 @@ spec:
         - application: dolly-backend
         - application: dolly-frontend
         - application: dolly-idporten
+        - application: testnav-tps-messaging-frontend
         - application: testnav-oversikt-frontend
     outbound:
       rules:

@@ -13,7 +13,6 @@ includeBuild "../../libs/reactive-proxy"
 includeBuild "../../libs/reactive-security"
 includeBuild "../../libs/reactive-session-security"
 includeBuild "../../libs/security-core"
-includeBuild "../../libs/security-core"
 includeBuild "../../libs/testing"
 includeBuild '../../.github/workflows'
 

@@ -62,7 +62,6 @@
     "@navikt/ds-css": "^7.4.0",
     "@navikt/ds-icons": "^3.4.3",
     "@navikt/ds-react": "^7.4.0",
-    "@playwright/test": "^1.48.2",
     "@react-router/dev": "^7.0.2",
     "@reduxjs/toolkit": "^2.3.0",
     "@testing-library/dom": "^10.4.0",
@@ -96,6 +95,7 @@
     "less": "^4.2.0",
     "msw": "^2.6.0",
     "playwright": "^1.51.0",
+    "@playwright/test": "^1.48.2",
     "prettier": "^3.3.3",
     "react-dropzone": "^14.2.10",
     "react-pdf": "^9.1.1",

@@ -16,7 +16,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

@@ -33,6 +33,7 @@ spec:
         - application: testnav-faste-data-frontend
         - application: testnav-oversikt-frontend
         - application: testnorge-tilbakemelding-api
+        - application: testnav-tps-messaging-frontend
     outbound:
       rules:
         - application: testnav-altinn3-tilgang-proxy

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/src/main/js/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="build" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="install" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/src/main/js/package.json" />
+    <command value="install" />
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="start" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/src/main/js/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,8 @@
+FROM ghcr.io/navikt/baseimages/temurin:21
+LABEL maintainer="Team Dolly"
+
+COPY /build/libs/app.jar /app/app.jar
+
+ENV JAVA_OPTS="-Dspring.profiles.active=prod"
+
+EXPOSE 8080
@@ -0,0 +1,10 @@
+# Tps-Messaging-frontend
+
+Frontend for kunne sende meldinger til TPS. For å benytte denne appen må brukeren være logget inn med en bruker registrert på
+azure-applikasjonen `dev-gcp:dolly:tps-messaging-frontend`.
+
+https://testnav-tps-messaging.intern.dev.nav.no
+
+## Lokal kjøring
+* [Generelt.](../../docs/local_general.md)
+* [Secret Manager.](../../docs/local_secretmanager.md)
@@ -0,0 +1,35 @@
+plugins {
+    id "dolly-apps"
+}
+
+sonarqube {
+    properties {
+        property "sonar.projectKey", "testnav-tps-messaging-frontend"
+        property "sonar.projectName", "testnav-tps-messaging-frontend"
+        property "sonar.sources", "src/main/java,src/main/js"
+        property "sonar.tests", "src/test/java"
+    }
+}
+
+dependencies {
+    implementation "io.grpc:grpc-netty:$versions.grpc"
+
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:reactive-frontend"
+    implementation "no.nav.testnav.libs:reactive-security"
+    implementation("no.nav.testnav.libs:reactive-session-security") {
+        exclude group: "org.springframework.session", module: "spring-session-data-redis"
+        exclude group: "org.springframework.boot", module: "spring-boot-starter-data-redis"
+    }
+    implementation("no.nav.testnav.libs:security-core") {
+        exclude group: "org.springframework.session", module: "spring-session-data-redis"
+    }
+
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+    implementation "org.springframework.boot:spring-boot-starter-security"
+
+    implementation "org.springframework.cloud:spring-cloud-starter-gateway"
+
+    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
+}
@@ -0,0 +1,60 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: testnav-tps-messaging-frontend
+  namespace: dolly
+  labels:
+    team: dolly
+spec:
+  port: 8080
+  azure:
+    sidecar:
+      enabled: true
+      autoLogin: true
+    application:
+      enabled: true
+      tenant: nav.no
+      replyURLs:
+        - "https://testnav-tps-messaging.ekstern.dev.nav.no/login/oauth2/code/aad"
+        - "http://localhost:8080/login/oauth2/code/aad"
+      claims:
+        groups:
+          - id: 9c7efec1-1599-4216-a67e-6fd53a6a951c # Dolly team
+          - id: 21c9abee-4bc7-4077-9aba-6049c760d094 # Tps messaging frontend access
+  liveness:
+    path: /internal/health/liveness
+    initialDelay: 20
+    periodSeconds: 2
+    failureThreshold: 140
+  observability:
+    logging:
+      destinations:
+        - id: elastic
+    autoInstrumentation:
+      enabled: true
+      runtime: java
+  readiness:
+    path: /internal/health/readiness
+    initialDelay: 20
+    periodSeconds: 2
+    failureThreshold: 140
+  prometheus:
+    enabled: true
+    path: /internal/metrics
+  replicas:
+    min: 1
+    max: 1
+  accessPolicy:
+    outbound:
+      rules:
+        - application: testnav-tps-messaging-service
+        - application: testnorge-profil-api
+  resources:
+    requests:
+      cpu: 50m
+      memory: 600Mi
+    limits:
+      memory: 2048Mi
+  image: "{{image}}"
+  ingresses:
+    - "https://testnav-tps-messaging.ekstern.dev.nav.no"
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists