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.

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

Protractor cleanup for demo shell #9019

Merged
merged 23 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c85feda
[ci:force] cleanup protractor tests
DenysVuika Oct 24, 2023
e9dba2f
[ci:force] cleanup insights test
DenysVuika Oct 24, 2023
323b716
[ci:force] cleanup dead demo shell e2e
DenysVuika Oct 24, 2023
3679ffd
[ci:force] cleanup e2e
DenysVuika Oct 24, 2023
7fc97ab
[ci:force] cleanup e2e
DenysVuika Oct 24, 2023
95ec663
cleanup files component
DenysVuika Oct 24, 2023
9229e7a
[ci:force] cleanup e2e
DenysVuika Oct 24, 2023
69a1a07
[ci:force] remove user info SSO protractor e2e
DenysVuika Oct 24, 2023
3252382
[ci:force] remove viewer e2e already covered by other tests
DenysVuika Oct 24, 2023
863da72
[ci:force] remove custom font from demo shell
DenysVuika Oct 24, 2023
4da6878
[ci:force] demo shell viewer cleanup
DenysVuika Oct 24, 2023
4531921
[ci:force] cleanup viewer in demo shell
DenysVuika Oct 24, 2023
8b09829
[ci:force] rollback model changes
DenysVuika Oct 24, 2023
9288729
[ci:force] remove site picker from content demo
DenysVuika Oct 24, 2023
c30f3ac
[ci:force] cleanup files demo shell component
DenysVuika Oct 24, 2023
b9bad5f
[ci:force] cleanup e2e and dead code
DenysVuika Oct 24, 2023
f02eef6
[ci:force] cleanup dead code
DenysVuika Oct 24, 2023
dfb3192
[ci:force] fix linting
DenysVuika Oct 24, 2023
d623bc6
[ci:force] standalone home component
DenysVuika Oct 24, 2023
3996f2c
[ci:force] cleanup demo shell app layout
DenysVuika Oct 24, 2023
dc54754
[ci:force] cleanup css
DenysVuika Oct 24, 2023
d51354f
[ci:force] cleanup demo shell logout
DenysVuika Oct 24, 2023
5413869
Update demo-shell/src/app/components/app-layout/app-layout.component.…
DenysVuika Oct 27, 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
9 changes: 0 additions & 9 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
}
],
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand Down Expand Up @@ -306,7 +305,6 @@
"configDir": "lib/core/.storybook",
"compodoc": false,
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand All @@ -332,7 +330,6 @@
"outputDir": "dist/storybook/core",
"compodoc": false,
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand Down Expand Up @@ -454,7 +451,6 @@
"configDir": "lib/content-services/.storybook",
"compodoc": false,
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand All @@ -480,7 +476,6 @@
"outputDir": "dist/storybook/content-services",
"compodoc": false,
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand Down Expand Up @@ -648,7 +643,6 @@
"configDir": "lib/process-services-cloud/.storybook",
"compodoc": false,
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand All @@ -674,7 +668,6 @@
"outputDir": "dist/storybook/process-services-cloud",
"compodoc": false,
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand Down Expand Up @@ -1117,7 +1110,6 @@
]
},
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand All @@ -1138,7 +1130,6 @@
"outputDir": "dist/storybook/stories",
"compodoc": false,
"styles": [
"demo-shell/src/assets/fonts/muli/muli.css",
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss",
"node_modules/cropperjs/dist/cropper.min.css",
Expand Down
31 changes: 0 additions & 31 deletions demo-shell/e2e/app.e2e-spec.e2e.ts

This file was deleted.

28 changes: 0 additions & 28 deletions demo-shell/e2e/app.po.ts

This file was deleted.

9 changes: 0 additions & 9 deletions demo-shell/e2e/tsconfig.e2e.json

This file was deleted.

4 changes: 0 additions & 4 deletions demo-shell/src/app/app.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ router-outlet[name='overlay'] + * {
height: 100%;
width: 100%;
}

[dir='rtl'] .mat-icon {
transform: scale(-1, 1);
}
13 changes: 1 addition & 12 deletions demo-shell/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,12 @@ import { NgChartsModule } from 'ng2-charts';
import { HttpClientModule } from '@angular/common/http';
import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core';
import {
AppConfigService,
DebugAppConfigService,
CoreModule,
CoreAutomationService,
AuthModule,
provideTranslations
} from '@alfresco/adf-core';
import { AppConfigService, DebugAppConfigService, CoreModule, CoreAutomationService, AuthModule, provideTranslations } from '@alfresco/adf-core';
import { ExtensionsModule } from '@alfresco/adf-extensions';
import { AppComponent } from './app.component';
import { MaterialModule } from './material.module';
import { LogoutComponent } from './components/logout/logout.component';
import { AppLayoutComponent } from './components/app-layout/app-layout.component';
import { HomeComponent } from './components/home/home.component';
import { SearchBarComponent } from './components/search/search-bar.component';
import { SearchResultComponent } from './components/search/search-result.component';
import { FormComponent } from './components/form/form.component';
Expand All @@ -46,7 +38,6 @@ import { FormNodeViewerComponent } from './components/process-service/form-node-
import { AppsViewComponent } from './components/process-service/apps-view.component';
import { FilesComponent } from './components/files/files.component';
import { VersionManagerDialogAdapterComponent } from './components/files/version-manager-dialog-adapter.component';
import { MetadataDialogAdapterComponent } from './components/files/metadata-dialog-adapter.component';
import { appRoutes } from './app.routes';
import { TaskAttachmentsComponent } from './components/process-service/task-attachments.component';
import { ProcessAttachmentsComponent } from './components/process-service/process-attachments.component';
Expand Down Expand Up @@ -103,7 +94,6 @@ import { UserInfoComponent } from './components/app-layout/user-info/user-info.c
LogoutComponent,
AppLayoutComponent,
UserInfoComponent,
HomeComponent,
SearchBarComponent,
SearchResultComponent,
ProcessServiceComponent,
Expand All @@ -114,7 +104,6 @@ import { UserInfoComponent } from './components/app-layout/user-info/user-info.c
FilesComponent,
FormComponent,
VersionManagerDialogAdapterComponent,
MetadataDialogAdapterComponent,
TaskAttachmentsComponent,
ProcessAttachmentsComponent,
DemoPermissionComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
</adf-sidenav-layout-header>

<adf-sidenav-layout-navigation>
<ng-template let-isMenuMinimized="isMenuMinimized">
<ng-template>
<mat-nav-list class="app-sidenav-linklist">
<ng-container *ngFor="let link of links">
<ng-container *ngIf="link.children">
<mat-list-item (click)="trigger.openMenu()" [attr.data-automation-id]="link.title | translate" class="app-sidenav-link">
<mat-icon matListIcon>{{link.icon}}</mat-icon>
<span matLine *ngIf="!isMenuMinimized()">{{link.title | translate }}</span>
<span matLine>{{ link.title | translate }}</span>
<mat-icon class="app-sidenav-link__expand-button" [matMenuTriggerData]="{links: link.children}"
rippleTrigger mat-icon-button #trigger="matMenuTrigger"
[matMenuTriggerFor]="nestedMenu">arrow_right</mat-icon>
Expand All @@ -41,14 +41,14 @@
routerLinkActive="app-sidenav-link--active" [routerLinkActiveOptions]="{ exact: true }"
[attr.data-automation-id]="link.title | translate" class="app-sidenav-link">
<mat-icon matListIcon >{{link.icon}}</mat-icon>
<span matLine *ngIf="!isMenuMinimized()">{{link.title | translate }}</span>
<span matLine>{{link.title | translate }}</span>
DenysVuika marked this conversation as resolved.
Show resolved Hide resolved
</mat-list-item>
</ng-container>
</ng-container>

<mat-list-item adf-logout [enableRedirect]="enableRedirect" redirectUri="/logout" class="app-sidenav-link" data-automation-id="Logout" >
<mat-icon matListIcon>exit_to_app</mat-icon>
<span matLine *ngIf="!isMenuMinimized()">Logout</span>
<span matLine>Logout</span>
</mat-list-item>
</mat-nav-list>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
adf-file-uploading-dialog {
z-index: 1100;
}

.app-layout {
display: flex;
flex: 1;
Expand All @@ -12,25 +8,7 @@ adf-file-uploading-dialog {
color: var(--theme-primary-color);
}

.app-sidenav-link {
.mat-list-text {
font-size: 14px;
white-space: nowrap;
min-width: 120px;
padding: 0 10px;
}
}

&-menu-spacer {
flex: 1 1 auto;
}
}

mat-sidenav-content > div {
display: flex;
height: 100%;

> div {
flex: auto;
}
}
Loading