From e26fe883e768b608925bf88d533c222ef36fe5f5 Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Mon, 25 Nov 2024 10:17:49 +0100 Subject: [PATCH 1/4] Rename decision tree or beslisboom to beslishulp --- frontend/Dockerfile | 2 +- frontend/compose.yaml | 2 +- frontend/index.html | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- frontend/script/build.sh | 2 +- frontend/script/push.sh | 2 +- frontend/src/App.vue | 4 ++-- .../src/components/{BeslisboomForm.vue => BeslishulpForm.vue} | 0 frontend/src/components/Conclusion.vue | 2 +- frontend/src/components/HomePage.vue | 4 ++-- frontend/src/components/betaversion-label.vue | 2 +- frontend/src/stores/QuestionStore.ts | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) rename frontend/src/components/{BeslisboomForm.vue => BeslishulpForm.vue} (100%) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 712d2ecf..f6d44ea4 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -12,7 +12,7 @@ RUN npm run build FROM nginx:$NGINX_VERSION -LABEL org.opencontainers.image.source=https://github.com/MinBZK/AI-act-beslisboom +LABEL org.opencontainers.image.source=https://github.com/MinBZK/ai-act-beslishulp COPY --from=build /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/nginx.conf diff --git a/frontend/compose.yaml b/frontend/compose.yaml index 749532b2..9f65ba93 100644 --- a/frontend/compose.yaml +++ b/frontend/compose.yaml @@ -4,6 +4,6 @@ services: context: . dockerfile: Dockerfile - image: ghcr.io/minbzk/ai-act-beslisboom:main + image: ghcr.io/minbzk/ai-act-beslishulp:main ports: - '9090:80' diff --git a/frontend/index.html b/frontend/index.html index cd89f01c..b765ff47 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,7 +4,7 @@ - Beslisboom + Beslishulp diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e6ef4923..48f987fc 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "ai-act-decision-tree", + "name": "ai-act-beslishulp", "version": "0.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "ai-act-decision-tree", + "name": "ai-act-beslishulp", "version": "0.0.5", "dependencies": { "@headlessui/vue": "^1.7.23", diff --git a/frontend/package.json b/frontend/package.json index ffb149ed..22918ff4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "ai-act-decision-tree", + "name": "ai-act-beslishulp", "version": "0.0.5", "private": false, "type": "module", diff --git a/frontend/script/build.sh b/frontend/script/build.sh index 79e459c5..99ea84cc 100755 --- a/frontend/script/build.sh +++ b/frontend/script/build.sh @@ -2,4 +2,4 @@ python script/inject_definitions_in_decision_tree.py -docker build . -t ghcr.io/minbzk/ai-act-beslisboom:main --platform linux/amd64 +docker build . -t ghcr.io/minbzk/ai-act-beslishulp:main --platform linux/amd64 diff --git a/frontend/script/push.sh b/frontend/script/push.sh index 41d9f046..247f1525 100755 --- a/frontend/script/push.sh +++ b/frontend/script/push.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker push ghcr.io/minbzk/ai-act-beslisboom:main +docker push ghcr.io/minbzk/ai-act-beslishulp:main diff --git a/frontend/src/App.vue b/frontend/src/App.vue index eb407c82..693e2046 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,5 +1,5 @@ diff --git a/frontend/src/components/BeslisboomForm.vue b/frontend/src/components/BeslishulpForm.vue similarity index 100% rename from frontend/src/components/BeslisboomForm.vue rename to frontend/src/components/BeslishulpForm.vue diff --git a/frontend/src/components/Conclusion.vue b/frontend/src/components/Conclusion.vue index 7a94003a..40444dd3 100644 --- a/frontend/src/components/Conclusion.vue +++ b/frontend/src/components/Conclusion.vue @@ -86,7 +86,7 @@ defineEmits(['back'])
- Mocht u vragen of opmerkingen hebben naar aanleiding van deze beslisboom, mail dan gerust naar + Mocht u vragen of opmerkingen hebben naar aanleiding van deze beslishulp, mail dan gerust naar ai-verordening@minbzk.nl
diff --git a/frontend/src/components/HomePage.vue b/frontend/src/components/HomePage.vue index 1c0ae8ca..61b77540 100644 --- a/frontend/src/components/HomePage.vue +++ b/frontend/src/components/HomePage.vue @@ -39,11 +39,11 @@ const emit = defineEmits(['acceptDisclaimer'])
  • De beslishulp is geen check op jouw eigen kennis en inzichten en je blijft zelf verantwoordelijk voor de informatie die je gebruikt.
  • Wij adviseren de uitkomsten van de beslishulp met andere experts in jouw organisatie te delen en te bespreken.
    • -
  • De beslisboom is bedoeld voor overheden die AI-systemen +
  • De beslishulp is bedoeld voor overheden die AI-systemen aanbieden, of gebruiken onder eigen verantwoordelijkheid.
    • -
  • Voor vragen of opmerkingen over de beslisboom mail je naar: +
  • Voor vragen of opmerkingen over de beslishulp mail je naar: ai-verordening@minbzk.nl. diff --git a/frontend/src/components/betaversion-label.vue b/frontend/src/components/betaversion-label.vue index cf6a0b42..c08eb399 100644 --- a/frontend/src/components/betaversion-label.vue +++ b/frontend/src/components/betaversion-label.vue @@ -15,7 +15,7 @@
    - Deze beslisboom is in ontwikkeling. Alle versies ontstaan op een open manier. + Deze beslishulp is in ontwikkeling. Alle versies ontstaan op een open manier. Iedereen mag opmerkingen en suggesties doen. diff --git a/frontend/src/stores/QuestionStore.ts b/frontend/src/stores/QuestionStore.ts index f281b6a1..238319d0 100644 --- a/frontend/src/stores/QuestionStore.ts +++ b/frontend/src/stores/QuestionStore.ts @@ -70,7 +70,7 @@ export const useQuestionStore = defineStore('question', () => { function updateLabelsAtConclusion() { /** * This function will change all the "nader te bepalen" labels to "niet van toepassing" when - * the conclusion of the decision tree has been reached. + * the conclusion of the beslishulp has been reached. */ for (let key in LabelsBySubCategory.value) { if (JSON.stringify(LabelsBySubCategory.value[key]) === JSON.stringify(['nader te bepalen'])) { From fc97dd0dc197bb4173eb404854f8de89b879ce86 Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 27 Nov 2024 10:24:35 +0100 Subject: [PATCH 2/4] Renaming to beslishulp --- .github/workflows/build.yaml | 2 +- .github/workflows/deploy.yaml | 10 +++++----- package-lock.json | 2 +- schemas/schema_decision_tree.json | 6 +++--- script/gen_mermaid.py | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 34d3ceda..e87d32fb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,7 +11,7 @@ concurrency: env: REGISTRY: ghcr.io - IMAGE_NAME: "minbzk/ai-act-beslisboom" + IMAGE_NAME: "minbzk/ai-act-beslishulp" jobs: build: diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 5c5b67ff..c1a292b0 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,7 +17,7 @@ jobs: - name: Get GHCR package hash id: get_package_hash run: | - container_id=$(gh api --paginate -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /orgs/MinBZK/packages/container/ai-act-beslisboom/versions | jq -r '.[] | select(.metadata.container.tags | contains(["main"])) | .name') + container_id=$(gh api --paginate -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /orgs/MinBZK/packages/container/ai-act-beslishulp/versions | jq -r '.[] | select(.metadata.container.tags | contains(["main"])) | .name') echo "container_id=$container_id" >> "$GITHUB_OUTPUT" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -43,16 +43,16 @@ jobs: - name: Make changes to the file run: | - sed -i 's/newTag: .*$/newTag: main@${{ steps.get_package_hash.outputs.container_id }}/g' apps/ai-act-beslisboom/sandbox/kustomization.yaml - sed -i 's|minbzk.github.io/version: .*$|minbzk.github.io/version: main|g' apps/ai-act-beslisboom/sandbox/kustomization.yaml - git add apps/ai-act-beslisboom/sandbox/kustomization.yaml + sed -i 's/newTag: .*$/newTag: main@${{ steps.get_package_hash.outputs.container_id }}/g' apps/ai-act-beslishulp/sandbox/kustomization.yaml + sed -i 's|minbzk.github.io/version: .*$|minbzk.github.io/version: main|g' apps/ai-act-beslishulp/sandbox/kustomization.yaml + git add apps/ai-act-beslishulp/sandbox/kustomization.yaml - name: show changes run: git diff --staged - name: push changes run: | - git commit -m "Update ai-act-beslisboom sandbox tag ${{ steps.get_package_hash.outputs.container_id }}" + git commit -m "Update ai-act-beslishulp sandbox tag ${{ steps.get_package_hash.outputs.container_id }}" git push --force-with-lease env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} diff --git a/package-lock.json b/package-lock.json index 85e39530..2609fa3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "AI-act-beslisboom", + "name": "AI-act-beslishulp", "lockfileVersion": 3, "requires": true, "packages": {} diff --git a/schemas/schema_decision_tree.json b/schemas/schema_decision_tree.json index 0f005af5..1463a4cd 100644 --- a/schemas/schema_decision_tree.json +++ b/schemas/schema_decision_tree.json @@ -1,8 +1,8 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/MinBZK/AI-act-beslisboom/main/schemas/base.schema", - "title": "Beslisboom schema", - "description": "Beslisboom schema", + "$id": "https://raw.githubusercontent.com/MinBZK/AI-act-beslishulp/main/schemas/base.schema", + "title": "Decision tree schema", + "description": "Decision tree schema", "type": "object", "properties": { "name": { diff --git a/script/gen_mermaid.py b/script/gen_mermaid.py index 6e11d184..9486aeb6 100755 --- a/script/gen_mermaid.py +++ b/script/gen_mermaid.py @@ -261,7 +261,7 @@ def create_html(file_name: str, flowchart_script: str) -> None: - AI Decision Tree + AI Act Beslishulp From 3158ebfafc4143d03b39956c6b2c8d92ac989e6a Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Fri, 29 Nov 2024 13:48:07 +0100 Subject: [PATCH 3/4] Rename decision tree to beslishulp --- .github/workflows/build.yaml | 2 +- .github/workflows/deploy.yaml | 10 +++++----- README.md | 12 ++++++------ frontend/Dockerfile | 2 +- frontend/compose.yaml | 2 +- frontend/package.json | 2 +- frontend/script/build.sh | 2 +- frontend/script/push.sh | 2 +- frontend/src/components/betaversion-label.vue | 2 +- package-lock.json | 2 +- schemas/schema_decision_tree.json | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e87d32fb..46c0e834 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,7 +11,7 @@ concurrency: env: REGISTRY: ghcr.io - IMAGE_NAME: "minbzk/ai-act-beslishulp" + IMAGE_NAME: "minbzk/ai-verordening-beslishulp" jobs: build: diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index c1a292b0..fe818d48 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,7 +17,7 @@ jobs: - name: Get GHCR package hash id: get_package_hash run: | - container_id=$(gh api --paginate -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /orgs/MinBZK/packages/container/ai-act-beslishulp/versions | jq -r '.[] | select(.metadata.container.tags | contains(["main"])) | .name') + container_id=$(gh api --paginate -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /orgs/MinBZK/packages/container/ai-verordening-beslishulp/versions | jq -r '.[] | select(.metadata.container.tags | contains(["main"])) | .name') echo "container_id=$container_id" >> "$GITHUB_OUTPUT" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -43,16 +43,16 @@ jobs: - name: Make changes to the file run: | - sed -i 's/newTag: .*$/newTag: main@${{ steps.get_package_hash.outputs.container_id }}/g' apps/ai-act-beslishulp/sandbox/kustomization.yaml - sed -i 's|minbzk.github.io/version: .*$|minbzk.github.io/version: main|g' apps/ai-act-beslishulp/sandbox/kustomization.yaml - git add apps/ai-act-beslishulp/sandbox/kustomization.yaml + sed -i 's/newTag: .*$/newTag: main@${{ steps.get_package_hash.outputs.container_id }}/g' apps/ai-verordening-beslishulp/sandbox/kustomization.yaml + sed -i 's|minbzk.github.io/version: .*$|minbzk.github.io/version: main|g' apps/ai-verordening-beslishulp/sandbox/kustomization.yaml + git add apps/ai-verordening-beslishulp/sandbox/kustomization.yaml - name: show changes run: git diff --staged - name: push changes run: | - git commit -m "Update ai-act-beslishulp sandbox tag ${{ steps.get_package_hash.outputs.container_id }}" + git commit -m "Update ai-verordening-beslishulp sandbox tag ${{ steps.get_package_hash.outputs.container_id }}" git push --force-with-lease env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} diff --git a/README.md b/README.md index 2ba88b7f..292d3c97 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Voor vragen of opmerkingen over de beslishulp mail je naar: [ai-verordening@minbzk.nl](mailto::ai-verordening@minbzk.nl). -# AI-act-beslishulp +# AI-Verordening-Beslishulp -[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/MinBZK/ai-act-decisiontree/main.svg?badge_token=d3dKEK97RwC1II15_W-nng)](https://results.pre-commit.ci/latest/github/MinBZK/ai-act-decisiontree/main?badge_token=d3dKEK97RwC1II15_W-nng) +[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/MinBZK/ai-verordening-beslishulp/main.svg?badge_token=d3dKEK97RwC1II15_W-nng)](https://results.pre-commit.ci/latest/github/MinBZK/ai-verordening-beslishulp/main?badge_token=d3dKEK97RwC1II15_W-nng) Deze git repository bevat de beslishulp op basis van de AI Verordening. Het AI-validatie Team heeft deze tool ontwikkeld, maar is niet verantwoordelijk voor de juridische inhoud van de beslishulp. Voor meer informatie over het AI Validatie Team, bezoek de [site van het AI-validatieteam](https://minbzk.github.io/ai-validation/). Voor vragen over de juridische inhoud, neem contact op met de experts via ai-verordening@minbzk.nl. @@ -22,7 +22,7 @@ Het project omvat de volgende 2 onderdelen: 1. De beslishulp: [decision-tree.yaml](decision-tree.yaml) 2. Een frontend voor de visualisatie van de beslishulp: [frontend](frontend/) -De Kubernetes deployment code staat bij [infra](https://github.com/MinBZK/ai-validation-infra/apps/ai-act-beslishulp) +De Kubernetes deployment code staat bij [infra](https://github.com/MinBZK/ai-validation-infra/apps/ai-verordening-beslishulp) Door deze beslishulp te doorlopen, krijgt uw organisatie inzicht in de volgende vragen: @@ -82,7 +82,7 @@ Naast de beslishulp is er ook een [definitions.yaml](definitions.yaml) bestand. De beslishulp is schematisch weergegeven verschillende diagrammen: -1. [een doorklikbaar diagram](https://minbzk.github.io/ai-act-decisiontree/mermaid_graphs/decision-tree-main.html): in dit diagram is de beslishulp op een versimpelde manier weergeven. Dit diagram bevat de volgende componenten: +1. [een doorklikbaar diagram](https://minbzk.github.io/ai-verordening-beslishulp/mermaid_graphs/decision-tree-main.html): in dit diagram is de beslishulp op een versimpelde manier weergeven. Dit diagram bevat de volgende componenten: - donkerblauwe rechthoeken: dit zijn doorklikbare componenten die doorverwijzen naar een volgende categorie uit de beslishulp. - lichtblauwe rechthoeken: dit zijn de 'labels' uit de beslishulp. De labels geven de karakteristieken die u door de beslishulp te doorlopen kunt verzamelen weer. @@ -91,14 +91,14 @@ De beslishulp is schematisch weergegeven verschillende diagrammen: U kunt terug naar het vorige diagram door de vorige pagina-knop in uw browser te gebruiken. -2. een [overzichtsdiagram](https://minbzk.github.io/ai-act-decisiontree/mermaid_graphs/decision-tree-complete.html): in dit diagram is de gehele beslishulp gevat. Dit diagram is niet doorklikbaar. De vragen zijn gegroepeerd categorieen, weergeven in witte rechthoeken met groene randen. +2. een [overzichtsdiagram](https://minbzk.github.io/ai-verordening-beslishulp/mermaid_graphs/decision-tree-complete.html): in dit diagram is de gehele beslishulp gevat. Dit diagram is niet doorklikbaar. De vragen zijn gegroepeerd categorieen, weergeven in witte rechthoeken met groene randen. Let op: de diagrammen kunnen het beste in Chrome, Safari of Microsoft Edge worden geopend. ## Frontend -Om door de beslishulp te lopen is een visualizatie tool gemaakt. Met deze tool kunt u door de vragen lopen. De frontend is beschikbaar op deze [website](https://ai-act-decisiontree.apps.digilab.network). +Om door de beslishulp te lopen is een visualizatie tool gemaakt. Met deze tool kunt u door de vragen lopen. De frontend is beschikbaar op deze [website](https://ai-verordening-beslishulp.apps.digilab.network). ### Frontend lokaal draaien diff --git a/frontend/Dockerfile b/frontend/Dockerfile index f6d44ea4..981062b2 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -12,7 +12,7 @@ RUN npm run build FROM nginx:$NGINX_VERSION -LABEL org.opencontainers.image.source=https://github.com/MinBZK/ai-act-beslishulp +LABEL org.opencontainers.image.source=https://github.com/MinBZK/ai-verordening-beslishulp COPY --from=build /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/nginx.conf diff --git a/frontend/compose.yaml b/frontend/compose.yaml index 9f65ba93..e3c0e522 100644 --- a/frontend/compose.yaml +++ b/frontend/compose.yaml @@ -4,6 +4,6 @@ services: context: . dockerfile: Dockerfile - image: ghcr.io/minbzk/ai-act-beslishulp:main + image: ghcr.io/minbzk/ai-verordening-beslishulp:main ports: - '9090:80' diff --git a/frontend/package.json b/frontend/package.json index 22918ff4..4c6920bf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "ai-act-beslishulp", + "name": "ai-verordening-beslishulp", "version": "0.0.5", "private": false, "type": "module", diff --git a/frontend/script/build.sh b/frontend/script/build.sh index 99ea84cc..c3649a16 100755 --- a/frontend/script/build.sh +++ b/frontend/script/build.sh @@ -2,4 +2,4 @@ python script/inject_definitions_in_decision_tree.py -docker build . -t ghcr.io/minbzk/ai-act-beslishulp:main --platform linux/amd64 +docker build . -t ghcr.io/minbzk/ai-verordening-beslishulp:main --platform linux/amd64 diff --git a/frontend/script/push.sh b/frontend/script/push.sh index 247f1525..8abae9c6 100755 --- a/frontend/script/push.sh +++ b/frontend/script/push.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker push ghcr.io/minbzk/ai-act-beslishulp:main +docker push ghcr.io/minbzk/ai-verordening-beslishulp:main diff --git a/frontend/src/components/betaversion-label.vue b/frontend/src/components/betaversion-label.vue index c08eb399..d786d1ca 100644 --- a/frontend/src/components/betaversion-label.vue +++ b/frontend/src/components/betaversion-label.vue @@ -16,7 +16,7 @@
    Deze beslishulp is in ontwikkeling. Alle versies ontstaan op een open manier. - + Iedereen mag opmerkingen en suggesties doen. diff --git a/package-lock.json b/package-lock.json index 2609fa3c..45ca171e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "AI-act-beslishulp", + "name": "ai-verordening-beslishulp", "lockfileVersion": 3, "requires": true, "packages": {} diff --git a/schemas/schema_decision_tree.json b/schemas/schema_decision_tree.json index 1463a4cd..eb64d8e1 100644 --- a/schemas/schema_decision_tree.json +++ b/schemas/schema_decision_tree.json @@ -1,6 +1,6 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/MinBZK/AI-act-beslishulp/main/schemas/base.schema", + "$id": "https://raw.githubusercontent.com/MinBZK/ai-verordening-beslishulp/main/schemas/base.schema", "title": "Decision tree schema", "description": "Decision tree schema", "type": "object", From 27596dad567e611e0d9939399ba9eca484b5ed42 Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Mon, 2 Dec 2024 08:02:59 +0100 Subject: [PATCH 4/4] update package-lock --- frontend/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 48f987fc..26b9e9df 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "ai-act-beslishulp", + "name": "ai-verordening-beslishulp", "version": "0.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "ai-act-beslishulp", + "name": "ai-verordening-beslishulp", "version": "0.0.5", "dependencies": { "@headlessui/vue": "^1.7.23",