Upgrade the payload saving in the TransferStateService #5

lazy-ants · Aug 16, 2018 · aac5f26 · aac5f26
1 parent 1a547d0
commit aac5f26
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 40 deletions.
diff --git a/project/application/src/app/modules/core/services/document-link/document-link.service.ts b/project/application/src/app/modules/core/services/document-link/document-link.service.ts
@@ -37,13 +37,14 @@ export class DocumentLinkService {
     public addTags(tags: LinkDefinition[]): void {
         this.transferStateService
             .savePayload(
-                () => {
-                    tags.map((tag: LinkDefinition) => this.addTag(tag));
+                () =>
+                    new Promise(resolve => {
+                        tags.map((tag: LinkDefinition) => this.addTag(tag));
+                        const payload = { addTagsExecuted: true };
 
-                    return new Promise(resolve => resolve({ payload: { addTagsExecuted: true } }));
-                },
-                this.payloadServerName,
-                { payload: null }
+                        resolve({ payload });
+                    }),
+                this.payloadServerName
             )
             .then(
                 (payload: PayloadDefinition) => {
@@ -58,13 +59,14 @@ export class DocumentLinkService {
     public removeTags(attrSelectors: string[]): void {
         this.transferStateService
             .savePayload(
-                () => {
-                    attrSelectors.map((attrSelector: string) => this.removeTag(attrSelector));
+                () =>
+                    new Promise(resolve => {
+                        attrSelectors.map((attrSelector: string) => this.removeTag(attrSelector));
+                        const payload = { removeTagsExecuted: true };
 
-                    return new Promise(resolve => resolve({ payload: { removeTagsExecuted: true } }));
-                },
-                this.payloadServerName,
-                { payload: null }
+                        resolve({ payload });
+                    }),
+                this.payloadServerName
             )
             .then(
                 (payload: PayloadDefinition) => {

diff --git a/project/application/src/app/modules/core/services/document-meta/document-meta.service.ts b/project/application/src/app/modules/core/services/document-meta/document-meta.service.ts
@@ -23,13 +23,14 @@ export class DocumentMetaService {
     public addTags(tags: MetaDefinition[], forceCreation: boolean = false): void {
         this.transferStateService
             .savePayload(
-                () => {
-                    this.metaService.addTags(tags, forceCreation);
+                () =>
+                    new Promise(resolve => {
+                        this.metaService.addTags(tags, forceCreation);
+                        const payload = { addTagsExecuted: true };
 
-                    return new Promise(resolve => resolve({ payload: { addTagsExecuted: true } }));
-                },
-                this.payloadServerName,
-                { payload: null }
+                        resolve({ payload });
+                    }),
+                this.payloadServerName
             )
             .then(
                 (payload: PayloadDefinition) => {
@@ -44,13 +45,14 @@ export class DocumentMetaService {
     public removeTags(attrSelectors: string[]): void {
         this.transferStateService
             .savePayload(
-                () => {
-                    attrSelectors.map((attrSelector: string) => this.removeTag(attrSelector));
+                () =>
+                    new Promise(resolve => {
+                        attrSelectors.map((attrSelector: string) => this.removeTag(attrSelector));
+                        const payload = { removeTagsExecuted: true };
 
-                    return new Promise(resolve => resolve({ payload: { removeTagsExecuted: true } }));
-                },
-                this.payloadServerName,
-                { payload: null }
+                        resolve({ payload });
+                    }),
+                this.payloadServerName
             )
             .then(
                 (payload: PayloadDefinition) => {

diff --git a/project/application/src/app/modules/core/services/document-title/document-title.service.ts b/project/application/src/app/modules/core/services/document-title/document-title.service.ts
@@ -21,13 +21,14 @@ export class DocumentTitleService {
     public setTitle(value: string): void {
         this.transferStateService
             .savePayload(
-                () => {
-                    this.titleService.setTitle(value);
+                () =>
+                    new Promise(resolve => {
+                        this.titleService.setTitle(value);
+                        const payload = { setTitleExecuted: true };
 
-                    return new Promise(resolve => resolve({ payload: { setTitleExecuted: true } }));
-                },
-                this.payloadServerName,
-                { payload: null }
+                        resolve({ payload });
+                    }),
+                this.payloadServerName
             )
             .then(
                 (payload: PayloadDefinition) => {

diff --git a/...cation/src/app/modules/core/services/http-response-status/http-response-status.service.ts b/...cation/src/app/modules/core/services/http-response-status/http-response-status.service.ts
@@ -26,16 +26,18 @@ export class HttpResponseStatusService {
     public setStatus(code: number, message: string): void {
         this.transferStateService
             .savePayload(
-                () => {
-                    if (this.res) {
-                        this.res.statusCode = code;
-                        this.res.statusMessage = message;
-                    }
+                () =>
+                    new Promise(resolve => {
+                        if (this.res) {
+                            this.res.statusCode = code;
+                            this.res.statusMessage = message;
+                        }
 
-                    return new Promise(resolve => resolve({ payload: { setStatusExecuted: true } }));
-                },
-                this.payloadServerName,
-                { payload: null }
+                        const payload = { setStatusExecuted: true };
+
+                        resolve({ payload });
+                    }),
+                this.payloadServerName
             )
             .then(
                 (payload: PayloadDefinition) => {

diff --git a/project/application/src/app/modules/core/services/transfer-state/transfer-state.service.ts b/project/application/src/app/modules/core/services/transfer-state/transfer-state.service.ts
@@ -13,7 +13,8 @@ export class TransferStateService {
 
     constructor(@Inject(PLATFORM_ID) private platformId: Object, private transferState: TransferState) {}
 
-    public savePayload(next: () => Promise<any>, payloadServerName: string, defaultPayload: any): Promise<any> {
+    public savePayload(next: () => Promise<any>, payloadServerName: string): Promise<any> {
+        const defaultPayload = { payload: null };
         const payloadStateKey = this.createStateKey(payloadServerName);
 
         return new Promise(resolve => {