-
diff --git a/src/Squidex/app/shared/components/queries/filter-logical.component.ts b/src/Squidex/app/shared/components/queries/filter-logical.component.ts
index 9bbd9f3e9..4819225de 100644
--- a/src/Squidex/app/shared/components/queries/filter-logical.component.ts
+++ b/src/Squidex/app/shared/components/queries/filter-logical.component.ts
@@ -58,6 +58,14 @@ export class FilterLogicalComponent {
return this.filterValue;
}
+ public get isAnd() {
+ return !!this.filter.and;
+ }
+
+ public get isOr() {
+ return !!this.filter.or;
+ }
+
public get nestedLevel() {
return this.level + 1;
}
diff --git a/src/Squidex/app/shared/components/references-dropdown.component.ts b/src/Squidex/app/shared/components/references-dropdown.component.ts
index 9ffefeba5..ed91da3b5 100644
--- a/src/Squidex/app/shared/components/references-dropdown.component.ts
+++ b/src/Squidex/app/shared/components/references-dropdown.component.ts
@@ -9,11 +9,11 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Inpu
import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
import {
- AppLanguageDto,
AppsState,
ContentDto,
ContentsService,
getContentValue,
+ LanguageDto,
StatefulControlComponent,
Types,
UIOptions
@@ -49,7 +49,7 @@ const NO_EMIT = { emitEvent: false };
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ReferencesDropdownComponent extends StatefulControlComponent
| string> implements OnInit {
- private languageField: AppLanguageDto;
+ private languageField: LanguageDto;
private selectedId: string | undefined;
private itemCount: number;
@@ -60,7 +60,7 @@ export class ReferencesDropdownComponent extends StatefulControlComponent ({ ...s, contentNames: this.createContentNames(s.contents) }));
diff --git a/src/Squidex/app/shared/services/backups.service.spec.ts b/src/Squidex/app/shared/services/backups.service.spec.ts
index 68631ccb9..0a2da166f 100644
--- a/src/Squidex/app/shared/services/backups.service.spec.ts
+++ b/src/Squidex/app/shared/services/backups.service.spec.ts
@@ -198,7 +198,7 @@ describe('BackupsService', () => {
stopped: id % 2 === 0 ? `${id % 1000 + 2000}-11-11T10:10:00` : null,
handledEvents: id * 17,
handledAssets: id * 23,
- status: id % 2 === 0 ? 'Status' : 'Failed',
+ status: id % 2 === 0 ? 'Success' : 'Failed',
_links: {
download: { method: 'GET', href: '/api/backups/1' }
}
@@ -217,5 +217,5 @@ export function createBackup(id: number) {
id % 2 === 0 ? DateTime.parseISO_UTC(`${id % 1000 + 2000}-11-11T10:10:00`) : null,
id * 17,
id * 23,
- id % 2 === 0 ? 'Status' : 'Failed');
+ id % 2 === 0 ? 'Success' : 'Failed');
}
\ No newline at end of file
diff --git a/src/Squidex/app/shared/services/backups.service.ts b/src/Squidex/app/shared/services/backups.service.ts
index 876b11596..1e020f3b5 100644
--- a/src/Squidex/app/shared/services/backups.service.ts
+++ b/src/Squidex/app/shared/services/backups.service.ts
@@ -46,7 +46,7 @@ export class BackupDto {
public readonly stopped: DateTime | null,
public readonly handledEvents: number,
public readonly handledAssets: number,
- public readonly status: string
+ public readonly status: 'Started' | 'Failed' | 'Success' | 'Completed' | 'Pending'
) {
this._links = links;
diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts
index 990f52e96..ad30e726d 100644
--- a/src/Squidex/app/shared/services/rules.service.ts
+++ b/src/Squidex/app/shared/services/rules.service.ts
@@ -24,14 +24,14 @@ import {
Version
} from '@app/framework';
-export type TriggerDto = {
+export type RuleElementMetadataDto = {
description: string;
display: string;
iconColor: string;
iconCode: string;
};
-export type TriggersDto = { [key: string]: TriggerDto };
+export type TriggersDto = { [key: string]: RuleElementMetadataDto };
export const ALL_TRIGGERS: TriggersDto = {
'ContentChanged': {
diff --git a/src/Squidex/app/shared/state/query.ts b/src/Squidex/app/shared/state/query.ts
index 258baa9e6..d99f095eb 100644
--- a/src/Squidex/app/shared/state/query.ts
+++ b/src/Squidex/app/shared/state/query.ts
@@ -82,7 +82,7 @@ export type SortMode = 'ascending' | 'descending';
export interface Query {
// The optional filter.
- filter?: FilterNode;
+ filter?: FilterLogical;
// The full text search.
fullText?: string;
diff --git a/src/Squidex/app/shared/state/roles.forms.ts b/src/Squidex/app/shared/state/roles.forms.ts
index 0342b6432..fea150306 100644
--- a/src/Squidex/app/shared/state/roles.forms.ts
+++ b/src/Squidex/app/shared/state/roles.forms.ts
@@ -14,6 +14,10 @@ import {
} from '@app/framework';
export class EditPermissionsForm extends Form> {
+ public get controls() {
+ return this.form.controls as FormControl[];
+ }
+
constructor() {
super(new FormArray([]));
}
diff --git a/src/Squidex/package.json b/src/Squidex/package.json
index 912278e8b..13b16acf7 100644
--- a/src/Squidex/package.json
+++ b/src/Squidex/package.json
@@ -16,7 +16,7 @@
},
"dependencies": {
"@angular/animations": "8.2.9",
- "@angular/cdk": "^8.2.3",
+ "@angular/cdk": "8.2.3",
"@angular/common": "8.2.9",
"@angular/core": "8.2.9",
"@angular/forms": "8.2.9",