Browse Source

Check for leave link.

pull/998/head
Sebastian 3 years ago
parent
commit
201a3a68b1
  1. 30
      frontend/src/app/features/apps/pages/app.component.html
  2. 2
      frontend/src/app/shared/services/apps.service.ts
  3. 2
      tools/TestSuite/TestSuite.ApiTests/Settings/VerifySettings.cs

30
frontend/src/app/features/apps/pages/app.component.html

@ -24,20 +24,22 @@
</div> </div>
</div> </div>
<button type="button" class="btn btn-sm btn-text-secondary" (click)="dropdown.toggle()" sqxStopClick #buttonOptions> <ng-container *ngIf="app.canLeave">
<i class="icon-dots"></i> <button type="button" class="btn btn-sm btn-text-secondary" (click)="dropdown.toggle()" sqxStopClick #buttonOptions>
</button> <i class="icon-dots"></i>
</button>
<ng-container *sqxModal="dropdown;closeAlways:true">
<sqx-dropdown-menu [sqxAnchoredTo]="buttonOptions" [scrollY]="true"> <ng-container *sqxModal="dropdown;closeAlways:true">
<a class="dropdown-item dropdown-item-delete" <sqx-dropdown-menu [sqxAnchoredTo]="buttonOptions" [scrollY]="true">
(sqxConfirmClick)="leave.emit(app)" <a class="dropdown-item dropdown-item-delete"
confirmTitle="i18n:apps.leaveConfirmTitle" (sqxConfirmClick)="leave.emit(app)"
confirmText="i18n:apps.leaveConfirmText" confirmTitle="i18n:apps.leaveConfirmTitle"
confirmRememberKey="leaveApp"> confirmText="i18n:apps.leaveConfirmText"
{{ 'apps.leave' | sqxTranslate }} confirmRememberKey="leaveApp">
</a> {{ 'apps.leave' | sqxTranslate }}
</sqx-dropdown-menu> </a>
</sqx-dropdown-menu>
</ng-container>
</ng-container> </ng-container>
</div> </div>
</div> </div>

2
frontend/src/app/shared/services/apps.service.ts

@ -16,6 +16,7 @@ export class AppDto {
public readonly canCreateSchema: boolean; public readonly canCreateSchema: boolean;
public readonly canDelete: boolean; public readonly canDelete: boolean;
public readonly canLeave: boolean;
public readonly canReadAssets: boolean; public readonly canReadAssets: boolean;
public readonly canReadAssetsScripts: boolean; public readonly canReadAssetsScripts: boolean;
public readonly canReadBackups: boolean; public readonly canReadBackups: boolean;
@ -60,6 +61,7 @@ export class AppDto {
this.canCreateSchema = hasAnyLink(links, 'schemas/create'); this.canCreateSchema = hasAnyLink(links, 'schemas/create');
this.canDelete = hasAnyLink(links, 'delete'); this.canDelete = hasAnyLink(links, 'delete');
this.canLeave = hasAnyLink(links, 'leave');
this.canReadAssets = hasAnyLink(links, 'assets'); this.canReadAssets = hasAnyLink(links, 'assets');
this.canReadAssetsScripts = hasAnyLink(links, 'assets/scripts'); this.canReadAssetsScripts = hasAnyLink(links, 'assets/scripts');
this.canReadBackups = hasAnyLink(links, 'backups'); this.canReadBackups = hasAnyLink(links, 'backups');

2
tools/TestSuite/TestSuite.ApiTests/Settings/VerifySettings.cs

@ -14,7 +14,7 @@ public static class VerifySettings
[ModuleInitializer] [ModuleInitializer]
public static void Initialize() public static void Initialize()
{ {
Verifier.DerivePathInfo((sourceFile, projectDirectory, type, method) => DerivePathInfo((sourceFile, projectDirectory, type, method) =>
{ {
var path = Path.Combine(projectDirectory, "Verify"); var path = Path.Combine(projectDirectory, "Verify");

Loading…
Cancel
Save