Tests fixed

src/Squidex/app/framework/services/panel.service.spec.ts

@@ -65,9 +65,16 @@ describe('PanelService', () => {
         panelService.pop(element3, <any>renderer);
 
         expect(styles).toEqual([
+            { element: element1, property: 'top', value: '0px' },
             { element: element1, property: 'left', value: '0px' },
+            { element: element1, property: 'bottom', value: '0px' },
+            { element: element1, property: 'position', value: 'absolute' },
             { element: element1, property: 'z-index', value: '20' },
+
+            { element: element2, property: 'top', value: '0px' },
             { element: element2, property: 'left', value: '100px' },
+            { element: element2, property: 'bottom', value: '0px' },
+            { element: element2, property: 'position', value: 'absolute' },
             { element: element2, property: 'z-index', value: '10' }
         ]);
 

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

@@ -7,7 +7,7 @@
 
 import { Response, ResponseOptions } from '@angular/http';
 import { Observable } from 'rxjs';
-import { IMock, Mock, Times } from 'typemoq';
+import { IMock, It, Mock, Times } from 'typemoq';
 
 import {
     ApiUrlConfig,
@@ -29,7 +29,7 @@ describe('ContentsService', () => {
     });
 
     it('should make get request to get contents', () => {
-        authService.setup(x => x.authGet('http://service/p/api/content/my-app/my-schema?take=17&skip=13&query=my-query&nonPublished=true&hidden=true'))
+        authService.setup(x => x.authGet('http://service/p/api/content/my-app/my-schema?nonPublished=true&hidden=true&$top=17&$skip=13'))
             .returns(() => Observable.of(
                 new Response(
                     new ResponseOptions({
@@ -60,7 +60,7 @@ describe('ContentsService', () => {
 
         let contents: ContentsDto | null = null;
 
-        contentsService.getContents('my-app', 'my-schema', 17, 13, 'my-query').subscribe(result => {
+        contentsService.getContents('my-app', 'my-schema', 17, 13, null).subscribe(result => {
             contents = result;
         }).unsubscribe();
 
@@ -73,6 +73,50 @@ describe('ContentsService', () => {
         authService.verifyAll();
     });
 
+    it('should make append query to get request as search', () => {
+        authService.setup(x => x.authGet('http://service/p/api/content/my-app/my-schema?nonPublished=true&hidden=true&$search=my-query&$top=17&$skip=13'))
+            .returns(() => Observable.of(
+                new Response(
+                    new ResponseOptions({
+                        body: {
+                            total: 10,
+                            items: []
+                        }
+                    })
+                )
+            ))
+            .verifiable(Times.once());
+
+        let contents: ContentsDto | null = null;
+
+        contentsService.getContents('my-app', 'my-schema', 17, 13, 'my-query').subscribe(result => {
+            contents = result;
+        }).unsubscribe();
+        authService.verifyAll();
+    });
+
+    it('should make append query to get request as plain', () => {
+        authService.setup(x => x.authGet('http://service/p/api/content/my-app/my-schema?nonPublished=true&hidden=true&$filter=my-filter&$top=17&$skip=13'))
+            .returns(() => Observable.of(
+                new Response(
+                    new ResponseOptions({
+                        body: {
+                            total: 10,
+                            items: []
+                        }
+                    })
+                )
+            ))
+            .verifiable(Times.once());
+
+        let contents: ContentsDto | null = null;
+
+        contentsService.getContents('my-app', 'my-schema', 17, 13, '$filter=my-filter').subscribe(result => {
+            contents = result;
+        }).unsubscribe();
+        authService.verifyAll();
+    });
+
     it('should make get request to get content', () => {
         authService.setup(x => x.authGet('http://service/p/api/content/my-app/my-schema/content1?hidden=true'))
             .returns(() => Observable.of(
@@ -148,9 +192,7 @@ describe('ContentsService', () => {
     });
 
     it('should make put request to publish content', () => {
-        const dto = {};
+        authService.setup(x => x.authPut('http://service/p/api/content/my-app/my-schema/content1/publish', It.isAny()))
-
-        authService.setup(x => x.authPut('http://service/p/api/content/my-app/my-schema/content1/publish', dto))
             .returns(() => Observable.of(
                new Response(
                     new ResponseOptions()
@@ -164,9 +206,7 @@ describe('ContentsService', () => {
     });
 
     it('should make put request to unpublish content', () => {
-        const dto = {};
+        authService.setup(x => x.authPut('http://service/p/api/content/my-app/my-schema/content1/unpublish', It.isAny()))
-
-        authService.setup(x => x.authPut('http://service/p/api/content/my-app/my-schema/content1/unpublish', dto))
             .returns(() => Observable.of(
                new Response(
                     new ResponseOptions()

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

@@ -50,11 +50,14 @@ export class ContentsService {
     public getContents(appName: string, schemaName: string, take: number, skip: number, query: string): Observable<ContentsDto> {
         let fullQuery = query ? query.trim() : '';
 
+        if (fullQuery.length > 0) {
             if (fullQuery.indexOf('$filter') < 0 &&
                 fullQuery.indexOf('$search') < 0 &&
-            fullQuery.indexOf('$orderby') < 0 &&
+                fullQuery.indexOf('$orderby') < 0) {
-            fullQuery.length > 0) {
+                fullQuery = `&$search=${fullQuery}`;
-            fullQuery = `$search=${fullQuery}`;
+            } else {
+                fullQuery = `&${fullQuery}`;
+            }
         }
 
         if (take > 0) {
@@ -65,7 +68,7 @@ export class ContentsService {
             fullQuery += `&$skip=${skip}`;
         }
 
-        const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}?nonPublished=true&hidden=true&${fullQuery}`);
+        const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}?nonPublished=true&hidden=true${fullQuery}`);
 
         return this.authService.authGet(url)
                 .map(response => response.json())

src/Squidex/app/shared/services/schemas.service.ts

@@ -94,12 +94,12 @@ export class FieldDto {
 
 export abstract class FieldPropertiesDto {
     constructor(
-        public readonly label?: string,
+        public readonly label: string,
-        public readonly hints?: string,
+        public readonly hints: string,
-        public readonly placeholder?: string,
+        public readonly placeholder: string,
-        public readonly isRequired: boolean = false,
+        public readonly isRequired: boolean,
-        public readonly isListField: boolean = false,
+        public readonly isListField: boolean,
-        public readonly isLocalizable: boolean = false
+        public readonly isLocalizable: boolean
     ) {
     }
 }