refactor(spie-ui): standardise position of modals

robsonos · Dec 24, 2024 · 83da0b3 · 83da0b3
1 parent 921738d
commit 83da0b3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/apps/spie-ui/src/app/components/connection/connection.component.html b/apps/spie-ui/src/app/components/connection/connection.component.html
@@ -71,11 +71,11 @@
             </ion-col>
           </ion-row>
         </ion-grid>
-
-        <app-connection-advanced-modal-component
-          [reconnectSubject]="reconnectSubject"
-        />
       </ion-card-content>
     </ion-card>
   </ion-accordion>
 </ion-accordion-group>
+
+<app-connection-advanced-modal-component
+  [reconnectSubject]="reconnectSubject"
+/>
diff --git a/apps/spie-ui/src/app/components/plotter/plotter.component.html b/apps/spie-ui/src/app/components/plotter/plotter.component.html
@@ -26,7 +26,7 @@
               isPausedSubject.getValue() && isOpen() ? 'danger' : 'secondary'
             "
             [disabled]="!isOpen()"
-            (click)="onClickPauseTerminal()"
+            (click)="onClickPauseSeries()"
           >
             <ion-icon
               slot="start"
@@ -44,7 +44,7 @@
           <ion-button
             expand="block"
             color="secondary"
-            (click)="onClickClearTerminal()"
+            (click)="onClickClearSeries()"
           >
             <ion-icon slot="start" name="trash-outline"></ion-icon>
             Clear
@@ -54,7 +54,7 @@
           <ion-button
             fill="clear"
             color="secondary"
-            (click)="onClickTerminalAdvancedModal()"
+            (click)="onClickPlotterAdvancedModal()"
           >
             <ion-icon name="settings-outline"></ion-icon>
           </ion-button>
@@ -64,4 +64,7 @@
   </ion-card-content>
 </ion-card>
 
-<!-- <pre>{{ series()[0].data.length }}</pre> -->
+<app-plotter-advanced-modal-component
+  [(plotterOptions)]="plotterOptions"
+  (clearChart)="onClickClearSeries()"
+/>
diff --git a/apps/spie-ui/src/app/components/plotter/plotter.component.ts b/apps/spie-ui/src/app/components/plotter/plotter.component.ts
@@ -238,16 +238,16 @@ export class PlotterComponent {
     },
   }));
 
-  onClickClearTerminal(): void {
+  onClickClearSeries(): void {
     this.clearSeriesSubject.next();
   }
 
-  onClickPauseTerminal(): void {
+  onClickPauseSeries(): void {
     const currentValue = this.isPausedSubject.getValue();
     this.isPausedSubject.next(!currentValue);
   }
 
-  async onClickTerminalAdvancedModal() {
+  async onClickPlotterAdvancedModal(): Promise<void> {
     // this.terminalAdvancedComponent().terminalAdvancedModal().present(); // TODO
   }
 }
diff --git a/apps/spie-ui/src/app/components/send/send.component.html b/apps/spie-ui/src/app/components/send/send.component.html
@@ -39,7 +39,7 @@
         </ion-col>
       </ion-row>
     </ion-grid>
-
-    <app-send-advanced-modal-component />
   </ion-card-content>
 </ion-card>
+
+<app-send-advanced-modal-component />
diff --git a/apps/spie-ui/src/app/components/terminal/terminal.component.html b/apps/spie-ui/src/app/components/terminal/terminal.component.html
@@ -59,9 +59,9 @@
         </ion-col>
       </ion-row>
     </ion-grid>
-
-    <app-terminal-advanced-modal-component
-      [clearTerminalSubject]="clearTerminalSubject"
-    />
   </ion-card-content>
 </ion-card>
+
+<app-terminal-advanced-modal-component
+  [clearTerminalSubject]="clearTerminalSubject"
+/>