Skip to content

Commit

Permalink
Merge branch 'next-minor' into story/form-view-model
Browse files Browse the repository at this point in the history
  • Loading branch information
laurens-ritense committed May 28, 2024
2 parents 5c317af + 8b8f164 commit 847f905
Show file tree
Hide file tree
Showing 31 changed files with 1,047 additions and 44 deletions.
70 changes: 35 additions & 35 deletions package-lock.json

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

6 changes: 5 additions & 1 deletion projects/valtimo/config/assets/core/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,11 @@
"noFormSpecified": "Für diese Registerkarte wurde keine Formulardefinition angegeben.",
"formNotFound": "Die Formulardefinition '{{formDefinitionName}}' konnte nicht gefunden werden."
},
"rowLocked": "Kein Zugriff zu dieser Fall!"
"rowLocked": "Kein Zugriff zu dieser Fall!",
"widgets": {
"noWidgets": "Keine Widgets",
"noWidgetsDescription": "Für dieses Tab sind keine Widgets konfiguriert, oder Sie verfügen nicht über die entsprechenden Berechtigungen, um sie anzuzeigen."
}
},
"document": {
"title": {
Expand Down
6 changes: 5 additions & 1 deletion projects/valtimo/config/assets/core/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,11 @@
"noFormSpecified": "No form definition has been specified for this tab.",
"formNotFound": "The form definition '{{formDefinitionName}}' could not be found."
},
"rowLocked": "You don't have access to this case"
"rowLocked": "You don't have access to this case",
"widgets": {
"noWidgets": "No widgets",
"noWidgetsDescription": "There are no widgets configured for this tab, or you don't have the rights to view them."
}
},
"document": {
"title": {
Expand Down
6 changes: 5 additions & 1 deletion projects/valtimo/config/assets/core/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,11 @@
"noFormSpecified": "Voor dit tabblad is geen formulierdefinitie opgegeven.",
"formNotFound": "De formulierdefinitie '{{formDefinitionName}}' kan niet worden gevonden."
},
"rowLocked": "Je hebt geen toegang tot dit dossier"
"rowLocked": "Je hebt geen toegang tot dit dossier",
"widgets": {
"noWidgets": "Geen widgets",
"noWidgetsDescription": "Er zijn geen widgets geconfigureerd voor dit tabblad, of je hebt niet de juiste rechten om deze te zien."
}
},
"document": {
"title": {
Expand Down
4 changes: 3 additions & 1 deletion projects/valtimo/config/src/lib/services/base-api.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export abstract class BaseApiService {
}

public getApiUrl(urlPart: string): string {
return `${UrlUtils.formatUrlTrailingSlash(this._valtimoEndpointUri, false)}${urlPart}`;
const urlWithStartSlash = UrlUtils.formatUrlStartWithSlash(urlPart);
const urlFormattedWithTrailingSlash = `${UrlUtils.formatUrlTrailingSlash(this._valtimoEndpointUri, false)}${urlWithStartSlash}`;
return urlFormattedWithTrailingSlash;
}
}
4 changes: 4 additions & 0 deletions projects/valtimo/config/src/lib/services/config.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ export class ConfigService {
};
}

public get featureToggles(): ValtimoConfig['featureToggles'] {
return this.config.featureToggles;
}

public get config$(): Observable<ValtimoConfig> {
return of(this.config);
}
Expand Down
8 changes: 8 additions & 0 deletions projects/valtimo/config/src/lib/utils/url.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ class UrlUtils {
return url;
}

static formatUrlStartWithSlash(url: string): string {
if (url && typeof url === 'string' && url.length > 0 && url[0] !== '/') {
return `/${url}`;
}

return `${url}`;
}

static getUrlHost(urlString: string): string {
let url!: URL;

Expand Down
4 changes: 3 additions & 1 deletion projects/valtimo/dossier/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"ngx-toastr",
"moment",
"@ngx-translate/core",
"@ngx-translate/http-loader"
"@ngx-translate/http-loader",
"bin-pack-with-constraints",
"uuid"
]
}
Loading

0 comments on commit 847f905

Please sign in to comment.