Merge pull request #191 from pixxelhq/master

v5.10.9-Pixxel-7.2.0
pixxelhq · Jan 11, 2025 · b9e2d36 · b9e2d36
2 parents 4a34270 + 54d8192
commit b9e2d36
Show file tree

Hide file tree

Showing 28 changed files with 60 additions and 30 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>distribution</artifactId>

diff --git a/examples/cascading/pom.xml b/examples/cascading/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>cascading</artifactId>

diff --git a/examples/ccsds-frames/pom.xml b/examples/ccsds-frames/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

diff --git a/examples/cfdp-udp/pom.xml b/examples/cfdp-udp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>cfdp-udp</artifactId>

diff --git a/examples/cfdp/pom.xml b/examples/cfdp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

diff --git a/examples/perftest1/pom.xml b/examples/perftest1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

diff --git a/examples/perftest2/pom.xml b/examples/perftest2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

diff --git a/examples/pus/pom.xml b/examples/pus/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>pus</artifactId>

diff --git a/examples/replication1/pom.xml b/examples/replication1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>replication1</artifactId>

diff --git a/examples/replication2/pom.xml b/examples/replication2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>replication2</artifactId>

diff --git a/examples/replication3/pom.xml b/examples/replication3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>replication3</artifactId>

diff --git a/examples/simulation/pom.xml b/examples/simulation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>simulation</artifactId>

diff --git a/examples/snippets/pom.xml b/examples/snippets/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>snippets</artifactId>

diff --git a/examples/templates/pom.xml b/examples/templates/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>templates</artifactId>

diff --git a/packet-viewer/pom.xml b/packet-viewer/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yamcs</groupId>
 	<artifactId>yamcs</artifactId>
-	<version>5.10.9-Pixxel-7.1.0</version>
+	<version>5.10.9-Pixxel-7.2.0</version>
 
 	<packaging>pom</packaging>
 

diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>simulator</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yamcs</groupId>
 		<artifactId>yamcs</artifactId>
-		<version>5.10.9-Pixxel-7.1.0</version>
+		<version>5.10.9-Pixxel-7.2.0</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

diff --git a/yamcs-api/pom.xml b/yamcs-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

diff --git a/yamcs-client/pom.xml b/yamcs-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

diff --git a/yamcs-core/pom.xml b/yamcs-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-tse/pom.xml b/yamcs-tse/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>yamcs-tse</artifactId>

diff --git a/yamcs-web/pom.xml b/yamcs-web/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>yamcs-web</artifactId>

diff --git a/.../main/webapp/projects/webapp-sdk/src/lib/components/detail-pane/detail-pane.component.css b/.../main/webapp/projects/webapp-sdk/src/lib/components/detail-pane/detail-pane.component.css
@@ -1,5 +1,6 @@
 :host {
   --panel-width: 450px;
+  --collapsed-width: 65px; /* Width when collapsed */
 }
 
 .detail {
@@ -11,6 +12,23 @@
   border-left: 1px solid rgba(0, 0, 0, 0.1);
   box-sizing: border-box;
   font: 400 12px / 20px Roboto, sans-serif;
+  transition: width 0.3s ease, padding 0.3s ease; /* Smooth collapse/expand */
+}
+
+.detail.collapsed {
+  width: var(--collapsed-width);
+  overflow: hidden;
+  padding: 0; /* Optional: Remove padding when collapsed */
+}
+
+.toggle-button {
+  position: relative;
+  left: -40px; /* Adjust to position outside the panel */
+  background-color: #fff;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  padding: 4px 8px;
+  cursor: pointer;
 }
 
 .detail.hidden {

diff --git a/...main/webapp/projects/webapp-sdk/src/lib/components/detail-pane/detail-pane.component.html b/...main/webapp/projects/webapp-sdk/src/lib/components/detail-pane/detail-pane.component.html
@@ -1,3 +1,10 @@
-<div class="detail">
-  <ng-content />
-</div>
+<div class="detail" [class.collapsed]="isCollapsed">
+  <ya-button
+    appearance="primary"
+    (click)="isCollapsed = !isCollapsed"
+    style="padding-left: 5px; padding-top: 5px;"
+  >
+    {{ isCollapsed ? 'Expand' : 'Collapse' }}
+  </ya-button>
+  <ng-content *ngIf="!isCollapsed"></ng-content>
+</div>
diff --git a/...c/main/webapp/projects/webapp-sdk/src/lib/components/detail-pane/detail-pane.component.ts b/...c/main/webapp/projects/webapp-sdk/src/lib/components/detail-pane/detail-pane.component.ts
@@ -1,15 +1,20 @@
 import { AsyncPipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { YaButton } from '../button/button.component';
 
 @Component({
   standalone: true,
   selector: 'ya-detail-pane',
   templateUrl: './detail-pane.component.html',
-  styleUrl: './detail-pane.component.css',
+  styleUrls: ['./detail-pane.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
+    CommonModule,
     AsyncPipe,
+    YaButton
   ],
 })
 export class YaDetailPane {
-}
+  isCollapsed = false; // Track whether the detail panel is collapsed
+}
diff --git a/yamcs-xtce/pom.xml b/yamcs-xtce/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.1.0</version>
+    <version>5.10.9-Pixxel-7.2.0</version>
   </parent>
 
   <artifactId>yamcs-xtce</artifactId>