Skip to content

Commit

Permalink
Merge branch 'dev' into bump-mvn-0.18.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	digiwf-apps/lerna.json
#	digiwf-apps/packages/apps/digiwf-forms-example/package-lock.json
#	digiwf-apps/packages/apps/digiwf-forms-example/package.json
#	digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json
#	digiwf-apps/packages/apps/digiwf-tasklist/package.json
#	digiwf-apps/packages/components/digiwf-date-input/package-lock.json
#	digiwf-apps/packages/components/digiwf-date-input/package.json
#	digiwf-apps/packages/components/digiwf-engine-api-internal/package-lock.json
#	digiwf-apps/packages/components/digiwf-engine-api-internal/package.json
#	digiwf-apps/packages/components/digiwf-form-builder-settings/package-lock.json
#	digiwf-apps/packages/components/digiwf-form-builder-settings/package.json
#	digiwf-apps/packages/components/digiwf-form-builder/package-lock.json
#	digiwf-apps/packages/components/digiwf-form-builder/package.json
#	digiwf-apps/packages/components/digiwf-form-renderer/package-lock.json
#	digiwf-apps/packages/components/digiwf-form-renderer/package.json
#	digiwf-apps/packages/components/digiwf-multi-file-input/package-lock.json
#	digiwf-apps/packages/components/digiwf-multi-file-input/package.json
#	digiwf-apps/packages/components/digiwf-task-api-internal/package-lock.json
#	digiwf-apps/packages/components/digiwf-task-api-internal/package.json
#	digiwf-apps/pom.xml
#	digiwf-connector/digiwf-camunda-connector-service/pom.xml
#	digiwf-connector/digiwf-camunda-connector-starter/pom.xml
#	digiwf-connector/digiwf-camunda-connector/pom.xml
#	digiwf-connector/digiwf-connector-api/pom.xml
#	digiwf-connector/digiwf-connector-core/pom.xml
#	digiwf-connector/digiwf-connector-starter-rest/pom.xml
#	digiwf-connector/digiwf-connector-starter/pom.xml
#	digiwf-connector/pom.xml
#	digiwf-coverage/pom.xml
#	digiwf-engine/digiwf-engine-service/pom.xml
#	digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/process/instance/domain/service/ServiceInstanceService.java
#	digiwf-engine/pom.xml
#	digiwf-gateway/pom.xml
#	digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml
#	digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-example/pom.xml
#	digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/pom.xml
#	digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml
#	digiwf-integrations/digiwf-alw-integration/pom.xml
#	digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-client/pom.xml
#	digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml
#	digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-example/pom.xml
#	digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/pom.xml
#	digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-starter/pom.xml
#	digiwf-integrations/digiwf-cosys-integration/pom.xml
#	digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml
#	digiwf-integrations/digiwf-email-integration/digiwf-email-integration-example/pom.xml
#	digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/pom.xml
#	digiwf-integrations/digiwf-email-integration/digiwf-email-integration-starter/pom.xml
#	digiwf-integrations/digiwf-email-integration/pom.xml
#	digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml
#	digiwf-integrations/digiwf-example-integration/digiwf-example-integration-example/pom.xml
#	digiwf-integrations/digiwf-example-integration/digiwf-example-integration-service/pom.xml
#	digiwf-integrations/digiwf-example-integration/digiwf-example-integration-starter/pom.xml
#	digiwf-integrations/digiwf-example-integration/pom.xml
#	digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml
#	digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-starter/pom.xml
#	digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client/pom.xml
#	digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml
#	digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml
#	digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-starter/pom.xml
#	digiwf-integrations/digiwf-s3-integration/pom.xml
#	digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml
#	digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-service/pom.xml
#	digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml
#	digiwf-integrations/digiwf-verification-integration/pom.xml
#	digiwf-integrations/pom.xml
#	digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml
#	digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml
#	digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml
#	digiwf-libs/digiwf-camunda-prometheus/pom.xml
#	digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml
#	digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml
#	digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml
#	digiwf-libs/digiwf-json-serialization/pom.xml
#	digiwf-libs/digiwf-message/digiwf-message-core/pom.xml
#	digiwf-libs/digiwf-message/digiwf-message-example/pom.xml
#	digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml
#	digiwf-libs/digiwf-message/pom.xml
#	digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml
#	digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml
#	digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml
#	digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml
#	digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml
#	digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml
#	digiwf-libs/digiwf-spring-security/pom.xml
#	digiwf-libs/pom.xml
#	digiwf-process/digiwf-process-api/pom.xml
#	digiwf-process/pom.xml
#	digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml
#	digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml
#	digiwf-schema-registry/digiwf-schema-registry-client/pom.xml
#	digiwf-schema-registry/digiwf-schema-registry-service/pom.xml
#	digiwf-schema-registry/pom.xml
#	digiwf-task/digiwf-polyflow-connector-starter/pom.xml
#	digiwf-task/digiwf-task-api/pom.xml
#	digiwf-task/digiwf-task-itest/pom.xml
#	digiwf-task/digiwf-tasklist-service/pom.xml
#	digiwf-task/pom.xml
#	docs/pom.xml
#	pom.xml
  • Loading branch information
