From f2a283e6cb5fabd5ab97735d033904f9e0d12b44 Mon Sep 17 00:00:00 2001 From: Swarup Nataraj Date: Mon, 16 Dec 2024 07:47:47 +0530 Subject: [PATCH 1/2] Bugfix: The upload button for S13 is correctly behaving --- .../transfer-file-dialog/transfer-file-dialog.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yamcs-web/src/main/webapp/projects/webapp/src/app/file-transfer/transfer-file-dialog/transfer-file-dialog.component.ts b/yamcs-web/src/main/webapp/projects/webapp/src/app/file-transfer/transfer-file-dialog/transfer-file-dialog.component.ts index f9bf1b61cba..4d739ca97a1 100644 --- a/yamcs-web/src/main/webapp/projects/webapp/src/app/file-transfer/transfer-file-dialog/transfer-file-dialog.component.ts +++ b/yamcs-web/src/main/webapp/projects/webapp/src/app/file-transfer/transfer-file-dialog/transfer-file-dialog.component.ts @@ -251,7 +251,7 @@ export class TransferFileDialogComponent implements OnDestroy { private updateButtonStates(localFiles: string, remoteFile: string, textfieldPath: string) { this.isDownloadEnabled = this.service.capabilities.download && this.selectedBucket$.value! && remoteFile != '' && this.form.valid; - this.isUploadEnabled = this.service.capabilities.upload && this.form.valid && (this.fileProxyOps.length > 0 || localFiles != ''); + this.isUploadEnabled = this.service.capabilities.fileProxyOperations? this.service.capabilities.upload && this.form.valid && (this.fileProxyOps.length > 0 || localFiles != ''): this.service.capabilities.upload && localFiles != '' && this.form.valid; } // Returns remote folder path, ready to concatenate a file name From 02b888937c78f545bd5bbbe1fb0bd1fcb0e9893f Mon Sep 17 00:00:00 2001 From: Swarup Nataraj Date: Mon, 16 Dec 2024 07:47:59 +0530 Subject: [PATCH 2/2] Prepare for release v5.10.9-Pixxel-6.3.0 --- distribution/pom.xml | 2 +- examples/cascading/pom.xml | 2 +- examples/ccsds-frames/pom.xml | 2 +- examples/cfdp-udp/pom.xml | 2 +- examples/cfdp/pom.xml | 2 +- examples/perftest1/pom.xml | 2 +- examples/perftest2/pom.xml | 2 +- examples/pom.xml | 2 +- examples/pus/pom.xml | 2 +- examples/replication1/pom.xml | 2 +- examples/replication2/pom.xml | 2 +- examples/replication3/pom.xml | 2 +- examples/simulation/pom.xml | 2 +- examples/snippets/pom.xml | 2 +- examples/templates/pom.xml | 2 +- packet-viewer/pom.xml | 2 +- pom.xml | 2 +- simulator/pom.xml | 2 +- tests/pom.xml | 2 +- yamcs-api/pom.xml | 2 +- yamcs-client/pom.xml | 2 +- yamcs-core/pom.xml | 2 +- yamcs-tse/pom.xml | 2 +- yamcs-web/pom.xml | 2 +- yamcs-xtce/pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 04abb8219b9..03c1426032a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 distribution diff --git a/examples/cascading/pom.xml b/examples/cascading/pom.xml index f0bee52e6fd..8dfb648c4dd 100644 --- a/examples/cascading/pom.xml +++ b/examples/cascading/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 cascading diff --git a/examples/ccsds-frames/pom.xml b/examples/ccsds-frames/pom.xml index a951a0d4663..b0ac1d5c9e5 100644 --- a/examples/ccsds-frames/pom.xml +++ b/examples/ccsds-frames/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 ccsds-frames diff --git a/examples/cfdp-udp/pom.xml b/examples/cfdp-udp/pom.xml index 0939702eba7..7915fb294e4 100644 --- a/examples/cfdp-udp/pom.xml +++ b/examples/cfdp-udp/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 cfdp-udp diff --git a/examples/cfdp/pom.xml b/examples/cfdp/pom.xml index d98ac64a581..674ae2a1bc7 100644 --- a/examples/cfdp/pom.xml +++ b/examples/cfdp/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 cfdp diff --git a/examples/perftest1/pom.xml b/examples/perftest1/pom.xml index 127cd82561b..0c607c56a4d 100644 --- a/examples/perftest1/pom.xml +++ b/examples/perftest1/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 perftest1 diff --git a/examples/perftest2/pom.xml b/examples/perftest2/pom.xml index 86c5b7435d6..87da1ff2b87 100644 --- a/examples/perftest2/pom.xml +++ b/examples/perftest2/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 perftest2 diff --git a/examples/pom.xml b/examples/pom.xml index ccfebe35e18..726f5da0f1d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 org.yamcs.examples diff --git a/examples/pus/pom.xml b/examples/pus/pom.xml index b355d48a333..702a7db8d84 100644 --- a/examples/pus/pom.xml +++ b/examples/pus/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 pus diff --git a/examples/replication1/pom.xml b/examples/replication1/pom.xml index c6931ed3ae2..a69ea75bdf1 100644 --- a/examples/replication1/pom.xml +++ b/examples/replication1/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 replication1 diff --git a/examples/replication2/pom.xml b/examples/replication2/pom.xml index 7e1fc698b6f..ea13e6731f5 100644 --- a/examples/replication2/pom.xml +++ b/examples/replication2/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 replication2 diff --git a/examples/replication3/pom.xml b/examples/replication3/pom.xml index 5ea1033f662..9d8f633dcb9 100644 --- a/examples/replication3/pom.xml +++ b/examples/replication3/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 replication3 diff --git a/examples/simulation/pom.xml b/examples/simulation/pom.xml index 1f2ba8ee199..b0c2422a3ee 100644 --- a/examples/simulation/pom.xml +++ b/examples/simulation/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 simulation diff --git a/examples/snippets/pom.xml b/examples/snippets/pom.xml index d9ef85fa4f7..1f207e84ce8 100644 --- a/examples/snippets/pom.xml +++ b/examples/snippets/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 snippets diff --git a/examples/templates/pom.xml b/examples/templates/pom.xml index ae7e11c2921..335904e2aa7 100644 --- a/examples/templates/pom.xml +++ b/examples/templates/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 templates diff --git a/packet-viewer/pom.xml b/packet-viewer/pom.xml index 5a88bfe9f02..8db9f5828c5 100644 --- a/packet-viewer/pom.xml +++ b/packet-viewer/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 packet-viewer diff --git a/pom.xml b/pom.xml index 41b210f1922..4da4209a2e0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 pom diff --git a/simulator/pom.xml b/simulator/pom.xml index f91d07f5976..27164560504 100644 --- a/simulator/pom.xml +++ b/simulator/pom.xml @@ -5,7 +5,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 simulator diff --git a/tests/pom.xml b/tests/pom.xml index 3557b396700..7d46a1e6cc5 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 tests diff --git a/yamcs-api/pom.xml b/yamcs-api/pom.xml index 0f0caf76979..57f63004fb7 100644 --- a/yamcs-api/pom.xml +++ b/yamcs-api/pom.xml @@ -4,7 +4,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 yamcs-api diff --git a/yamcs-client/pom.xml b/yamcs-client/pom.xml index 5cd6bc0a2f6..8e7120e3beb 100644 --- a/yamcs-client/pom.xml +++ b/yamcs-client/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 yamcs-client diff --git a/yamcs-core/pom.xml b/yamcs-core/pom.xml index 2e48e8db34b..3e0adcb6275 100644 --- a/yamcs-core/pom.xml +++ b/yamcs-core/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 yamcs-core diff --git a/yamcs-tse/pom.xml b/yamcs-tse/pom.xml index 4d8db6a5efa..3cdd41cbd68 100644 --- a/yamcs-tse/pom.xml +++ b/yamcs-tse/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 yamcs-tse diff --git a/yamcs-web/pom.xml b/yamcs-web/pom.xml index 5afaeff9ee9..ee96bf27125 100644 --- a/yamcs-web/pom.xml +++ b/yamcs-web/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 yamcs-web diff --git a/yamcs-xtce/pom.xml b/yamcs-xtce/pom.xml index d79f7d3d7a2..4f3f1e75d22 100644 --- a/yamcs-xtce/pom.xml +++ b/yamcs-xtce/pom.xml @@ -5,7 +5,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-6.2.0 + 5.10.9-Pixxel-6.3.0 yamcs-xtce