chore: disable language (#1135)

Co-authored-by: ngruelaneo <[email protected]>
aneoconsulting · Jun 13, 2024 · e96c4d7 · e96c4d7 · github-actions · Jun 13, 2024
1 parent 02e3516
commit e96c4d7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 35 deletions.
diff --git a/src/app/components/navigation/change-language-button.component.html b/src/app/components/navigation/change-language-button.component.html
@@ -1,4 +1,4 @@
-<button mat-button [matMenuTriggerFor]="switchLanguage" [matTooltip]="languageButtonTip">
+<button mat-button [matMenuTriggerFor]="switchLanguage" [matTooltip]="languageButtonTip" [disabled]="availableLanguages.length === 0">
   <mat-icon matListItemIcon [fontIcon]="getIcon('language')" aria-hidden="true"/>
   <span>{{selectedLanguage.toLocaleUpperCase()}}</span>
 </button>

diff --git a/src/app/components/navigation/change-language-button.component.spec.ts b/src/app/components/navigation/change-language-button.component.spec.ts
@@ -51,26 +51,6 @@ describe('ChangeLanguageButtonComponent', () => {
   });
 
   describe('on init', () => {
-
-    it('should get Language from StorageService', () => {
-      mockStorageService.getItem.mockImplementationOnce(() => 'fr');
-      component.ngOnInit();
-      expect(component.selectedLanguage).toEqual('fr');
-    });
-
-    it('should get Language from URL', () => {
-      mockStorageService.getItem.mockImplementationOnce(() => null);
-      overrideLocation('admin/fr');
-      component.ngOnInit();
-      expect(component.selectedLanguage).toEqual('fr');
-    });
-
-    it('should redirect to stored Language if there is a conflict with URL language', () => {
-      mockStorageService.getItem.mockImplementationOnce(() => 'en');
-      overrideLocation('admin/fr');
-      component.ngOnInit();
-      expect(jestReplace).toHaveBeenCalledWith('/admin/en/my-route');
-    });
 
     it('should get Language from default config', () => {
       mockStorageService.getItem.mockImplementationOnce(() => null);

diff --git a/src/app/components/navigation/change-language-button.component.ts b/src/app/components/navigation/change-language-button.component.ts
@@ -33,12 +33,7 @@ export class ChangeLanguageButtonComponent implements OnInit {
   languageButtonTip = $localize`Change language`;
 
   ngOnInit(): void {
-    const storedLanguage: string | null = this.#storageService.getItem('language');
-    const urlLanguage = this.getLanguageFromUrl();
-    if (storedLanguage && urlLanguage && storedLanguage !== urlLanguage) {
-      window.location.replace('/admin/' + storedLanguage + this.getRoute());
-    }
-    this.selectedLanguage = storedLanguage ?? urlLanguage ?? this.#defaultConfigService.defaultLanguage;
+    this.selectedLanguage = this.#defaultConfigService.defaultLanguage;
     this.availableLanguages = this.#defaultConfigService.availableLanguages.filter(language => language !== this.selectedLanguage);
   }
 

diff --git a/src/app/services/default-config-service.spec.ts b/src/app/services/default-config-service.spec.ts
@@ -77,12 +77,6 @@ describe('DefaultConfigService', () => {
     it('should be english by default', () => {
       expect(service.defaultLanguage).toBe('en');
     });
-
-    it('should be french if the url is in french', () => {
-      overrideWindowLocation('fr');
-      service = new DefaultConfigService();
-      expect(service.defaultLanguage).toBe('fr');
-    });
   });
 
   it('should have a defined availableLanguages configuration', () => {

diff --git a/src/app/services/default-config.service.ts b/src/app/services/default-config.service.ts
@@ -191,8 +191,8 @@ export class DefaultConfigService {
     showFilters: true,
   };
 
-  readonly #availableLanguages = ['en', 'fr'];
-  readonly #defaultLanguage = window.location.href.includes('fr') ? 'fr' : 'en';
+  readonly #availableLanguages = ['en'];
+  readonly #defaultLanguage = 'en';
 
   readonly #defaultTasksViewInLogs = {
     serviceName: null,
File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
All files	99.74	99.88	99.56	99.82
applications	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
applications/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
applications/services	100	100	100	100
applications-filters.service.ts	100	100	100	100
applications-grpc.service.ts	100	100	100	100
applications-index.service.ts	100	100	100	100
components	99.63	100	98.71	100
actions-toolbar-group.component.ts	100	100	100	100
actions-toolbar.component.ts	100	100	100	100
auto-refresh-button.component.html	100	100	100	100
auto-refresh-button.component.ts	100	100	100	100
auto-refresh-dialog.component.html	100	100	100	100
auto-refresh-dialog.component.ts	100	100	100	100
columns-button.component.ts	100	100	100	100
columns-modify-dialog.component.html	100	100	100	100
columns-modify-dialog.component.ts	94.73	100	89.47	100
count-tasks-by-status.component.ts	100	100	100	100
icon-picker-dialog.component.html	100	100	100	100
icon-picker-dialog.component.ts	100	100	100	100
manage-custom-dialog.component.html	100	100	100	100
manage-custom-dialog.component.ts	100	100	100	100
page-header.component.html	100	100	100	100
page-header.component.ts	100	100	100	100
page-section-header.component.ts	100	100	100	100
page-section.component.ts	100	100	100	100
refresh-button.component.ts	100	100	100	100
share-url.component.ts	100	100	100	100
show-action-area.component.html	100	100	100	100
show-action-area.component.ts	100	100	100	100
show-actions.component.html	100	100	100	100
show-actions.component.ts	100	100	100	100
show-card-content.component.html	100	100	100	100
show-card-content.component.ts	100	100	100	100
show-card.component.html	100	100	100	100
show-card.component.ts	100	100	100	100
show-page.component.html	100	100	100	100
show-page.component.ts	100	100	100	100
spinner.component.ts	100	100	100	100
table-actions-toolbar.component.html	100	100	100	100
table-actions-toolbar.component.ts	100	100	100	100
table-container.component.ts	100	100	100	100
table-dashboard-actions-toolbar.component.html	100	100	100	100
table-dashboard-actions-toolbar.component.ts	100	100	100	100
table-index-actions-toolbar.component.html	100	100	100	100
table-index-actions-toolbar.component.ts	100	100	100	100
view-tasks-by-status.component.ts	100	100	100	100
components/filters	100	100	100	100
filters-chips.component.html	100	100	100	100
filters-chips.component.ts	100	100	100	100
filters-dialog-and.component.html	100	100	100	100
filters-dialog-and.component.ts	100	100	100	100
filters-dialog-filter-field.component.html	100	100	100	100
filters-dialog-filter-field.component.ts	100	100	100	100
filters-dialog-input.component.html	100	100	100	100
filters-dialog-input.component.ts	100	100	100	100
filters-dialog-or.component.html	100	100	100	100
filters-dialog-or.component.ts	100	100	100	100
filters-dialog.component.html	100	100	100	100
filters-dialog.component.ts	100	100	100	100
filters-toolbar.component.html	100	100	100	100
filters-toolbar.component.ts	100	100	100	100
components/navigation	96.2	96.55	94	96.84
add-external-service-dialog.component.html	100	100	100	100
add-external-service-dialog.component.ts	100	100	100	100
change-language-button.component.html	100	100	100	100
change-language-button.component.ts	73.52	0	70	75.86	41–48
edit-external-service-dialog.component.html	100	100	100	100
edit-external-service-dialog.component.ts	100	100	100	100
form-external-service.component.html	100	100	100	100
form-external-service.component.ts	100	100	100	100
manage-external-services-dialog.component.html	100	100	100	100
manage-external-services-dialog.component.ts	100	100	100	100
navigation.component.html	100	100	100	100
navigation.component.ts	100	100	100	100
theme-selector.component.html	100	100	100	100
theme-selector.component.ts	100	100	100	100
components/statuses	100	100	100	100
add-statuses-group-dialog.component.ts	100	100	100	100
edit-status-group-dialog.component.ts	100	100	100	100
form-statuses-group.component.html	100	100	100	100
form-statuses-group.component.ts	100	100	100	100
manage-groups-dialog.component.html	100	100	100	100
manage-groups-dialog.component.ts	100	100	100	100
components/table	100	100	100	100
table-actions.component.html	100	100	100	100
table-actions.component.ts	100	100	100	100
table-cell.component.html	100	100	100	100
table-cell.component.ts	100	100	100	100
table-column-header.component.html	100	100	100	100
table-column-header.component.ts	100	100	100	100
table-empty-data.component.ts	100	100	100	100
table-inspect-object-dialog.component.html	100	100	100	100
table-inspect-object-dialog.component.ts	100	100	100	100
table-inspect-object.component.html	100	100	100	100
table-inspect-object.component.ts	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
dashboard	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
dashboard/components	100	100	100	100
add-line-dialog.component.html	100	100	100	100
add-line-dialog.component.ts	100	100	100	100
edit-name-line-dialog.component.html	100	100	100	100
edit-name-line-dialog.component.ts	100	100	100	100
reorganize-lines-dialog.component.html	100	100	100	100
reorganize-lines-dialog.component.ts	100	100	100	100
split-lines-dialog.component.ts	100	100	100	100
statuses-group-card.component.html	100	100	100	100
statuses-group-card.component.ts	100	100	100	100
dashboard/components/lines	100	100	100	100
applications-line.component.html	100	100	100	100
applications-line.component.ts	100	100	100	100
partitions-line.component.html	100	100	100	100
partitions-line.component.ts	100	100	100	100
results-line.component.html	100	100	100	100
results-line.component.ts	100	100	100	100
sessions-line.component.html	100	100	100	100
sessions-line.component.ts	100	100	100	100
task-by-status-line.component.html	100	100	100	100
task-by-status-line.component.ts	100	100	100	100
tasks-line.component.html	100	100	100	100
tasks-line.component.ts	100	100	100	100
dashboard/services	100	100	100	100
dashboard-index.service.ts	100	100	100	100
dashboard-storage.service.ts	100	100	100	100
healthcheck	100	100	100	100
healthcheck.component.html	100	100	100	100
healthcheck.component.ts	100	100	100	100
healthcheck/services	100	100	100	100
healthcheck-grpc.service.ts	100	100	100	100
partitions	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.ts	100	100	100	100
partitions/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
partitions/services	100	100	100	100
partitions-filters.service.ts	100	100	100	100
partitions-grpc.service.ts	100	100	100	100
partitions-index.service.ts	100	100	100	100
pipes	100	100	100	100
duration.pipe.ts	100	100	100	100
empty-cell.pipe.ts	100	100	100	100
results	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.ts	100	100	100	100
results/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
results/services	100	100	100	100
results-filters.service.ts	100	100	100	100
results-grpc.service.ts	100	100	100	100
results-index.service.ts	100	100	100	100
results-statuses.service.ts	100	100	100	100
services	100	100	100	100
auto-refresh.service.ts	100	100	100	100
cache.service.ts	100	100	100	100
default-config.service.ts	100	100	100	100
environment.service.ts	100	100	100	100
filters.service.ts	100	100	100	100
grpc-build-request.service.ts	100	100	100	100
grpc-sort-field.service.ts	100	100	100	100
icons.service.ts	100	100	100	100
navigation.service.ts	100	100	100	100
notification.service.ts	100	100	100	100
query-params.service.ts	100	100	100	100
share-url.service.ts	100	100	100	100
storage.service.ts	100	100	100	100
table-storage.service.ts	100	100	100	100
table-url.service.ts	100	100	100	100
table.service.ts	100	100	100	100
tasks-by-status.service.ts	100	100	100	100
user-grpc.service.ts	100	100	100	100
user.service.ts	100	100	100	100
utils.service.ts	100	100	100	100
versions-grpc.service.ts	100	100	100	100
versions.service.ts	100	100	100	100
sessions	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.ts	100	100	100	100
sessions/components	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
sessions/services	100	100	100	100
sessions-filters.service.ts	100	100	100	100
sessions-grpc.service.ts	100	100	100	100
sessions-index.service.ts	100	100	100	100
sessions-statuses.service.ts	100	100	100	100
tasks	100	100	100	100
index.component.html	100	100	100	100
index.component.ts	100	100	100	100
show.component.ts	100	100	100	100
tasks/components	100	100	100	100
manage-view-in-logs-dialog.component.html	100	100	100	100
manage-view-in-logs-dialog.component.ts	100	100	100	100
table.component.html	100	100	100	100
table.component.ts	100	100	100	100
tasks/services	100	100	100	100
tasks-filters.service.ts	100	100	100	100
tasks-grpc.service.ts	100	100	100	100
tasks-index.service.ts	100	100	100	100
tasks-statuses.service.ts	100	100	100	100
tokens	100	100	100	100
filters.token.ts	100	100	100	100
types	100	100	100	100
navigation.ts	100	100	100	100
types/components	100	100	100	100
dashboard-line-table.ts	100	100	100	100
index.ts	100	100	100	100
show.ts	100	100	100	100
table.ts	100	100	100	100
types/services	100	100	100	100
grpcService.ts	100	100	100	100