From a4f7db62ba38127c69420b8da02c8d9c56085e1f Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Wed, 9 Aug 2023 22:14:16 +1000
Subject: [PATCH 1/6] Development on v2.2.43.dev1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 294a9bb8..18493def 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gns3-web-ui",
-  "version": "2.2.42",
+  "version": "2.2.43.dev1",
   "author": {
     "name": "GNS3 Technology Inc.",
     "email": "developers@gns3.com"

From d725363fe58235a8186dcaebdfaff7ef61753d51 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 24 Oct 2023 18:23:55 +1000
Subject: [PATCH 2/6] Allow edit height and width for rectangles and ellipses

---
 .../style-editor/style-editor.component.html  | 23 +++++++++++++++++++
 .../style-editor/style-editor.component.ts    |  6 +++++
 2 files changed, 29 insertions(+)

diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html
index 2c935d42..63ed94ec 100644
--- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html
+++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html
@@ -42,6 +42,29 @@
       />
     </mat-form-field>
 
+    <mat-form-field class="form-field" *ngIf="element.width !== undefined">
+      <input
+        matInput
+        [ngModelOptions]="{ standalone: true }"
+        placeholder="Width"
+        min="0"
+        type="number"
+        [(ngModel)]="element.width"
+      />
+    </mat-form-field>
+
+    <mat-form-field class="form-field" *ngIf="element.height !== undefined">
+      <input
+        matInput
+        [ngModelOptions]="{ standalone: true }"
+        placeholder="Height"
+        min="0"
+        type="number"
+        [(ngModel)]="element.height"
+      />
+    </mat-form-field>
+
+
     <mat-form-field class="form-field" *ngIf="element.rx !== undefined">
       <input
         matInput
diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts
index 94b10b7b..6e31e3f9 100644
--- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts
+++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts
@@ -49,6 +49,8 @@ export class StyleEditorDialogComponent implements OnInit {
 
     if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) {
       this.element.fill = this.drawing.element.fill;
+      this.element.width = this.drawing.element.width;
+      this.element.height = this.drawing.element.height;
       this.element.stroke = this.drawing.element.stroke;
       this.element.stroke_dasharray = this.drawing.element.stroke_dasharray;
       this.element.stroke_width = this.drawing.element.stroke_width;
@@ -79,6 +81,8 @@ export class StyleEditorDialogComponent implements OnInit {
 
       if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) {
         this.drawing.element.fill = this.element.fill;
+        this.drawing.element.width = this.element.width;
+        this.drawing.element.height = this.element.height;
         this.drawing.element.stroke = this.element.stroke;
         this.drawing.element.stroke_dasharray = this.element.stroke_dasharray;
         this.drawing.element.stroke_width = this.element.stroke_width;
@@ -110,6 +114,8 @@ export class StyleEditorDialogComponent implements OnInit {
 
 export class ElementData {
   fill: string;
+  width: number;
+  height: number;
   stroke: string;
   stroke_width: number;
   stroke_dasharray: string;

From cbb1c9ecfcf23bed32b71414abafb6323f19b649 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 31 Oct 2023 16:45:17 +1000
Subject: [PATCH 3/6] Add project name in gns3+pcap protocol handler URL

---
 src/app/services/packet-capture.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts
index 890543e6..3a18501d 100644
--- a/src/app/services/packet-capture.service.ts
+++ b/src/app/services/packet-capture.service.ts
@@ -9,7 +9,7 @@ export class PacketCaptureService {
 
   startCapture(server: Server, project: Project, link: Link, name: string) {
     location.assign(
-      `gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&name=${name}`
+      `gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}`
     );
   }
 }

From 8253f8da387597e71ec82896d126e9dc564fa86e Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Thu, 2 Nov 2023 17:36:41 +1000
Subject: [PATCH 4/6] Add server protocol to gns3+pcap

---
 src/app/services/packet-capture.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts
index 3a18501d..264c57a8 100644
--- a/src/app/services/packet-capture.service.ts
+++ b/src/app/services/packet-capture.service.ts
@@ -9,7 +9,7 @@ export class PacketCaptureService {
 
   startCapture(server: Server, project: Project, link: Link, name: string) {
     location.assign(
-      `gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}`
+      `gns3+pcap://${server.host}:${server.port}?protocol=${server.protocol}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}`
     );
   }
 }

From 896ca927f3386e52345c26e3587fbdeb51fb3276 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Fri, 3 Nov 2023 14:44:41 +1000
Subject: [PATCH 5/6] Add correct protocol when capturing with protocol handler

---
 src/app/services/packet-capture.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts
index 264c57a8..642a3d72 100644
--- a/src/app/services/packet-capture.service.ts
+++ b/src/app/services/packet-capture.service.ts
@@ -9,7 +9,7 @@ export class PacketCaptureService {
 
   startCapture(server: Server, project: Project, link: Link, name: string) {
     location.assign(
-      `gns3+pcap://${server.host}:${server.port}?protocol=${server.protocol}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}`
+      `gns3+pcap://${server.host}:${server.port}?protocol=${server.protocol.slice(0, -1)}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}`
     );
   }
 }

From c96d66b34a8efc5ba441d40979472c25def0e9b0 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 6 Nov 2023 15:52:05 +1000
Subject: [PATCH 6/6] Release v2.2.44

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 18493def..704ad1f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gns3-web-ui",
-  "version": "2.2.43.dev1",
+  "version": "2.2.44",
   "author": {
     "name": "GNS3 Technology Inc.",
     "email": "developers@gns3.com"