Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS-5675] replace breadcrumbs with H1 tags #3358

Merged
merged 9 commits into from
Jul 21, 2023
Merged

[ACS-5675] replace breadcrumbs with H1 tags #3358

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e1d84c6
rename tabs css class to match the ACA app
DenysVuika Jul 20, 2023
90528fc
fix incorrect tooltip for close button
DenysVuika Jul 20, 2023
d32b8b2
fix close button layout and a11y
DenysVuika Jul 20, 2023
68d6960
lazy loading for details component
DenysVuika Jul 20, 2023
cfaf1c0
replace breadcrumbs with H1 tag
DenysVuika Jul 20, 2023
9de3729
replace breadcrumbs with H1 tag
DenysVuika Jul 20, 2023
36603c7
cleanup unused playwright pages
DenysVuika Jul 20, 2023
a430a5a
remove breadcrumbs from e2e
DenysVuika Jul 20, 2023
1a9fd72
remove line height
DenysVuika Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions e2e/playwright/actions/src/tests/create-library.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,12 @@ test.describe('Create Libraries ', () => {
test('[C280025] Create a public library', async ({ myLibrariesPage }) => {
const libraryDialog = myLibrariesPage.libraryDialog;
const libraryTable = myLibrariesPage.dataTable;
const libraryBreadcrumb = myLibrariesPage.breadcrumb;

await myLibrariesPage.selectCreateLibrary();
await libraryDialog.getLabelText(libraryNameLabel).fill(randomLibraryName);
await expect(libraryDialog.getLabelText(libraryNameLabel)).toHaveValue(randomLibraryName);
await expect(libraryDialog.getLabelText(libraryIdLabel)).toHaveValue(randomLibraryName);
await libraryDialog.createButton.click();
await expect(libraryBreadcrumb.getBreadcrumbItem(randomLibraryName)).toBeVisible();

await myLibrariesPage.navigate();
await libraryTable.goThroughPagesLookingForRowWithName(randomLibraryName);
Expand All @@ -108,11 +106,9 @@ test.describe('Create Libraries ', () => {
test('[C289880] Create a moderated library', async ({ myLibrariesPage }) => {
const libraryDialog = myLibrariesPage.libraryDialog;
const libraryTable = myLibrariesPage.dataTable;
const libraryBreadcrumb = myLibrariesPage.breadcrumb;

await myLibrariesPage.selectCreateLibrary();
await libraryDialog.createLibraryWithNameAndId(randomLibraryName, randomLibraryId, null, moderatedVisibility);
await expect(libraryBreadcrumb.getBreadcrumbItem(randomLibraryName)).toBeVisible();

await myLibrariesPage.navigate();
await libraryTable.goThroughPagesLookingForRowWithName(randomLibraryName);
Expand All @@ -124,11 +120,9 @@ test.describe('Create Libraries ', () => {
test('[C289881] Create a private library', async ({ myLibrariesPage }) => {
const libraryDialog = myLibrariesPage.libraryDialog;
const libraryTable = myLibrariesPage.dataTable;
const libraryBreadcrumb = myLibrariesPage.breadcrumb;

await myLibrariesPage.selectCreateLibrary();
await libraryDialog.createLibraryWithNameAndId(randomLibraryName, randomLibraryId, null, privateVisibility);
await expect(libraryBreadcrumb.getBreadcrumbItem(randomLibraryName)).toBeVisible();

await myLibrariesPage.navigate();
await libraryTable.goThroughPagesLookingForRowWithName(randomLibraryName);
Expand All @@ -140,13 +134,11 @@ test.describe('Create Libraries ', () => {
test('[C289882] Create a library with a given ID and description', async ({ myLibrariesPage }) => {
const libraryDialog = myLibrariesPage.libraryDialog;
const libraryTable = myLibrariesPage.dataTable;
const libraryBreadcrumb = myLibrariesPage.breadcrumb;
const libraryViewDetails = myLibrariesPage.acaHeader.viewDetails;
const libraryDetails = myLibrariesPage.libraryDetails;

await myLibrariesPage.selectCreateLibrary();
await libraryDialog.createLibraryWithNameAndId(randomLibraryName, randomLibraryId, randomLibraryDescription);
await expect(libraryBreadcrumb.getBreadcrumbItem(randomLibraryName)).toBeVisible();

await myLibrariesPage.navigate();
await libraryTable.goThroughPagesLookingForRowWithName(randomLibraryName);
Expand Down Expand Up @@ -193,15 +185,13 @@ test.describe('Create Libraries ', () => {
test('[C280029] Cancel button', async ({ myLibrariesPage }) => {
const libraryDialog = myLibrariesPage.libraryDialog;
const libraryTable = myLibrariesPage.dataTable;
const libraryBreadcrumb = myLibrariesPage.breadcrumb;

await myLibrariesPage.selectCreateLibrary();
await expect(libraryDialog.getDialogTitle(libraryDialogTitle)).toBeVisible();
await libraryDialog.getLabelText(libraryNameLabel).fill(randomLibraryName);
await libraryDialog.cancelButton.click();

await expect(libraryDialog.getDialogTitle(libraryDialogTitle)).toBeHidden();
await expect(libraryBreadcrumb.getBreadcrumbItem(randomLibraryName)).toHaveCount(0);
await expect(libraryTable.getRowByName(randomLibraryName)).toHaveCount(0);
});

Expand Down Expand Up @@ -243,15 +233,12 @@ test.describe('Create Libraries ', () => {
test('[C280030] Create 2 libraries with same name but different IDs', async ({ myLibrariesPage }) => {
const libraryDialog = myLibrariesPage.libraryDialog;
const libraryTable = myLibrariesPage.dataTable;
const libraryBreadcrumb = myLibrariesPage.breadcrumb;
const libraryName = commonLibraryName + ' (' + commonLibraryId + ')';
const libraryName2 = commonLibraryName + ' (' + randomLibraryId + ')';

await myLibrariesPage.selectCreateLibrary();
await libraryDialog.createLibraryWithNameAndId(commonLibraryName, randomLibraryId);

await expect(libraryBreadcrumb.getBreadcrumbItem(commonLibraryName)).toBeVisible();

await myLibrariesPage.navigate();
await libraryTable.goThroughPagesLookingForRowWithName(libraryName);
await expect(libraryTable.getRowByName(libraryName)).toBeVisible();
Expand Down
30 changes: 0 additions & 30 deletions e2e/protractor/suites/navigation/breadcrumb.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,36 +96,6 @@ describe('Breadcrumb', () => {
await verifyBreadcrumb(1, 'Personal Files');
});

it('[C260966] My Libraries breadcrumb main node', async () => {
await page.goToMyLibrariesAndWait();
await verifyBreadcrumb(1, 'My Libraries');
});

it('[C289891] Favorite Libraries breadcrumb main node', async () => {
await page.goToFavoriteLibrariesAndWait();
await verifyBreadcrumb(1, 'Favorite Libraries');
});

it('[C260971] Recent Files breadcrumb main node', async () => {
await page.clickRecentFiles();
await verifyBreadcrumb(1, 'Recent Files');
});

it('[C260972] Shared Files breadcrumb main node', async () => {
await page.clickSharedFiles();
await verifyBreadcrumb(1, 'Shared Files');
});

it('[C260973] Favorites breadcrumb main node', async () => {
await page.clickFavorites();
await verifyBreadcrumb(1, 'Favorites');
});

it('[C260974] Trash breadcrumb main node', async () => {
await page.clickTrash();
await verifyBreadcrumb(1, 'Trash');
});

it('[C260965] Personal Files breadcrumb for a folder hierarchy', async () => {
await page.clickPersonalFilesAndWait();
await page.dataTable.doubleClickOnRowByName(parent);
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "الإصدارات",
"COMMENTS": "تعليقات",
"PERMISSIONS": "أذونات",
"EXPAND": "يوسع",
"CLOSE_LIBRARY": "أغلق المكتبة"
"EXPAND": "يوسع"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Verze",
"COMMENTS": "Poznámky",
"PERMISSIONS": "Oprávnění",
"EXPAND": "Rozbalit",
"CLOSE_LIBRARY": "Close Library"
"EXPAND": "Rozbalit"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versioner",
"COMMENTS": "Kommentarer",
"PERMISSIONS": "Tilladelser",
"EXPAND": "Udvid",
"CLOSE_LIBRARY": "Luk bibliotek"
"EXPAND": "Udvid"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versionen",
"COMMENTS": "Kommentare",
"PERMISSIONS": "Berechtigungen",
"EXPAND": "Erweitern",
"CLOSE_LIBRARY": "Bibliothek schließen"
"EXPAND": "Erweitern"
}
},
"TOOLTIPS": {
Expand Down
4 changes: 2 additions & 2 deletions projects/aca-content/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,15 @@
},
"INFO_DRAWER": {
"TITLE": "Details",
"CLOSE": "Close",
"DATA_LOADING": "Data is loading",
"TABS": {
"PROPERTIES": "Properties",
"LIBRARY_PROPERTIES": "About",
"VERSIONS": "Versions",
"COMMENTS": "Comments",
"PERMISSIONS": "Permissions",
"EXPAND": "Expand",
"CLOSE_LIBRARY": "Close Library"
"EXPAND": "Expand"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versiones",
"COMMENTS": "Comentarios",
"PERMISSIONS": "Permisos",
"EXPAND": "Ampliar",
"CLOSE_LIBRARY": "Cerrar biblioteca"
"EXPAND": "Ampliar"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/fi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versiot",
"COMMENTS": "Kommentit",
"PERMISSIONS": "Oikeudet",
"EXPAND": "Laajenna",
"CLOSE_LIBRARY": "Sulje kirjasto"
"EXPAND": "Laajenna"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versions",
"COMMENTS": "Commentaires",
"PERMISSIONS": "Permissions",
"EXPAND": "Développer",
"CLOSE_LIBRARY": "Fermer la bibliothèque"
"EXPAND": "Développer"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versioni",
"COMMENTS": "Commenti",
"PERMISSIONS": "Autorizzazioni",
"EXPAND": "Espandi",
"CLOSE_LIBRARY": "Chiudi libreria"
"EXPAND": "Espandi"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "バージョン",
"COMMENTS": "コメント",
"PERMISSIONS": "権限",
"EXPAND": "展開",
"CLOSE_LIBRARY": "ライブラリを閉じる"
"EXPAND": "展開"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/nb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versjoner",
"COMMENTS": "Kommentarer",
"PERMISSIONS": "Tillatelser",
"EXPAND": "Utvid",
"CLOSE_LIBRARY": "Lukk bibliotek"
"EXPAND": "Utvid"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versies",
"COMMENTS": "Opmerkingen",
"PERMISSIONS": "Rechten",
"EXPAND": "Uitvouwen",
"CLOSE_LIBRARY": "Bibliotheek sluiten"
"EXPAND": "Uitvouwen"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Wersje",
"COMMENTS": "Komentarze",
"PERMISSIONS": "Uprawnienia",
"EXPAND": "Rozwiń",
"CLOSE_LIBRARY": "Zamknij bibliotekę"
"EXPAND": "Rozwiń"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versões",
"COMMENTS": "Comentários",
"PERMISSIONS": "Permissões",
"EXPAND": "Expandir",
"CLOSE_LIBRARY": "Fechar biblioteca"
"EXPAND": "Expandir"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Версии",
"COMMENTS": "Комментарии",
"PERMISSIONS": "Разрешения",
"EXPAND": "Развернуть",
"CLOSE_LIBRARY": "Закрыть библиотеку"
"EXPAND": "Развернуть"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/sv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "Versioner",
"COMMENTS": "Kommentarer",
"PERMISSIONS": "Behörigheter",
"EXPAND": "Expandera",
"CLOSE_LIBRARY": "Stäng bibliotek"
"EXPAND": "Expandera"
}
},
"TOOLTIPS": {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/assets/i18n/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@
"VERSIONS": "版本",
"COMMENTS": "注释",
"PERMISSIONS": "权限",
"EXPAND": "展开",
"CLOSE_LIBRARY": "关闭库"
"EXPAND": "展开"
}
},
"TOOLTIPS": {
Expand Down
5 changes: 2 additions & 3 deletions projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<mat-icon>arrow_back</mat-icon>
</button>
</adf-toolbar>
<adf-breadcrumb root="{{'ACA_FOLDER_RULES.ACTIONS.MANAGE_RULES' | translate}}"></adf-breadcrumb>
<h1 class="aca-page-title">{{ 'ACA_FOLDER_RULES.ACTIONS.MANAGE_RULES' | translate }}</h1>
</div>

<div class="aca-page-layout-content">
Expand All @@ -22,8 +22,7 @@

<adf-toolbar-title class="aca-manage-rules__actions-bar__title">
<mat-icon class="icon-aligner">folder</mat-icon>
<adf-breadcrumb root="{{ (folderInfo$ | async).name }}:{{'ACA_FOLDER_RULES.MANAGE_RULES.TOOLBAR.BREADCRUMB.RULES' | translate}}"
class="aca-manage-rules__actions-bar__title__breadcrumb"></adf-breadcrumb>
<h2 class="aca-page-title">{{ (folderInfo$ | async).name }}:{{'ACA_FOLDER_RULES.MANAGE_RULES.TOOLBAR.BREADCRUMB.RULES' | translate}}</h2>
</adf-toolbar-title>

<mat-slide-toggle
Expand Down
9 changes: 4 additions & 5 deletions projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
display: flex;
align-items: center;

.aca-page-title {
margin-left: 18px;
}

&__title {
align-items: center;
width: unset !important;
flex: 1;

&__breadcrumb {
margin-left: 18px;
}
}

&__buttons {
Expand All @@ -23,7 +23,6 @@
.mat-slide-toggle-label {
font-weight: 600;
font-size: 14px;
color: var(--adf-breadcrumb-item-active-color);
}

.vertical-divider {
Expand Down
3 changes: 1 addition & 2 deletions projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { NodeInfo } from '@alfresco/aca-shared/store';
import { delay, takeUntil } from 'rxjs/operators';
import { EditRuleDialogUiComponent } from '../rule-details/edit-rule-dialog.ui-component';
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { BreadcrumbModule, ConfirmDialogComponent } from '@alfresco/adf-content-services';
import { ConfirmDialogComponent } from '@alfresco/adf-content-services';
import { NotificationService, TemplateModule, ToolbarModule } from '@alfresco/adf-core';
import { ActionDefinitionTransformed } from '../model/rule-action.model';
import { ActionsService } from '../services/actions.service';
Expand All @@ -59,7 +59,6 @@ import { RuleDetailsUiComponent } from '../rule-details/rule-details.ui-componen
ToolbarModule,
MatButtonModule,
MatIconModule,
BreadcrumbModule,
MatProgressBarModule,
MatSlideToggleModule,
MatDividerModule,
Expand Down
Loading