#25276 Refactor code for adding the device

dotCMS · Aug 2, 2023 · 4270b42 · 4270b42
1 parent 4648d75
commit 4270b42
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/.../src/app/portlets/dot-edit-page/content/services/dot-page-state/dot-page-state.service.ts b/.../src/app/portlets/dot-edit-page/content/services/dot-page-state/dot-page-state.service.ts
@@ -76,10 +76,6 @@ export class DotPageStateService {
         }
 
         this.requestPage(options).subscribe((pageState: DotPageRenderState) => {
-            if (!pageState.viewAs.device) {
-                pageState.viewAs.device = options.viewAs?.device;
-            }
-
             this.setState(pageState);
         });
     }
@@ -297,7 +293,12 @@ export class DotPageStateService {
                                     favoritePage: DotCMSContentlet,
                                     experiment: DotExperiment
                                 ]) => {
-                                    return this.setLocalPageState(page, favoritePage, experiment);
+                                    return this.setLocalPageState(
+                                        page,
+                                        favoritePage,
+                                        experiment,
+                                        options.viewAs?.device
+                                    );
                                 }
                             )
                         );
@@ -312,7 +313,8 @@ export class DotPageStateService {
     private setLocalPageState(
         page: DotPageRenderParameters,
         favoritePage?: DotCMSContentlet,
-        runningExperiment?: DotExperiment
+        runningExperiment?: DotExperiment,
+        device?: DotDevice
     ): Observable<DotPageRenderState> {
         const pageState = new DotPageRenderState(
             this.getCurrentUser(),
@@ -321,6 +323,10 @@ export class DotPageStateService {
             runningExperiment
         );
 
+        if (!pageState.viewAs?.device && device) {
+            pageState.viewAs.device = device;
+        }
+
         this.setCurrentState(pageState);
 
         return of(pageState);