simonhir committed Sep 8, 2023
2 parents 0e57a8a + 149877e commit 4272eb0
Show file tree
Hide file tree
Showing 355 changed files with 8,312 additions and 10,252 deletions.
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": "0.21.13"
"version": "1.0.0"
}
14 changes: 7 additions & 7 deletions digiwf-apps/packages/apps/digiwf-forms-example/package-lock.json

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": "0.21.13",
"version": "1.0.0",
"scripts": {
"dev": "vite --host localhost",
"build": "vite build"
},
"dependencies": {
"@muenchen/digiwf-date-input": "^0.21.13",
"@muenchen/digiwf-form-builder": "^0.21.13",
"@muenchen/digiwf-form-builder-settings": "^0.21.13",
"@muenchen/digiwf-form-renderer": "^0.21.13",
"@muenchen/digiwf-multi-file-input": "^0.21.13",
"@muenchen/digiwf-date-input": "^1.0.0",
"@muenchen/digiwf-form-builder": "^1.0.0",
"@muenchen/digiwf-form-builder-settings": "^1.0.0",
"@muenchen/digiwf-form-renderer": "^1.0.0",
"@muenchen/digiwf-multi-file-input": "^1.0.0",
"@muenchen/vjsf": "^2.21.7",
"vue": "^2.7.10",
"vuetify": "^2.6.9"
Expand Down
4 changes: 2 additions & 2 deletions digiwf-apps/packages/apps/digiwf-tasklist/.env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NODE_ENV=development
VITE_API_GATEWAY_URL=http://localhost:8082
VITE_PORT=8083
VITE_API_GATEWAY_URL=http://localhost:8083
VITE_PORT=8084
5 changes: 3 additions & 2 deletions digiwf-apps/packages/apps/digiwf-tasklist/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ declare module '@vue/runtime-core' {
AppToast: typeof import('./src/components/UI/AppToast.vue')['default']
AppViewLayout: typeof import('./src/components/UI/AppViewLayout.vue')['default']
AppYesNoDialog: typeof import('./src/components/common/AppYesNoDialog.vue')['default']
AssignTaskDialog: typeof import('./src/components/task/AssignTaskDialog.vue')['default']
BaseAlwDocumentInput: typeof import('./src/components/form/BaseAlwDocumentInput.vue')['default']
BaseDocumentInput: typeof import('./src/components/form/BaseDocumentInput.vue')['default']
BaseForm: typeof import('./src/components/form/BaseForm.vue')['default']
Expand All @@ -31,6 +32,7 @@ declare module '@vue/runtime-core' {
ProcessDefinitionItem: typeof import('./src/components/process/ProcessDefinitionItem.vue')['default']
ProcessInstanceItem: typeof import('./src/components/process/ProcessInstanceItem.vue')['default']
SearchField: typeof import('./src/components/common/SearchField.vue')['default']
SortBySelect: typeof import('./src/components/common/SortBySelect.vue')['default']
TaskFollowUpDialog: typeof import('./src/components/task/TaskFollowUpDialog.vue')['default']
TaskItem: typeof import('./src/components/task/TaskItem.vue')['default']
TaskList: typeof import('./src/components/task/TaskList.vue')['default']
Expand Down Expand Up @@ -74,18 +76,17 @@ declare module '@vue/runtime-core' {
VListItemTitle: typeof import('vuetify/lib')['VListItemTitle']
VMain: typeof import('vuetify/lib')['VMain']
VMenu: typeof import('vuetify/lib')['VMenu']
VMessages: typeof import('vuetify/lib')['VMessages']
VMultiUserInput: typeof import('./src/components/schema/VMultiUserInput.vue')['default']
VNavigationDrawer: typeof import('vuetify/lib')['VNavigationDrawer']
VProgressCircular: typeof import('vuetify/lib')['VProgressCircular']
VRow: typeof import('vuetify/lib')['VRow']
VSelect: typeof import('vuetify/lib')['VSelect']
VSimpleTable: typeof import('vuetify/lib')['VSimpleTable']
VSpacer: typeof import('vuetify/lib')['VSpacer']
VSpeedDial: typeof import('vuetify/lib')['VSpeedDial']
VStepper: typeof import('vuetify/lib')['VStepper']
VStepperHeader: typeof import('vuetify/lib')['VStepperHeader']
VStepperStep: typeof import('vuetify/lib')['VStepperStep']
VSwitch: typeof import('vuetify/lib')['VSwitch']
VTextField: typeof import('vuetify/lib')['VTextField']
VToolbarTitle: typeof import('vuetify/lib')['VToolbarTitle']
VTooltip: typeof import('vuetify/lib')['VTooltip']
Expand Down
54 changes: 43 additions & 11 deletions digiwf-apps/packages/apps/digiwf-tasklist/package-lock.json

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

17 changes: 9 additions & 8 deletions digiwf-apps/packages/apps/digiwf-tasklist/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "@muenchen/digiwf-tasklist",
"version": "0.21.13",
"version": "1.0.0",
"private": true,
"scripts": {
"dev": "vite",
"build": "vite build",
"test": "jest src"
"test": "jest src --coverage"
},
"dependencies": {
"@muenchen/digiwf-date-input": "^0.21.13",
"@muenchen/digiwf-engine-api-internal": "^0.21.13",
"@muenchen/digiwf-form-renderer": "^0.21.13",
"@muenchen/digiwf-multi-file-input": "^0.21.13",
"@muenchen/digiwf-task-api-internal": "^0.21.13",
"@muenchen/digiwf-date-input": "^1.0.0",
"@muenchen/digiwf-engine-api-internal": "^1.0.0",
"@muenchen/digiwf-form-renderer": "^1.0.0",
"@muenchen/digiwf-multi-file-input": "^1.0.0",
"@muenchen/digiwf-task-api-internal": "^1.0.0",
"@muenchen/vjsf": "^2.21.7",
"@tanstack/vue-query": "^4.19.1",
"core-js": "^3.8.3",
Expand All @@ -30,7 +30,8 @@
"vue-text-highlight": "2.0.10",
"vuetify": "^2.6.9",
"vuetify-form-base": "0.3.2",
"vuex": "^3.6.2"
"vuex": "^3.6.2",
"vuex-persist": "^3.1.3"
},
"devDependencies": {
"@mdi/font": "^5.9.55",
Expand Down
44 changes: 4 additions & 40 deletions digiwf-apps/packages/apps/digiwf-tasklist/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,10 @@
<v-spacer/>
{{ username }}

<v-menu offset-y>
<template v-slot:activator="{ on, attrs }">
<v-btn
text
fab
v-bind="attrs"
v-on="on"
>
<v-icon class="white--text">
mdi-account-circle
</v-icon>
</v-btn>
</template>
<v-list v-if="showUseBetaButton">
<v-list-item>
<v-list-item-title>
<v-switch
v-model="isDigiWFClassicUsed"
@click.stop.prevent="switchBetaVersion"
label="DigiWF-Classic nutzen"
></v-switch>
</v-list-item-title>
</v-list-item>
</v-list>
</v-menu>
<v-icon class="white--text">
mdi-account-circle
</v-icon>

</v-app-bar>

<v-navigation-drawer
Expand Down Expand Up @@ -190,12 +169,6 @@ import {InfoTO, ServiceInstanceTO, UserTO,} from "@muenchen/digiwf-engine-api-in
import AppMenuList from "./components/UI/appMenu/AppMenuList.vue";
import {apiGatewayUrl} from "./utils/envVariables";
import {queryClient} from "./middleware/queryClient";
import {
setShouldUseTaskService,
shouldShowBetaButton,
shouldUseTaskService,
switchShouldUseTaskService
} from "./utils/featureToggles";
@Component({
components: {AppMenuList}
Expand All @@ -208,9 +181,6 @@ export default class App extends Vue {
loginLoading = false;
loggedIn = true;
showUseBetaButton = false;
isDigiWFClassicUsed = true;
created(): void {
this.loadData();
}
Expand All @@ -219,8 +189,6 @@ export default class App extends Vue {
this.$store.dispatch("user/getUserInfo", refresh);
this.$store.dispatch("info/getInfo", refresh);
this.drawer = this.$store.getters["menu/open"];
this.isDigiWFClassicUsed = !shouldUseTaskService();
this.showUseBetaButton = shouldShowBetaButton();
}
getUser(): void {
Expand All @@ -229,10 +197,6 @@ export default class App extends Vue {
this.loginLoading = false;
}
switchBetaVersion(): void {
switchShouldUseTaskService();
}
@Watch("$store.state.menu.open")
onMenuChanged(menuOpen: boolean): void {
this.drawer = menuOpen;
Expand Down
Loading

0 comments on commit 4272eb0

Please sign in to comment.