Browse Source

Small UI improvements and tests fixed.

pull/364/head
Sebastian Stehle 7 years ago
parent
commit
bad2f2deed
  1. 30
      src/Squidex/app/features/assets/pages/assets-filters-page.component.html
  2. 6
      src/Squidex/app/features/assets/pages/assets-filters-page.component.scss
  3. 28
      src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html
  4. 6
      src/Squidex/app/features/content/pages/contents/contents-filters-page.component.scss
  5. 2
      src/Squidex/app/shared/services/apps.service.ts
  6. 2
      src/Squidex/app/shared/services/contents.service.spec.ts

30
src/Squidex/app/features/assets/pages/assets-filters-page.component.html

@ -28,16 +28,28 @@
<hr />
<h3>Saved queries</h3>
<div class="sidebar-section">
<h3>Saved queries</h3>
<a class="sidebar-item" *ngFor="let query of queries.queries | async; trackBy: trackByQuery" (click)="search(query.filter)"
[class.active]="isSelectedQuery(query.filter)">
{{query.name}}
<ng-container *ngIf="queries.queries | async; let queries">
<ng-container *ngIf="queries.length > 0; else noQuery">
<a class="sidebar-item" *ngFor="let query of queries; trackBy: trackByQuery" (click)="search(query.filter)"
[class.active]="isSelectedQuery(query.filter)">
{{query.name}}
<a class="sidebar-item-remove float-right" (click)="queries.remove(query.name)">
<i class="icon-close"></i>
</a>
</a>
</ng-container>
<a class="sidebar-item-remove float-right" (click)="queries.remove(query.name)">
<i class="icon-close"></i>
</a>
</a>
<ng-template #noQuery>
<div class="sidebar-item text-muted">
Search for assets and use <i class="icon-star-empty"></i> icon in search form to save query for all contributors.
</div>
</ng-template>
</ng-container>
</div>
</ng-container>
</sqx-panel>

6
src/Squidex/app/features/assets/pages/assets-filters-page.component.scss

@ -1,2 +1,6 @@
@import '_vars';
@import '_mixins';
@import '_mixins';
.text-muted {
text-decoration: none;
}

28
src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html

@ -26,15 +26,25 @@
<div class="sidebar-section">
<h3>Saved queries</h3>
<a class="sidebar-item" *ngFor="let query of schemaQueries.queries | async; trackBy: trackByQuery" (click)="search(query.filter)"
[class.active]="isSelectedQuery(query.filter)">
{{query.name}}
<a class="sidebar-item-remove float-right" (click)="schemaQueries.remove(query.name)">
<i class="icon-close"></i>
</a>
</a>
<ng-container *ngIf="schemaQueries.queries | async; let queries">
<ng-container *ngIf="queries.length > 0; else noQuery">
<a class="sidebar-item" *ngFor="let query of queries; trackBy: trackByQuery" (click)="search(query.filter)"
[class.active]="isSelectedQuery(query.filter)">
{{query.name}}
<a class="sidebar-item-remove float-right" (click)="schemaQueries.remove(query.name)">
<i class="icon-close"></i>
</a>
</a>
</ng-container>
<ng-template #noQuery>
<div class="sidebar-item text-muted">
Search for contents and use <i class="icon-star-empty"></i> icon in search form to save query for all contributors.
</div>
</ng-template>
</ng-container>
</div>
</ng-container>
</sqx-panel>

6
src/Squidex/app/features/content/pages/contents/contents-filters-page.component.scss

@ -1,2 +1,6 @@
@import '_vars';
@import '_mixins';
@import '_mixins';
.text-muted {
pointer-events: none;
}

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

@ -25,6 +25,7 @@ export class AppDto {
public readonly canCreateSchema: boolean;
public readonly canDelete: boolean;
public readonly canReadAssets: boolean;
public readonly canReadBackups: boolean;
public readonly canReadClients: boolean;
public readonly canReadContributors: boolean;
@ -50,6 +51,7 @@ export class AppDto {
this.canCreateSchema = hasAnyLink(links, 'schemas/create');
this.canDelete = hasAnyLink(links, 'delete');
this.canReadAssets = hasAnyLink(links, 'assets');
this.canReadBackups = hasAnyLink(links, 'backups');
this.canReadClients = hasAnyLink(links, 'clients');
this.canReadContributors = hasAnyLink(links, 'contributors');

2
src/Squidex/app/shared/services/contents.service.spec.ts

@ -62,7 +62,7 @@ describe('ContentsService', () => {
contentResponse(12),
contentResponse(13)
],
es: ['Draft', 'Published']
statuses: ['Draft', 'Published']
});
expect(contents!).toEqual(

Loading…
Cancel
Save