From 549a2dec6734880bc3b9e04583853468d63704c8 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Tue, 7 Nov 2023 21:30:06 +0100
Subject: [PATCH] UI - piggyback commands review - restructure and rename files
 to operations folder - reduced height of piggyback equal to connections

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/index.html                                               | 3 ++-
 ui/main.ts                                                  | 6 +++---
 ui/modules/{piggyback => operations}/piggyback.html         | 2 +-
 ui/modules/{piggyback => operations}/piggyback.ts           | 0
 .../{piggyback => operations}/piggybackPlaceholders.json    | 0
 .../{piggyback => operations}/piggybackTemplates.json       | 0
 .../operations/{operations.html => servicesLogging.html}    | 2 --
 ui/modules/operations/{operations.ts => servicesLogging.ts} | 4 ++--
 ui/modules/{piggyback => operations}/templates.html         | 0
 ui/modules/{piggyback => operations}/templates.ts           | 0
 10 files changed, 8 insertions(+), 9 deletions(-)
 rename ui/modules/{piggyback => operations}/piggyback.html (99%)
 rename ui/modules/{piggyback => operations}/piggyback.ts (100%)
 rename ui/modules/{piggyback => operations}/piggybackPlaceholders.json (100%)
 rename ui/modules/{piggyback => operations}/piggybackTemplates.json (100%)
 rename ui/modules/operations/{operations.html => servicesLogging.html} (98%)
 rename ui/modules/operations/{operations.ts => servicesLogging.ts} (96%)
 rename ui/modules/{piggyback => operations}/templates.html (100%)
 rename ui/modules/{piggyback => operations}/templates.ts (100%)

diff --git a/ui/index.html b/ui/index.html
index a475b03637..2d64bc79fd 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -103,7 +103,8 @@
             <div id="connectionsHTML"></div>
         </div>
         <div class="collapse" id=collapseOperations data-bs-parent="#page-content">
-            <div id="operationsHTML"></div>
+            <div id="piggybackHTML"></div>
+            <div id="servicesLoggingHTML"></div>
         </div>
         <div class="collapse" id="collapseSettings" data-bs-parent="#page-content">
             <div id="environmentsHTML"></div>
diff --git a/ui/main.ts b/ui/main.ts
index b1d3828557..10708b31b7 100644
--- a/ui/main.ts
+++ b/ui/main.ts
@@ -20,9 +20,9 @@ import * as ConnectionsMonitor from './modules/connections/connectionsMonitor.js
 
 import * as Authorization from './modules/environments/authorization.js';
 import * as Environments from './modules/environments/environments.js';
-import * as Operations from './modules/operations/operations.js';
-import * as Piggyback from './modules/piggyback/piggyback.js';
-import * as Templates from './modules/piggyback/templates.js';
+import * as Operations from './modules/operations/servicesLogging.js';
+import * as Piggyback from './modules/operations/piggyback.js';
+import * as Templates from './modules/operations/templates.js';
 import * as Policies from './modules/policies/policies.js';
 import * as Attributes from './modules/things/attributes.js';
 import * as FeatureMessages from './modules/things/featureMessages.js';
diff --git a/ui/modules/piggyback/piggyback.html b/ui/modules/operations/piggyback.html
similarity index 99%
rename from ui/modules/piggyback/piggyback.html
rename to ui/modules/operations/piggyback.html
index b8c9ce11b8..682ad7ec80 100644
--- a/ui/modules/piggyback/piggyback.html
+++ b/ui/modules/operations/piggyback.html
@@ -14,7 +14,7 @@
     Piggyback Commands
 </h5>
 <hr />
-<div class="collapse show" id="piggyBackCommands" style="height: 87%;">
+<div class="collapse show" id="piggyBackCommands" style="height: 80vh;">
     <div class="row-cols-md-auto">
         <div class="col-md-auto resizable_flex_column">
             <div class="row mb-1" style="flex-grow: 1;">
diff --git a/ui/modules/piggyback/piggyback.ts b/ui/modules/operations/piggyback.ts
similarity index 100%
rename from ui/modules/piggyback/piggyback.ts
rename to ui/modules/operations/piggyback.ts
diff --git a/ui/modules/piggyback/piggybackPlaceholders.json b/ui/modules/operations/piggybackPlaceholders.json
similarity index 100%
rename from ui/modules/piggyback/piggybackPlaceholders.json
rename to ui/modules/operations/piggybackPlaceholders.json
diff --git a/ui/modules/piggyback/piggybackTemplates.json b/ui/modules/operations/piggybackTemplates.json
similarity index 100%
rename from ui/modules/piggyback/piggybackTemplates.json
rename to ui/modules/operations/piggybackTemplates.json
diff --git a/ui/modules/operations/operations.html b/ui/modules/operations/servicesLogging.html
similarity index 98%
rename from ui/modules/operations/operations.html
rename to ui/modules/operations/servicesLogging.html
index dadfacfc86..bd1f9e104e 100644
--- a/ui/modules/operations/operations.html
+++ b/ui/modules/operations/servicesLogging.html
@@ -11,8 +11,6 @@
   ~ SPDX-License-Identifier: EPL-2.0
 -->
 
-<div id="piggybackHTML"></div>
-
 <h5 data-bs-toggle="collapse" data-bs-target="#servicesLogging">Ditto Services Logging</h5>
 <hr />
 <div class="collapse show" id="servicesLogging">
diff --git a/ui/modules/operations/operations.ts b/ui/modules/operations/servicesLogging.ts
similarity index 96%
rename from ui/modules/operations/operations.ts
rename to ui/modules/operations/servicesLogging.ts
index 11d943820d..6eb4f05902 100644
--- a/ui/modules/operations/operations.ts
+++ b/ui/modules/operations/servicesLogging.ts
@@ -17,7 +17,7 @@
 import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import {TabHandler} from '../utils/tabHandler.js';
-import operationsHTML from './operations.html';
+import servicesLoggingHTML from './servicesLogging.html';
 
 let dom = {
   buttonLoadAllLogLevels: null,
@@ -27,7 +27,7 @@ let dom = {
   collapseOperations: null,
 };
 
-document.getElementById('operationsHTML').innerHTML = operationsHTML;
+document.getElementById('servicesLoggingHTML').innerHTML = servicesLoggingHTML;
 
 export async function ready() {
   Utils.getAllElementsById(dom);
diff --git a/ui/modules/piggyback/templates.html b/ui/modules/operations/templates.html
similarity index 100%
rename from ui/modules/piggyback/templates.html
rename to ui/modules/operations/templates.html
diff --git a/ui/modules/piggyback/templates.ts b/ui/modules/operations/templates.ts
similarity index 100%
rename from ui/modules/piggyback/templates.ts
rename to ui/modules/operations/templates.ts
-- 
2.38.0