Skip to content

Commit

Permalink
Merge branch 'dev' into feature/#716-increase-contrast
Browse files Browse the repository at this point in the history
# Conflicts:
#	digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json
#	digiwf-apps/packages/apps/digiwf-tasklist/package.json
  • Loading branch information
StephanStrehlerCGI committed Oct 30, 2023
2 parents a043a85 + 78326eb commit 9cd2cd3
Show file tree
Hide file tree
Showing 406 changed files with 17,221 additions and 5,135 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
11 changes: 7 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ assignees: ''
---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
<!-- A clear and concise description of what you want to happen.-->

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
<!-- A clear and concise description of any alternative solutions or features you've considered.-->

**Acceptance Criteria**
<!-- Checklist for Definition of Done -->

**Additional context**
Add any other context or screenshots about the feature request here.
<!-- Add any other context or screenshots about the feature request here.-->
12 changes: 9 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@ Short description or comments

### Reference

Issues: ###
Issues: closes #xxx

### Check-List

- [ ] Documentation created
- [ ] Environments configured
- [ ] All Acceptance criteria of user story are met
- [ ] JUnit tests are written (60% CodeCov)
- [ ] [Internal Review]([https://github.com/it-at-m/digiwf-core/blob/dev/CHANGELOG.md](https://confluence.muenchen.de/display/MPdZ/Review+-+DigiWF)) is maintained
- [ ] Documentations [external](https://github.com/it-at-m/digiwf-core/tree/dev/docs) and [internal](https://wiki.muenchen.de/betriebshandbuch/index.php?title=DigiWF&sfr=betriebshandbuch) are completed
- [ ] Smoketest successful (Manual E2E-Test depending on Change)
- [ ] No Branch waste left
- [ ] [Board](https://app.zenhub.com/workspaces/digiwf-621f70bf50ea1100120b7e93/board) is up-to-date
- [ ] Openshift environments are prepared (Secrets, etc.) and release-issue is maintained
5 changes: 3 additions & 2 deletions .github/workflows/build-services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: "maven"
server-id: camunda-bpm-nexus-ee
server-username: CAMUNDA_USER_REF
server-password: CAMUNDA_TOKEN_REF
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/workflow-bump-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ jobs:
if: inputs.bump-services-version== true
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'

- name: Raise mvn version
if: (github.event.inputs.bump-services-version == true || inputs.bump-services-version == true) && inputs.services-new-version != ''
run: |
mvn versions:set --batch-mode -DprocessAllModules -DnewVersion=${{ inputs.services-new-version }}-SNAPSHOT
mvn versions:commit
mvn versions:set --batch-mode -DprocessAllModules -DnewVersion=${{ inputs.services-new-version }}-SNAPSHOT -DprocessAllModules
mvn versions:commit -DprocessAllModules
- name: Raise mvn version
if: (github.event.inputs.bump-services-version == true || inputs.bump-services-version == true) && inputs.services-new-version == ''
run: |
mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}.0-SNAPSHOT
mvn versions:commit
mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}.0-SNAPSHOT -DprocessAllModules
mvn versions:commit -DprocessAllModules
- name: Git commit
if: github.event.inputs.bump-services-version == true || inputs.bump-services-version == true
run: |
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/workflow-release-services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install Java and Maven
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'adopt'
cache: "maven"
server-id: "ossrh"
Expand Down Expand Up @@ -141,6 +141,12 @@ jobs:
push: true
tags: itatm/digiwf-okewo-integration-service:${{ inputs.release-version }},itatm/digiwf-okewo-integration-service:dev

- name: Build and push address-integration
uses: docker/build-push-action@v5
with:
context: ./digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service
push: true
tags: itatm/digiwf-address-integration-service:${{ inputs.release-version }},itatm/digiwf-address-integration-service:dev

release-services-camunda-ee:
runs-on: ubuntu-latest
Expand All @@ -151,7 +157,7 @@ jobs:
- name: Install Java and Maven
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
server-id: camunda-bpm-nexus-ee
server-username: CAMUNDA_USER_REF
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -395,5 +395,3 @@ gradle-app.setting
**/pom.xml.versionsBackup
**/application-internal.*
/docs/node/

digiwf-schema-registry/digiwf-schema-registry-client/.openapi-generator-ignore
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
17
90 changes: 45 additions & 45 deletions dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,24 @@
flowchart LR
digiwf-gateway <--> digiwf-tasklist
digiwf-gateway <--> digiwf-engine-service
digiwf-engine-service <--to be replaced by connector--> kafka[(Kafka)]
%% integrations
digiwf-engine-service <-- to be replaced by connector --> kafka[(Kafka)]
%% integrations
subgraph digiwf-integrations
digiwf-alw-integration
digiwf-cosys-integration
digiwf-email-integration
digiwf-s3-integration
digiwf-verification-integration
digiwf-alw-integration
digiwf-cosys-integration
digiwf-email-integration
digiwf-s3-integration
digiwf-verification-integration
end
kafka <--> digiwf-alw-integration
kafka <--> digiwf-cosys-integration
kafka <--> digiwf-email-integration
kafka <--> digiwf-s3-integration
kafka <--> digiwf-verification-integration
%% sync connection to s3-integration
digiwf-engine-service --synchronous connection--> digiwf-s3-integration
%% connector tbd.
%% sync connection to s3-integration
digiwf-engine-service -- synchronous connection --> digiwf-s3-integration
%% connector tbd.
digiwf-connector <-.-> digiwf-engine-service
digiwf-connector <-.-> kafka
```
Expand All @@ -36,75 +33,74 @@ flowchart LR
```mermaid
flowchart LR
subgraph digiwf-tasklist
frontend
frontend
end
digiwf-gateway <--> digiwf-tasklist
digiwf-gateway <--> digiwf-process
digiwf-gateway <--> digiwf-task
kafka[(Kafka)]
digiwf-task <--> kafka
digiwf-process <--> kafka
%% connector
%% connector
digiwf-connector <--> camunda
digiwf-connector <--> kafka
%% integrations
%% integrations
subgraph digiwf-integrations
digiwf-alw-integration
digiwf-cosys-integration
digiwf-email-integration
digiwf-s3-integration
digiwf-verification-integration
digiwf-alw-integration
digiwf-cosys-integration
digiwf-email-integration
digiwf-s3-integration
digiwf-verification-integration
end
kafka <--> digiwf-alw-integration
kafka <--> digiwf-cosys-integration
kafka <--> digiwf-email-integration
kafka <--> digiwf-s3-integration
kafka <--> digiwf-verification-integration
%% sync connection to s3-integration
digiwf-task --synchronous connection--> digiwf-s3-integration
%% future tbd.
%% sync connection to s3-integration
digiwf-task -- synchronous connection --> digiwf-s3-integration
%% future tbd.
subgraph digiwf-task
polyflow
polyflow
end
```

## Local Setup

For local development you have to start the digiwf-tasklist (the vue and vuetify based frontend application), the digiwf-engine-service (spring-boot and camunda based backend application) and the digiwf-gateway.
For local development you have to start the digiwf-tasklist (the vue and vuetify based frontend application), the
digiwf-engine-service (spring-boot and camunda based backend application) and the digiwf-gateway.
Additionally, you can start the digiwf-integrations if you need features from any of the integration services.

You may run the applications with the default settings (from `application.yml`) and customize the configurations
by adding environment variables. You always have to set the env variable `DIGIWF_ENV` (for local development `DIGIWF_ENV=local-01`).
by adding environment variables. You always have to set the env variable `DIGIWF_ENV` (for local
development `DIGIWF_ENV=local-01`).
Additionally, some services require a few more environment variables.

Under (All env variables)[#all-env-variables] you will find a list of all possible env variables.
Under (All env variables)[#all-env-variables] you will find a list of all possible env variables.

### Setup a local dev environment

You can use the docker-compose [stack](stack) to start all the necessary infrastructure components (like e.g. kafka and minio).
You can use the docker-compose [stack](stack) to start all the necessary infrastructure components (like e.g. kafka and
minio).
For more information see [here](stack/README.md).

### Tasklist (Frontend)

If you want to develop the frontend you can also use the dev server.

1. Make sure you start the [stack](stack) **without** the tasklist profile (`docker compose up -d`).
2. Go to digiwf-apps
3. Run `npm run serve:tasklist`
* If the Command fails on the first attempt trigger a build (`npm run build`) and try it again
* If you want to debug any of the components, run additionally `npm run dev` to auto rebuild the components
* If the Command fails on the first attempt trigger a build (`npm run build`) and try it again
* If you want to debug any of the components, run additionally `npm run dev` to auto rebuild the components
4. Go to [localhost:8081](http://localhost:8081)

### DigiWF-Engine (Backend)

Run the [DigiWF-Engine](digiwf-engine/digiwf-engine-service) with the profiles `local`, `streaming`, `no-security` and `no-ldap`.
Run the [DigiWF-Engine](digiwf-engine/digiwf-engine-service) with the profiles `local`, `streaming`, `no-security`
and `no-ldap`.

Additionally, set the environment variable `DIGIWF_ENV=local-01`.

Expand All @@ -115,8 +111,8 @@ Run the [DigiWF-Gateway](digiwf-gateway) with the profiles `local`, `no-security
### DigiWF-Integrations

Run the [integrations](digiwf-integrations) you need.
You may run the applications with the default settings, but you probably have to set a few environment variables (described above).

You may run the applications with the default settings, but you probably have to set a few environment variables (
described above).

**Applications and profiles**

Expand All @@ -141,10 +137,12 @@ mvn clean verify

### Jacoco Coverage

The use Jacoco with a maven multi-module project it's recommended to create a dedicated module for the test coverage generation ([see Jacoco docs](https://github.com/jacoco/jacoco/wiki/MavenMultiModule)).
The use Jacoco with a maven multi-module project it's recommended to create a dedicated module for the test coverage
generation ([see Jacoco docs](https://github.com/jacoco/jacoco/wiki/MavenMultiModule)).
Therefore, we created the [digiwf-coverage](digiwf-coverage) module which depends on all modules that should get tested.

> If you want to track the test coverage of additional modules you have to add the maven module as dependency in [digiwf-coverage](digiwf-coverage/pom.xml).
> If you want to track the test coverage of additional modules you have to add the maven module as dependency
> in [digiwf-coverage](digiwf-coverage/pom.xml).
After executing the tests a jacoco coverage report is generated in [digiwf-coverage](digiwf-coverage) target directory.

Expand Down Expand Up @@ -213,6 +211,8 @@ For updating the version of the project we use maven-versions plugin.
| S3INTEGRATION_DATASOURCE_PASSWORD | | |
| S3INTEGRATION_DATABASE_PLATFORM | org.hibernate.dialect.H2Dialect | |
| S3INTEGRATION_DATABASE_DRIVERCLASSNAME | org.h2.Driver | |
| ADDRESS_INTEGRATION_SERVER_PORT | 8088 | The address integration services server port |
| ADDRESS_SERVICE_URL | http://localhost:8089 | The url of the Stadt München Address Service |

**Legacy EAI Properties**

Expand Down
2 changes: 1 addition & 1 deletion digiwf-apps/lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"packages/apps/digiwf-forms-example",
"packages/apps/digiwf-tasklist"
],
"version": "1.1.0"
"version": "1.2.0"
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions digiwf-apps/packages/apps/digiwf-forms-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"name": "@muenchen/digiwf-forms-example",
"description": "DigiWF Forms",
"private": true,
"version": "1.1.0",
"version": "1.2.0",
"scripts": {
"dev": "vite --host localhost",
"build": "vite build"
},
"dependencies": {
"@muenchen/digiwf-date-input": "^1.1.0",
"@muenchen/digiwf-form-builder": "^1.1.0",
"@muenchen/digiwf-form-builder-settings": "^1.1.0",
"@muenchen/digiwf-form-renderer": "^1.1.0",
"@muenchen/digiwf-multi-file-input": "^1.1.0",
"@muenchen/digiwf-date-input": "^1.2.0",
"@muenchen/digiwf-form-builder": "^1.2.0",
"@muenchen/digiwf-form-builder-settings": "^1.2.0",
"@muenchen/digiwf-form-renderer": "^1.2.0",
"@muenchen/digiwf-multi-file-input": "^1.2.0",
"@muenchen/vjsf": "^2.21.7",
"vue": "^2.7.10",
"vuetify": "^2.6.9"
Expand Down
7 changes: 5 additions & 2 deletions digiwf-apps/packages/apps/digiwf-forms-example/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<template #custom-date-input="context">
<dwf-date-input v-bind="context"/>
</template>
<template #custom-time-input="context">
<dwf-time-input v-bind="context"/>
</template>
</dwf-form-renderer>
</v-form>
<v-btn @click="validate">Validate</v-btn>
Expand Down Expand Up @@ -63,12 +66,12 @@ html, body {
<script lang="ts">
import { DwfFormRenderer } from "@muenchen/digiwf-form-renderer";
import { DwfFormBuilder } from "@muenchen/digiwf-form-builder";
import { DwfDateInput } from "@muenchen/digiwf-date-input";
import { DwfDateInput, DwfTimeInput } from "@muenchen/digiwf-date-input";
import { SettingsEN } from "@muenchen/digiwf-form-builder-settings";
import { defineComponent, provide, ref } from "vue";
export default defineComponent({
components: {DwfFormRenderer, DwfFormBuilder, DwfDateInput},
components: {DwfFormRenderer, DwfFormBuilder, DwfDateInput, DwfTimeInput},
setup() {
const componentKey = ref(0);
Expand Down
Loading

0 comments on commit 9cd2cd3

Please sign in to comment.