Merge pull request #180 from pixxelhq/master

v5.10.9-Pixxel-5.8.0

distribution/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>distribution</artifactId>

examples/cascading/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>cascading</artifactId>

examples/ccsds-frames/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

examples/cfdp-udp/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>cfdp-udp</artifactId>

examples/cfdp/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

examples/perftest1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

examples/perftest2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

examples/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

examples/pus/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>pus</artifactId>

examples/replication1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>replication1</artifactId>

examples/replication2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>replication2</artifactId>

examples/replication3/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>replication3</artifactId>

examples/simulation/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>simulation</artifactId>

examples/snippets/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>snippets</artifactId>

examples/templates/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>templates</artifactId>

packet-viewer/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yamcs</groupId>
 	<artifactId>yamcs</artifactId>
-	<version>5.10.9-Pixxel-5.7.2</version>
+	<version>5.10.9-Pixxel-5.8.0</version>
 
 	<packaging>pom</packaging>
 

simulator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>simulator</artifactId>

tests/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yamcs</groupId>
 		<artifactId>yamcs</artifactId>
-		<version>5.10.9-Pixxel-5.7.2</version>
+		<version>5.10.9-Pixxel-5.8.0</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

yamcs-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

yamcs-client/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

yamcs-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

yamcs-core/src/main/java/org/yamcs/cfdp/CfdpService.java

@@ -972,14 +972,26 @@ public synchronized CfdpFileTransfer startUpload(String source, Bucket bucket, S
         if (!allowConcurrentFileOverwrites) {
             if (pendingTransfers.values().stream()
                     .filter(CfdpService::isRunning)
-                    .anyMatch(trsf -> trsf.getRemotePath().equals(absoluteDestinationPath))) {
+                    .anyMatch(trsf -> {
+                        try {
+                            return trsf.getRemotePath().equals(absoluteDestinationPath);
+                        } catch (NullPointerException e) {  // For Directory Listing service requests
+                            return false;
+                        }
+                    })) {
                 throw new InvalidRequestException(
                         "There is already a transfer ongoing to '" + absoluteDestinationPath
                                 + "' and allowConcurrentFileOverwrites is false");
             }
 
             if (queuedTransfers.stream()
-                    .anyMatch(trsf -> trsf.getRemotePath().equals(absoluteDestinationPath))) {
+                    .anyMatch(trsf -> {
+                        try {
+                            return trsf.getRemotePath().equals(absoluteDestinationPath);
+                        } catch (NullPointerException e) {  // For Directory Listing service requests
+                            return false;
+                        }
+                    })) {
                 throw new InvalidRequestException(
                         "There is already a transfer queued to '" + absoluteDestinationPath
                                 + "' and allowConcurrentFileOverwrites is false");

yamcs-tse/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>yamcs-tse</artifactId>

yamcs-web/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-5.7.2</version>
+    <version>5.10.9-Pixxel-5.8.0</version>
   </parent>
 
   <artifactId>yamcs-web</artifactId>

yamcs-web/src/main/webapp/package.json

@@ -39,6 +39,7 @@
     "date-fns-tz": "^3.1.3",
     "dygraphs": "^2.1.0",
     "marked": "^14.0.0",
+    "ngx-json-viewer": "^3.2.1",
     "rxjs": "^7.5.6",
     "tslib": "^2.4.0"
   },

yamcs-web/src/main/webapp/projects/webapp-sdk/src/lib/webapp-sdk.module.ts

@@ -110,6 +110,7 @@ import { UnitsPipe } from './pipes/units.pipe';
 import { ValuePipe } from './pipes/value.pipe';
 import { YaPrintZone } from './print/print-zone.component';
 import { PrintableDirective } from './print/printable.directive';
+import { NgxJsonViewerModule } from 'ngx-json-viewer';
 
 const pipes = [
   AliasPipe,
@@ -237,6 +238,7 @@ const materialModules = [
     ReactiveFormsModule,
     RouterModule,
     materialModules,
+    NgxJsonViewerModule,
     directives,
     pipes,
     sharedComponents,
@@ -249,6 +251,7 @@ const materialModules = [
     materialModules,
     sharedComponents,
     pipes,
+    NgxJsonViewerModule,
   ],
 })
 export class WebappSdkModule { }

yamcs-web/src/main/webapp/projects/webapp/src/app/storage/buckets/bucket-object-list/bucket-object-list.component.css

@@ -81,3 +81,62 @@ mat-toolbar-row {
   max-width: calc(100% - 5em);
   max-height: calc(100% - 5em);
 }
+
+#csv-table table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 20px;
+  user-select: text
+}
+
+#csv-table th,
+#csv-table td {
+  padding: 8px 12px;
+  text-align: left;
+  user-select: text;
+}
+
+#csv-table th {
+  background-color: #f4f4f4;
+  border: 1px solid #ddd;
+}
+
+#csv-table td {
+  border: 1px solid #ddd;
+  color: #ddd;
+}
+
+.json-content {
+  display: block;  /* Ensure the pre tag is treated as a block element */
+  white-space: pre-wrap;  /* Allows long lines to wrap */
+  word-wrap: break-word;  /* Prevents words from overflowing */
+  width: 100%;  /* Ensures it takes the full width of the container */
+  padding: 10px;  /* Adds space inside the pre block for readability */
+  margin: 0;  /* Removes any default margin */
+  overflow-x: auto;  /* Enables horizontal scrolling for very long lines */
+  text-align: left;  /* Ensures text is aligned to the left, not centered */
+  color: #ddd;  /* Set the text color to #ddd */
+  user-select: text;
+}
+
+.json-content .key {
+  font-weight: bold;  /* Makes the key field bold */
+
+}
+
+/* Styling for collapsible nested levels */
+.json-content .nested {
+  display: none;  /* Hide nested elements by default */
+  margin-left: 20px;  /* Indentation for nested levels */
+}
+
+/* Adds a small clickable indicator (like a plus/minus) before nested elements */
+.json-content .toggle {
+  cursor: pointer;
+  color: #aaa;
+}
+
+/* Add some style for when an item is expanded */
+.json-content .expanded {
+  display: block;
+}

yamcs-web/src/main/webapp/projects/webapp/src/app/storage/buckets/bucket-object-list/bucket-object-list.component.html

@@ -45,8 +45,25 @@
         [style.width]="(previewWidth$ | async) + 'px'"
         style="text-align: center">
         <div class="resize-handle" (mousedown)="resizeMouseDown($event)"></div>
+          <!-- Loading Spinner -->
+          <div *ngIf="isLoading">Loading...</div>
         @if (selection.selected.length === 1 && isImage(selection.selected[0])) {
           <img [src]="selection.selected[0].objectUrl" />
+        } @else if (selection.selected.length === 1 && isJson(selection.selected[0])) {
+          <ngx-json-viewer class="json-content" [json]="parsedJson"></ngx-json-viewer>
+        } @else if (selection.selected.length === 1 && isCsv(selection.selected[0]) && tableData !== null) {
+          <table style="margin-left: 17px; margin-right: 17px" id="csv-table" *ngIf="tableData.length > 0" border="1">
+            <thead>
+              <tr>
+                <th *ngFor="let header of headers">{{ header }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let row of tableData">
+                <td *ngFor="let cell of row">{{ cell }}</td>
+              </tr>
+            </tbody>
+          </table>
         } @else {
           <div style="margin-top: 4em; color: #fff">
             <mat-icon>arrow_back</mat-icon>