Skip to content
Snippets Groups Projects
Commit 58f614a6 authored by Kawtar Laariche's avatar Kawtar Laariche
Browse files

#19: use custom drop down menu in model details component

parent d5a01b16
No related branches found
No related tags found
No related merge requests found
...@@ -41,39 +41,11 @@ ...@@ -41,39 +41,11 @@
</mat-menu> </mat-menu>
</div> </div>
</div> </div>
<div class="version-container"> <gp-version-dropdown
<button [selectedDefaultRevision]="selectedDefaultRevision"
class="mdl-button" [revisionsList]="revisionsList"
#menuTrigger2="matMenuTrigger" (revisionChange)="onChangeVersion($event)"
[matMenuTriggerFor]="menu2" ></gp-version-dropdown>
(click)="menuTrigger2.openMenu()"
>
<span class="text-ellipsis"
>Version - {{ selectedDefaultRevision?.version }}</span
>
<i class="material-icons">keyboard_arrow_down</i>
</button>
<mat-menu #menu2="matMenu"
><ul>
<li
*ngFor="let revision of revisionsList"
[ngClass]="{
selected: revision.version === selectedDefaultRevision.version
}"
(click)="onChangeVersion(revision)"
class="li-border-bottom"
>
<span
[ngClass]="{
'md-cat-txtellipsis': revision.version.length > 15
}"
>{{ revision.version }}</span
>
<span class="custom-tooltip-text">{{ revision.version }}</span>
</li>
</ul></mat-menu
>
</div>
</div> </div>
<ng-container *ngIf="isLoggedIn$ | async; else notLoggedIn"> <ng-container *ngIf="isLoggedIn$ | async; else notLoggedIn">
<div class="md-head-container2"> <div class="md-head-container2">
......
...@@ -51,6 +51,7 @@ import { apiConfig } from 'src/app/core/config'; ...@@ -51,6 +51,7 @@ import { apiConfig } from 'src/app/core/config';
import { PrivateCatalogsService } from 'src/app/core/services/private-catalogs.service'; import { PrivateCatalogsService } from 'src/app/core/services/private-catalogs.service';
import { SolutionIdComponent } from 'src/app/shared/components/solution-id/solution-id.component'; import { SolutionIdComponent } from 'src/app/shared/components/solution-id/solution-id.component';
import { BreadcrumbNavigationComponent } from 'src/app/shared/components/breadcrumb-navigation/breadcrumb-navigation.component'; import { BreadcrumbNavigationComponent } from 'src/app/shared/components/breadcrumb-navigation/breadcrumb-navigation.component';
import { VersionDropdownComponent } from 'src/app/shared/components/version-dropdown/version-dropdown.component';
interface SolutionData { interface SolutionData {
solutionId: string; solutionId: string;
...@@ -90,6 +91,7 @@ interface SolutionData { ...@@ -90,6 +91,7 @@ interface SolutionData {
FormsModule, FormsModule,
SolutionIdComponent, SolutionIdComponent,
BreadcrumbNavigationComponent, BreadcrumbNavigationComponent,
VersionDropdownComponent,
], ],
templateUrl: './model-details.component.html', templateUrl: './model-details.component.html',
styleUrl: './model-details.component.scss', styleUrl: './model-details.component.scss',
...@@ -103,14 +105,8 @@ export class ModelDetailsComponent implements OnInit { ...@@ -103,14 +105,8 @@ export class ModelDetailsComponent implements OnInit {
imageToShow: any; imageToShow: any;
isImageLoading = true; isImageLoading = true;
selectedDefaultCatalog!: Catalog; selectedDefaultCatalog!: Catalog;
revisionsList!: { revisionsList!: Revision[];
version: string; selectedDefaultRevision!: Revision;
revisionId: string;
}[];
selectedDefaultRevision!: {
version: string;
revisionId: string;
};
averageRatings!: AverageRatings; averageRatings!: AverageRatings;
allRatings: AllUserRating[] = []; allRatings: AllUserRating[] = [];
totalRatingsCount: number = 0; totalRatingsCount: number = 0;
...@@ -371,7 +367,7 @@ export class ModelDetailsComponent implements OnInit { ...@@ -371,7 +367,7 @@ export class ModelDetailsComponent implements OnInit {
}); });
} }
onChangeVersion(revision: { version: string; revisionId: string }) { onChangeVersion(revision: Revision) {
this.selectedDefaultRevision = revision; this.selectedDefaultRevision = revision;
this.setVersionIdInService(); this.setVersionIdInService();
this.setRevisionInService(revision); this.setRevisionInService(revision);
......
<div class="version-container">
<button
class="version-button"
#menuTrigger2="matMenuTrigger"
mat-raised-button
[matMenuTriggerFor]="menu2"
(click)="menuTrigger2.openMenu()"
>
<span>Version - {{ selectedDefaultRevision?.version }}</span>
<mat-icon iconPositionEnd>keyboard_arrow_down</mat-icon>
</button>
<mat-menu #menu2="matMenu">
<mat-list role="list" *ngFor="let revision of revisionsList">
<mat-list-item
(click)="onChangeVersion(revision)"
style="cursor: pointer"
[ngClass]="{
selected: revision.version === selectedDefaultRevision.version
}"
>
<span style="font-size: 14px; line-height: 24px; font-weight: 400"
>Version - {{ revision.version }}</span
>
</mat-list-item>
</mat-list>
</mat-menu>
</div>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment