- ![]()
+ ![]()
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.spec.ts b/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.spec.ts
index 0a215db4e5..8d3719cd16 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.spec.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.spec.ts
@@ -21,11 +21,12 @@ class ConfigStub {
}
observeDefaultTranslations(lang: string): Observable<{
locale: Locale;
+ language: string;
dict: Observable;
}> {
return rxjs.of(null);
}
- setLocale(lang: string): void {}
+ setLocale(locale: Locale, language: string): void {}
}
describe('TranslationLoader', () => {
@@ -103,7 +104,7 @@ describe('TranslationLoader', () => {
it('should call setLocale with correct locale', async () => {
const setLocaleSpy = spyOn(config, 'setLocale').and.callThrough();
await callGetTranslation('de');
- expect(setLocaleSpy.calls.mostRecent().args).toEqual(['de_DE']);
+ expect(setLocaleSpy.calls.mostRecent().args).toEqual(['de_DE', 'de']);
});
it('should not call observeDefaultTranslations', async () => {
@@ -299,12 +300,16 @@ describe('TranslationLoader', () => {
it('should call setLocale with correct locale', async () => {
const setLocaleSpy = spyOn(config, 'setLocale').and.callThrough();
await callGetTranslation('de');
- expect(setLocaleSpy.calls.mostRecent().args).toEqual(['de_DE']);
+ expect(setLocaleSpy.calls.mostRecent().args).toEqual(['de_DE', 'de']);
});
it('should include translations via observeDefaultTranslations', async () => {
- config.observeDefaultTranslations = (lang) =>
- rxjs.of({ locale: LANGUAGES['de'], dict: rxjs.of({ foo: 'bar' }) });
+ config.observeDefaultTranslations = (language) =>
+ rxjs.of({
+ locale: LANGUAGES[language],
+ language,
+ dict: rxjs.of({ foo: 'bar' }),
+ });
const result = await callGetTranslation('de');
expect(result).toEqual({ foo: 'bar' });
});
@@ -318,8 +323,12 @@ describe('TranslationLoader', () => {
});
it('should merge translations via observeTranslationOverrides', async () => {
- config.observeDefaultTranslations = (lang) =>
- rxjs.of({ locale: LANGUAGES['de'], dict: rxjs.of({ foo: 'bar' }) });
+ config.observeDefaultTranslations = (language) =>
+ rxjs.of({
+ locale: LANGUAGES[language],
+ language,
+ dict: rxjs.of({ foo: 'bar' }),
+ });
config.observeTranslationOverrides = (lang) => {
return rxjs.of({ bar: 'baz' });
};
@@ -328,8 +337,12 @@ describe('TranslationLoader', () => {
});
it('should override nested translations via observeTranslationOverrides', async () => {
- config.observeDefaultTranslations = (lang) =>
- rxjs.of({ locale: LANGUAGES['de'], dict: rxjs.of({ prefix: { foo: 'bar' } }) });
+ config.observeDefaultTranslations = (language) =>
+ rxjs.of({
+ locale: LANGUAGES[language],
+ language,
+ dict: rxjs.of({ prefix: { foo: 'bar' } }),
+ });
config.observeTranslationOverrides = (lang) => {
return rxjs.of({ prefix: { bar: 'baz' } });
};
@@ -338,8 +351,12 @@ describe('TranslationLoader', () => {
});
it('should deep-merge translations via observeTranslationOverrides', async () => {
- config.observeDefaultTranslations = (lang) =>
- rxjs.of({ locale: LANGUAGES['de'], dict: rxjs.of({ prefix: { foo: 'bar' } }) });
+ config.observeDefaultTranslations = (language) =>
+ rxjs.of({
+ locale: LANGUAGES[language],
+ language,
+ dict: rxjs.of({ prefix: { foo: 'bar' } }),
+ });
config.observeTranslationOverrides = (lang) => rxjs.of({ 'prefix.bar': 'baz' });
const result = await callGetTranslation('de');
expect(result).toEqual({ prefix: { foo: 'bar', bar: 'baz' } });
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.ts b/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.ts
index a8cd41c131..545e7f96bc 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/translations/translation-loader.ts
@@ -59,11 +59,12 @@ export class TranslationLoader implements TranslateLoader {
if (lang === 'none') {
return of({});
}
- if (!LANGUAGES[lang]) {
- console.error('unknown locale for language ' + lang);
+ // backend can not handle sub-languages
+ const langBackend = lang.startsWith('de-') ? 'de' : lang;
+ if (!LANGUAGES[langBackend]) {
+ console.error('unknown locale for language ' + lang + ' / ' + langBackend);
}
- console.log('lang', lang);
- this.configService.setLocale(LANGUAGES[lang]);
+ this.configService.setLocale(LANGUAGES[langBackend], lang);
return rxjs
.forkJoin({
originalTranslations: this.getOriginalTranslations(lang).pipe(
@@ -91,7 +92,7 @@ export class TranslationLoader implements TranslateLoader {
switch (this.getSource()) {
case 'repository':
return this.configService.observeDefaultTranslations().pipe(
- filter((arg) => !arg || arg.locale === LANGUAGES[lang]),
+ filter((arg) => !arg?.locale || arg.language === lang),
switchMap((arg) => arg?.dict?.pipe(first()) || of(null)),
first(),
);
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.spec.ts b/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.spec.ts
index cdbbb1dff9..b259119cf2 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.spec.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.spec.ts
@@ -65,6 +65,8 @@ describe('TranslationsService', () => {
sessionStorageServiceStub as any as SessionStorageService,
translateServiceSpy as TranslateService,
null,
+ null,
+ null,
);
});
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.ts b/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.ts
index 47cd83abc0..140db27923 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Optional } from '@angular/core';
+import { ApplicationRef, Injectable, Optional } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { BehaviorSubject, from, Observable, of as observableOf } from 'rxjs';
@@ -27,8 +27,19 @@ export class TranslationsService {
private route: ActivatedRoute,
private storage: SessionStorageService,
private translate: TranslateService,
+ private sessionStorage: SessionStorageService,
+ private ref: ApplicationRef,
@Optional() private appService: AppService,
- ) {}
+ ) {
+ this.sessionStorage?.observe('language').subscribe((lang) => {
+ // language has changed, i.e. user has different preference
+ if (this.translate.currentLang && this.translate.currentLang !== lang) {
+ this.initialize().subscribe(() => {
+ this.ref.tick();
+ });
+ }
+ });
+ }
/**
* Determines and configures the language to use and triggers loading of translations with
diff --git a/Frontend/src/app/core-ui-module/styles/material-theme.scss b/Frontend/src/app/core-ui-module/styles/material-theme.scss
index 0856107fea..e01ec727a8 100644
--- a/Frontend/src/app/core-ui-module/styles/material-theme.scss
+++ b/Frontend/src/app/core-ui-module/styles/material-theme.scss
@@ -340,12 +340,23 @@ body {
.mat-mdc-checkbox {
.mdc-checkbox__background {
border-color: $primary !important;
+
background-color: #fff !important;
.mdc-checkbox__checkmark {
color: #fff !important;
}
}
+ &.mdc-checkbox--disabled {
+ .mdc-checkbox__background {
+ border-color: $primaryLight !important;
+ }
+ &.mat-mdc-checkbox-checked {
+ .mdc-checkbox__background {
+ background-color: $primaryLight !important;
+ }
+ }
+ }
&.mat-mdc-checkbox-checked {
.mdc-checkbox__background {
background-color: $primary !important;
diff --git a/Frontend/src/app/features/dialogs/dialog-modules/add-with-connector-dialog/add-with-connector-dialog.component.html b/Frontend/src/app/features/dialogs/dialog-modules/add-with-connector-dialog/add-with-connector-dialog.component.html
index e9420d285b..b919570adc 100644
--- a/Frontend/src/app/features/dialogs/dialog-modules/add-with-connector-dialog/add-with-connector-dialog.component.html
+++ b/Frontend/src/app/features/dialogs/dialog-modules/add-with-connector-dialog/add-with-connector-dialog.component.html
@@ -11,10 +11,9 @@
'CONNECTOR.MIMETYPE.' +
(filetype.mimetype === 'application/zip'
? filetype.ccressourcetype +
- '_' +
- filetype.ccressourceversion +
- '_' +
- filetype.ccresourcesubtype
+ (filetype.ccressourceversion
+ ? '_' + filetype.ccressourceversion + '_' + filetype.ccresourcesubtype
+ : '')
: filetype.mimetype) | translate
}}
diff --git a/Frontend/src/app/features/dialogs/dialog-modules/mds-editor-dialog/mds-editor-dialog.component.ts b/Frontend/src/app/features/dialogs/dialog-modules/mds-editor-dialog/mds-editor-dialog.component.ts
index 40a78d3842..234944a468 100644
--- a/Frontend/src/app/features/dialogs/dialog-modules/mds-editor-dialog/mds-editor-dialog.component.ts
+++ b/Frontend/src/app/features/dialogs/dialog-modules/mds-editor-dialog/mds-editor-dialog.component.ts
@@ -44,7 +44,12 @@ export class MdsEditorDialogComponent implements OnInit, AfterViewInit {
}
async ngOnInit(): Promise {
- await this.initMdsEditor();
+ try {
+ await this.initMdsEditor();
+ } catch (e) {
+ this.handleError(e);
+ this.dialogRef.close(null);
+ }
this.initButtons();
this.registerProgressIndicator();
// `SendFeedbackDialog` works similar to this component. Please update accordingly when
@@ -180,7 +185,7 @@ export class MdsEditorDialogComponent implements OnInit, AfterViewInit {
}
private handleError(error: any): void {
console.error(error);
- if (error instanceof UserPresentableError) {
+ if (error instanceof UserPresentableError || error.message) {
this.toast.error(null, error.message);
} else {
this.toast.error(error);
diff --git a/Frontend/src/app/features/dialogs/dialog-modules/simple-edit-dialog/simple-edit-license/simple-edit-license.component.ts b/Frontend/src/app/features/dialogs/dialog-modules/simple-edit-dialog/simple-edit-license/simple-edit-license.component.ts
index 6546c5b84f..9e7da0cc61 100644
--- a/Frontend/src/app/features/dialogs/dialog-modules/simple-edit-dialog/simple-edit-license/simple-edit-license.component.ts
+++ b/Frontend/src/app/features/dialogs/dialog-modules/simple-edit-dialog/simple-edit-license/simple-edit-license.component.ts
@@ -174,7 +174,7 @@ export class SimpleEditLicenseComponent implements OnInit {
this.initalAuthorFreetext = this.authorFreetext;
setTimeout(async () => {
if (updateInvalid) {
- this.invalid = !this.fromUpload && !isValid;
+ this.invalid = !isValid;
this.wasInvalid = this.invalid;
}
if (this.tpLicense && this.modeGroup) {
diff --git a/Frontend/src/app/features/mds/mds-editor/mds-editor-core/mds-editor-core.component.scss b/Frontend/src/app/features/mds/mds-editor/mds-editor-core/mds-editor-core.component.scss
index 8d571b586a..976fc9bf5b 100644
--- a/Frontend/src/app/features/mds/mds-editor/mds-editor-core/mds-editor-core.component.scss
+++ b/Frontend/src/app/features/mds/mds-editor/mds-editor-core/mds-editor-core.component.scss
@@ -6,4 +6,12 @@
//
// An alternative would be to use `overflow-x: clip` when it is supported by Safari.
padding: 0 var(--mds-editor-horizontal-padding, 0);
+ ::ng-deep {
+ // fix multi-line bottom hints
+ .mat-mdc-form-field-hint-wrapper,
+ .mat-mdc-form-field-error-wrapper {
+ position: relative;
+ margin-top: -20px;
+ }
+ }
}
diff --git a/Frontend/src/app/features/mds/mds-editor/mds-editor-instance.service.ts b/Frontend/src/app/features/mds/mds-editor/mds-editor-instance.service.ts
index 4b85c848e3..25618f44db 100644
--- a/Frontend/src/app/features/mds/mds-editor/mds-editor-instance.service.ts
+++ b/Frontend/src/app/features/mds/mds-editor/mds-editor-instance.service.ts
@@ -262,7 +262,10 @@ export class MdsEditorInstanceService implements OnDestroy {
}
// Set initial values, so the initial completion status is calculated correctly.
this.value$.next([...this.initialValues.jointValues]);
- if (this.mdsEditorInstanceService.getIsBulk(nodes)) {
+ if (
+ this.mdsEditorInstanceService.getIsBulk(nodes) &&
+ this.bulkMode.value !== 'replace'
+ ) {
this.bulkMode.next('no-change');
}
this.initialValuesSubject.next(this.initialValues);
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-checkbox/mds-editor-widget-checkbox.component.ts b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-checkbox/mds-editor-widget-checkbox.component.ts
index 88afbc43f5..d486fa68da 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-checkbox/mds-editor-widget-checkbox.component.ts
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-checkbox/mds-editor-widget-checkbox.component.ts
@@ -12,17 +12,19 @@ export class MdsEditorWidgetCheckboxComponent extends MdsEditorWidgetBase implem
formControl: UntypedFormControl;
isIndeterminate: boolean;
- ngOnInit(): void {
- const initialValue = this.widget.getInitialValues()?.jointValues?.[0];
- this.isIndeterminate = !!this.widget.getInitialValues()?.individualValues;
- this.setIndeterminateValues(this.isIndeterminate);
+ async ngOnInit() {
this.formControl = new UntypedFormControl(
- initialValue === 'true',
+ false,
this.getStandardValidators({ requiredValidator }),
);
this.formControl.valueChanges.subscribe((value: boolean) => {
this.setValue([value ? value.toString() : 'false'], this.formControl.dirty);
});
+ const initialValue = (await this.widget.getInitalValuesAsync()).jointValues?.[0];
+ this.formControl.setValue(initialValue === 'true');
+ this.isIndeterminate = !!(await this.widget.getInitalValuesAsync()).individualValues;
+ this.setIndeterminateValues(this.isIndeterminate);
+
this.registerValueChanges(this.formControl);
}
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.scss b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.scss
index a0360a273f..e14ee4adc7 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.scss
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.scss
@@ -23,7 +23,17 @@ mat-form-field {
// spacing for drop-down button
padding-right: 35px;
}
-
+mat-chip {
+ &.indeterminate {
+ background: repeating-linear-gradient(
+ -45deg,
+ var(--palette-primary-50),
+ var(--palette-primary-50) 5px,
+ var(--palette-primary-100) 5px,
+ var(--palette-primary-100) 10px
+ );
+ }
+}
.mat-select-arrow {
// Use the button color which respects disabled state.
color: unset;
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-container/mds-editor-widget-container.component.html b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-container/mds-editor-widget-container.component.html
index 1c7d61e153..c0aed4fc1b 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-container/mds-editor-widget-container.component.html
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-container/mds-editor-widget-container.component.html
@@ -56,6 +56,7 @@
- {{ repo.title | titlecase }}
+ {{ repo.title }}
-
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-wysiwyg-html/mds-editor-widget-tinymce.component.ts b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-wysiwyg-html/mds-editor-widget-tinymce.component.ts
index a0dc0440b1..12c4756488 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-wysiwyg-html/mds-editor-widget-tinymce.component.ts
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-wysiwyg-html/mds-editor-widget-tinymce.component.ts
@@ -84,6 +84,8 @@ export class MdsEditorWidgetTinyMCE extends MdsEditorWidgetBase implements OnIni
async ngAfterViewInit() {
this._html = (await this.widget.getInitalValuesAsync()).jointValues[0];
+ (this.editorConfigDefault as any).base_url =
+ this.platformLocation.getBaseHrefFromDOM() + 'tinymce/';
if (this.widget.definition.configuration) {
this.editorConfig = {
...this.editorConfigDefault,
diff --git a/Frontend/src/app/main/error-handler.service.ts b/Frontend/src/app/main/error-handler.service.ts
index 1784b2bc09..1f58d5c16f 100644
--- a/Frontend/src/app/main/error-handler.service.ts
+++ b/Frontend/src/app/main/error-handler.service.ts
@@ -24,7 +24,11 @@ export class ErrorHandlerService {
async handleError(error: ApiErrorResponse, req: HttpRequest) {
// console.log('handleError', error, req);
- if (req.method === 'GET' && req.url === this.getApiUrl('/config/v1/values')) {
+ if (error?.error?.type === 'abort') {
+ // this might cause by explicit abort and a redirect
+ // do nothing to prevent firefox from showing a temporary message i.e. on login sso redirect
+ console.warn('Explicitly aborted, do not displaying a message', error);
+ } else if (req.method === 'GET' && req.url === this.getApiUrl('/config/v1/values')) {
this.showConfigurationErrorNotice(error);
} else if (
req.method === 'GET' &&
diff --git a/Frontend/src/app/main/navigation/main-menu-dropdown/main-menu-dropdown.component.scss b/Frontend/src/app/main/navigation/main-menu-dropdown/main-menu-dropdown.component.scss
index b66d9667d6..d66ad8a082 100644
--- a/Frontend/src/app/main/navigation/main-menu-dropdown/main-menu-dropdown.component.scss
+++ b/Frontend/src/app/main/navigation/main-menu-dropdown/main-menu-dropdown.component.scss
@@ -22,18 +22,20 @@ $mainMenuSelectedBackground: linear-gradient(
@if variable-exists(mainMenuBackgroundColor) {
background-color: $mainMenuBackgroundColor;
}
- .mat-menu-item {
+ .mat-mdc-menu-item {
@if variable-exists(mainMenuForegroundColor) {
&:not(:disabled) {
- color: $mainMenuForegroundColor;
- @if variable-exists(mainMenuForegroundColorIcon) {
- > i {
- color: $mainMenuForegroundColorIcon;
+ > span {
+ color: $mainMenuForegroundColor;
+ @if variable-exists(mainMenuForegroundColorIcon) {
+ > i {
+ color: $mainMenuForegroundColorIcon;
+ }
}
}
}
}
- &.mat-menu-item-selected {
+ &.mat-mdc-menu-item-selected {
background: $mainMenuSelectedBackground;
}
&.cdk-focused {
@@ -45,10 +47,12 @@ $mainMenuSelectedBackground: linear-gradient(
&.cdk-key-focused {
background-color: $mainMenuHoverBackgroundColor;
@if variable-exists(mainMenuBackgroundColor) {
- color: $mainMenuHoverForegroundColor;
- @if variable-exists(mainMenuHoverForegroundColorIcon) {
- > i {
- color: $mainMenuHoverForegroundColorIcon;
+ > span {
+ color: $mainMenuHoverForegroundColor;
+ @if variable-exists(mainMenuHoverForegroundColorIcon) {
+ > i {
+ color: $mainMenuHoverForegroundColorIcon;
+ }
}
}
}
diff --git a/Frontend/src/app/main/navigation/top-bar/top-bar.component.html b/Frontend/src/app/main/navigation/top-bar/top-bar.component.html
index 1568a48f56..4e16b16c94 100644
--- a/Frontend/src/app/main/navigation/top-bar/top-bar.component.html
+++ b/Frontend/src/app/main/navigation/top-bar/top-bar.component.html
@@ -160,7 +160,7 @@
data-test="main-nav-user-menu-button"
>
- {{ 'ADMIN.JOBS.PARAMETERS' | translate }}
{{ 'ADMIN.TOOLKIT.AUTHENTICATE' | translate }}
-
{{ 'ADMIN.TOOLKIT.REFRESH_EDU_GROUP_CACHE' | translate }}
-
-
cached{{ 'ADMIN.TOOLKIT.CACHE' | translate }}
diff --git a/Frontend/src/app/pages/admin-page/admin-page.component.ts b/Frontend/src/app/pages/admin-page/admin-page.component.ts
index 2c7a5705e2..5d65493001 100644
--- a/Frontend/src/app/pages/admin-page/admin-page.component.ts
+++ b/Frontend/src/app/pages/admin-page/admin-page.component.ts
@@ -602,19 +602,7 @@ export class AdminPageComponent implements OnInit, OnDestroy {
},
);
}
- public refreshEduGroupCache() {
- this.globalProgress = true;
- this.admin.refreshEduGroupCache().subscribe(
- () => {
- this.globalProgress = false;
- this.toast.toast('ADMIN.TOOLKIT.EDU_GROUP_CACHE_REFRESHED');
- },
- (error: any) => {
- this.globalProgress = false;
- this.toast.error(error);
- },
- );
- }
+
public refreshCache(sticky: boolean) {
this.globalProgress = true;
this.admin
diff --git a/Frontend/src/app/pages/render-page/render-page.component.ts b/Frontend/src/app/pages/render-page/render-page.component.ts
index 25189c4967..c1e96e4fe0 100644
--- a/Frontend/src/app/pages/render-page/render-page.component.ts
+++ b/Frontend/src/app/pages/render-page/render-page.component.ts
@@ -776,7 +776,7 @@ export class RenderPageComponent implements EventListener, OnInit, OnDestroy, Af
params.mds = this.getMdsId();
params.sidenav = true;
params.repo = this.repository;
- params.parameters = JSON.stringify(data);
+ params.filters = JSON.stringify(data);
this.router.navigate([UIConstants.ROUTER_PREFIX + 'search'], { queryParams: params });
});
}
diff --git a/Frontend/src/app/pages/search-page/search-page-results-all.component.html b/Frontend/src/app/pages/search-page/search-page-results-all.component.html
index 017645b92c..c2eaf16cce 100644
--- a/Frontend/src/app/pages/search-page/search-page-results-all.component.html
+++ b/Frontend/src/app/pages/search-page/search-page-results-all.component.html
@@ -35,7 +35,7 @@