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.

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

Merknader eksperiment #446

Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cb2c577
Røft konsept for "merknader" i saksbildet
kristoiv Feb 13, 2025
da4c053
Oversettelser for editor gui
kristoiv Feb 13, 2025
16b7a23
Egen type merknad for journalførte notater fra gosys
kristoiv Feb 13, 2025
0415a5d
Mindre endringer fra i går
kristoiv Feb 14, 2025
697664d
Gjenbruk lignende mønster for PDF link, bruk eksisterende standard fo…
kristoiv Feb 14, 2025
2c92928
Koble opp mot eksisterende brevutkast api for lagring av utkast man a…
kristoiv Feb 14, 2025
2254d09
Merge branch 'main' into merknader-eksperiment
kristoiv Feb 14, 2025
d706daa
Fikset TabLink støtte for ReactNode, støtter å override sakstype når …
kristoiv Feb 14, 2025
9e0da19
Fikset styling av merknader
kristoiv Feb 14, 2025
c6b8290
Merge branch 'main' into merknader-eksperiment
kristoiv Feb 14, 2025
e1437d9
Merge branch 'main' into merknader-eksperiment
kristoiv Feb 20, 2025
e70db69
Dev deploy from feature branch
kristoiv Feb 20, 2025
03cf918
Merge branch 'main' into merknader-eksperiment
kristoiv Feb 20, 2025
39518fd
Revert "Dev deploy from feature branch"
kristoiv Feb 20, 2025
e709351
Fiks feil fra merge
kristoiv Feb 20, 2025
25ab386
Egen midlertidig labs for feature branch
kristoiv Feb 20, 2025
3214bb1
Fiks lockfil
kristoiv Feb 20, 2025
3f5023e
Fiks feil i DokumentContext, oppdater initialState
kristoiv Feb 20, 2025
99f3462
Lag en kopi av jfr. notat visning i aside-menyen med litt egen styling
kristoiv Feb 21, 2025
0b339eb
Mer sammenhengende tekster
kristoiv Feb 21, 2025
d1b1071
Midlertidig skjul varsler mens vi jobber med design
kristoiv Feb 21, 2025
b7a5a31
Dokumenttittel-felt og focus-effekt på hovedtekstfelt
kristoiv Feb 21, 2025
5cbe124
Merge branch 'main' into merknader-eksperiment
kristoiv Feb 21, 2025
7072e83
Legg inn støtte for arbitrært data-obj. i mock av brevsutkast funksjo…
kristoiv Feb 21, 2025
a0680ce
Støtt lagring av dokumenttittel i utkast
kristoiv Feb 21, 2025
ed6ac0c
Tilpasser visning i journalføringsnotat litt til skisser og refaktore…
matsbyfl Feb 26, 2025
44f3832
Journalført Notat mock for dokumenter-api i msw
kristoiv Feb 26, 2025
3029cee
Merge branch 'merknader-eksperiment' of github.com:navikt/hotsak-fron…
kristoiv Feb 26, 2025
5af6079
Tilpasning av notatvisning i høyrekolonne basert på skisser. Foreløpi…
matsbyfl Feb 26, 2025
9568b17
Merge branch 'merknader-eksperiment' of https://github.com/navikt/hot…
matsbyfl Feb 26, 2025
14e6689
Legger tilbake visningen av notater i hovedbildet
matsbyfl Feb 26, 2025
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
82 changes: 42 additions & 40 deletions .github/workflows/deploy-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
branches:
- main
- depfix
- merknader-eksperiment

jobs:
test:
Expand Down Expand Up @@ -90,45 +91,46 @@ jobs:
uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: dev-gcp
RESOURCE: .nais/labs.yaml
RESOURCE: .nais/labs-merknader.yaml
IMAGE: ${{ needs.build.outputs.docker_image }}

deploy-dev:
name: Deploy til dev-gcp
runs-on: ubuntu-latest
needs: [build]
permissions:
contents: write
id-token: write
timeout-minutes: 15
env:
VERSION_TAG: ${{ needs.build.outputs.version_tag }}

steps:
- name: Sjekk ut koden
uses: actions/checkout@v4

- name: Deploy
uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: dev-gcp
RESOURCE: .nais/dev.yaml
IMAGE: ${{ needs.build.outputs.docker_image }}

- name: Etter deploy
if: github.ref == 'refs/heads/main'
uses: navikt/digihot-deploy/actions/post-deploy@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Lag release
if: github.ref == 'refs/heads/main'
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.VERSION_TAG }}
release_name: ${{ env.APPLICATION }} ${{ env.VERSION_TAG }}
body: ${{ env.CHANGE_LOG }}
draft: true
prerelease: false
#deploy-dev:
# name: Deploy til dev-gcp
# runs-on: ubuntu-latest
# needs: [build]
# permissions:
# contents: write
# id-token: write
# timeout-minutes: 15
# env:
# VERSION_TAG: ${{ needs.build.outputs.version_tag }}
#
# steps:
# - name: Sjekk ut koden
# uses: actions/checkout@v4
#
# - name: Deploy
# uses: nais/deploy/actions/deploy@v2
# env:
# CLUSTER: dev-gcp
# RESOURCE: .nais/dev.yaml
# IMAGE: ${{ needs.build.outputs.docker_image }}
#
# - name: Etter deploy
# if: github.ref == 'refs/heads/main'
# uses: navikt/digihot-deploy/actions/post-deploy@v3
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#
# - name: Lag release
# if: github.ref == 'refs/heads/main'
# uses: actions/create-release@latest
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# tag_name: ${{ env.VERSION_TAG }}
# release_name: ${{ env.APPLICATION }} ${{ env.VERSION_TAG }}
# body: ${{ env.CHANGE_LOG }}
# draft: true
# prerelease: false
#
66 changes: 66 additions & 0 deletions .nais/labs-merknader.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
apiVersion: nais.io/v1alpha1
kind: Application
metadata:
labels:
app: hotsak-frontend-labs-merknader
team: teamdigihot
name: hotsak-frontend-labs-merknader
namespace: teamdigihot
spec:
image: {{image}}
port: 3000
ingresses:
- https://hotsak-merknader.ekstern.dev.nav.no
liveness:
path: /isalive
readiness:
path: /isready
prometheus:
enabled: true
path: /metrics
replicas:
max: 1
min: 1
accessPolicy:
outbound:
rules:
- application: hm-grunndata-search
azure:
application:
enabled: true
resources:
limits:
cpu: 500m
memory: 1024Mi
requests:
cpu: 10m
memory: 256Mi
secureLogs:
enabled: true
envFrom:
- secret: hm-saksbehandling
env:
- name: API_URL
value: "http://hotsak/api"
- name: GRUNNDATA_API_URL
value: "http://grunndata/api"
- name: FINN_HJELPEMIDDEL_API_URL
value: http://hm-grunndata-search.teamdigihot.svc.cluster.local
- name: PORT
value: '3000'
- name: BRILLEKALKULATOR_API_URL
value: "http://brille/api"
- name: CLIENT_ID_HOTSAK_API
value: ""
- name: REDIS_HOST
value: "http://redis"
- name: HEIT_KRUKKA_URL
value: http://heit-krukka
- name: USE_MSW
value: "true"
- name: GIT_COMMIT
value: {{commit}}
- name: AMPLITUDE_API_KEY
value: default
- name: AMPLITUDE_SERVER_URL
value: https://amplitude.nav.no/collect-auto
Loading
Loading