From ec569ad082547f83bff815feba82c6756a10d883 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Mon, 9 Dec 2024 09:02:39 -0700
Subject: [PATCH 1/2] Fixed to Env Editor

---
 api/web/package-lock.json                     | 20 ++---
 api/web/package.json                          |  4 +-
 api/web/src/components/Connection.vue         |  5 +-
 api/web/src/components/Data.vue               |  1 +
 api/web/src/components/Layer.vue              |  1 +
 .../src/components/Layer/LayerEnvironment.vue |  6 +-
 .../components/Layer/utils/SchemaModal.vue    | 81 ++++++++-----------
 7 files changed, 56 insertions(+), 62 deletions(-)

diff --git a/api/web/package-lock.json b/api/web/package-lock.json
index 079b6eb0f..762d868eb 100644
--- a/api/web/package-lock.json
+++ b/api/web/package-lock.json
@@ -11,7 +11,7 @@
                 "@sinclair/typebox": "^0.34.0",
                 "@tabler/core": "^1.0.0-beta16",
                 "@tabler/icons-vue": "^3.0.0",
-                "@tak-ps/vue-tabler": "^3.60.2",
+                "@tak-ps/vue-tabler": "^3.61.1",
                 "@turf/bbox": "^7.1.0",
                 "@turf/boolean-point-in-polygon": "^7.1.0",
                 "@turf/boolean-touches": "^7.1.0",
@@ -25,7 +25,7 @@
                 "dropzone": "^6.0.0-beta.2",
                 "floating-vue": "^2.0.0-beta.17",
                 "jsonata": "^2.0.4",
-                "maplibre-gl": "^5.0.0-pre.8",
+                "maplibre-gl": "^5.0.0-pre.9",
                 "moment": "^2.29.3",
                 "p12-pem": "^1.0.5",
                 "phone": "^3.1.42",
@@ -3457,9 +3457,9 @@
             }
         },
         "node_modules/@tak-ps/vue-tabler": {
-            "version": "3.61.0",
-            "resolved": "https://registry.npmjs.org/@tak-ps/vue-tabler/-/vue-tabler-3.61.0.tgz",
-            "integrity": "sha512-RgFefavwyJSQlLsEFqmYjsPbC8Nid3KbfEb2zRs9+IYvPn+LIrqdRR7IkzLPZfddOfvsQpTA73lqUMB4PNlh9w==",
+            "version": "3.61.1",
+            "resolved": "https://registry.npmjs.org/@tak-ps/vue-tabler/-/vue-tabler-3.61.1.tgz",
+            "integrity": "sha512-Plp8k6UskAWMF2FfsKoG2zfm0YWX1q8Mpksq07caAPqswz/umIt6ApfBo0k9EO5PG/8xSzGonGaW0vBUfaQ4ww==",
             "license": "ISC",
             "dependencies": {
                 "@tabler/icons-vue": "^3.0.0",
@@ -7920,9 +7920,9 @@
             }
         },
         "node_modules/maplibre-gl": {
-            "version": "5.0.0-pre.8",
-            "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.0.0-pre.8.tgz",
-            "integrity": "sha512-xZT1cTTdFgqog8sfGzvZY8vFHodWxBmrsWwr73D5SbKtQFReXNdlyvRnYVGhzWpLnsQsOVLtmow4WO8fRWjGQQ==",
+            "version": "5.0.0-pre.9",
+            "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.0.0-pre.9.tgz",
+            "integrity": "sha512-OmsFfVyg+kMs8f2sldt9yVq95epgEkaXpwMG4i5SR9Xap/SsfgAxOTHau+XhduQu5nq4uIgQMZEr3T//8AX27g==",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "@mapbox/geojson-rewind": "^0.5.2",
@@ -7932,8 +7932,8 @@
                 "@mapbox/unitbezier": "^0.0.1",
                 "@mapbox/vector-tile": "^1.3.1",
                 "@mapbox/whoots-js": "^3.1.0",
-                "@maplibre/maplibre-gl-style-spec": "^22.0.0",
-                "@types/geojson": "^7946.0.14",
+                "@maplibre/maplibre-gl-style-spec": "^22.0.1",
+                "@types/geojson": "^7946.0.15",
                 "@types/geojson-vt": "3.2.5",
                 "@types/mapbox__point-geometry": "^0.1.4",
                 "@types/mapbox__vector-tile": "^1.3.4",
diff --git a/api/web/package.json b/api/web/package.json
index c94e4f126..98a2bc70d 100644
--- a/api/web/package.json
+++ b/api/web/package.json
@@ -15,7 +15,7 @@
         "@sinclair/typebox": "^0.34.0",
         "@tabler/core": "^1.0.0-beta16",
         "@tabler/icons-vue": "^3.0.0",
-        "@tak-ps/vue-tabler": "^3.60.2",
+        "@tak-ps/vue-tabler": "^3.61.1",
         "@turf/bbox": "^7.1.0",
         "@turf/boolean-point-in-polygon": "^7.1.0",
         "@turf/boolean-touches": "^7.1.0",
@@ -29,7 +29,7 @@
         "dropzone": "^6.0.0-beta.2",
         "floating-vue": "^2.0.0-beta.17",
         "jsonata": "^2.0.4",
-        "maplibre-gl": "^5.0.0-pre.8",
+        "maplibre-gl": "^5.0.0-pre.9",
         "moment": "^2.29.3",
         "p12-pem": "^1.0.5",
         "phone": "^3.1.42",
diff --git a/api/web/src/components/Connection.vue b/api/web/src/components/Connection.vue
index 99aedb1a8..57051a10b 100644
--- a/api/web/src/components/Connection.vue
+++ b/api/web/src/components/Connection.vue
@@ -17,7 +17,10 @@
                 <div class='row row-deck row-cards'>
                     <div class='col-lg-12'>
                         <div class='card'>
-                            <TablerLoading v-if='loading.connection' />
+                            <TablerLoading
+                                v-if='loading.connection'
+                                class='text-white'
+                            />
                             <template v-else>
                                 <div class='card-header'>
                                     <ConnectionStatus :connection='connection' />
diff --git a/api/web/src/components/Data.vue b/api/web/src/components/Data.vue
index 3b02d5016..2e14cd8b1 100644
--- a/api/web/src/components/Data.vue
+++ b/api/web/src/components/Data.vue
@@ -14,6 +14,7 @@
 
         <TablerLoading
             v-if='loading.data'
+            class='text-white'
             desc='Loading Data'
         />
         <div
diff --git a/api/web/src/components/Layer.vue b/api/web/src/components/Layer.vue
index 5f792a2b0..e0b8ee624 100644
--- a/api/web/src/components/Layer.vue
+++ b/api/web/src/components/Layer.vue
@@ -14,6 +14,7 @@
 
         <TablerLoading
             v-if='loading.layer'
+            class='text-white'
             desc='Loading Layer'
         />
         <div
diff --git a/api/web/src/components/Layer/LayerEnvironment.vue b/api/web/src/components/Layer/LayerEnvironment.vue
index 28f7c1e14..fb97c0cda 100644
--- a/api/web/src/components/Layer/LayerEnvironment.vue
+++ b/api/web/src/components/Layer/LayerEnvironment.vue
@@ -16,7 +16,7 @@
                         class='cursor-pointer'
                         @click='raw = true'
                     />
-                    <IconSettings
+                    <IconPencil
                         :size='32'
                         :stroke='1'
                         class='cursor-pointer'
@@ -130,7 +130,7 @@ import Schema from './utils/Schema.vue';
 import {
     IconX,
     IconCode,
-    IconSettings,
+    IconPencil,
 } from '@tabler/icons-vue'
 
 export default {
@@ -139,7 +139,7 @@ export default {
         Schema,
         IconCode,
         IconX,
-        IconSettings,
+        IconPencil,
         TablerTimeZone,
         TablerAlert,
         TablerLoading,
diff --git a/api/web/src/components/Layer/utils/SchemaModal.vue b/api/web/src/components/Layer/utils/SchemaModal.vue
index 4d6ddccb3..cc5d9f2f0 100644
--- a/api/web/src/components/Layer/utils/SchemaModal.vue
+++ b/api/web/src/components/Layer/utils/SchemaModal.vue
@@ -4,21 +4,20 @@
             type='button'
             class='btn-close'
             aria-label='Close'
-            @click='$emit("close")'
+            @click='emit("close")'
         />
         <div class='modal-status bg-yellow' />
         <div class='modal-header'>
             <span class='modal-title'>Row Editor</span>
-            <TablerDelete
-                v-if='!disabled'
-                displaytype='icon'
-                @delete='$emit("remove")'
-            />
+            <div class='ms-auto'>
+                <TablerDelete
+                    v-if='!disabled'
+                    displaytype='icon'
+                    @delete='emit("remove")'
+                />
+            </div>
         </div>
-        <div
-            v-if='!loading'
-            class='modal-body py-4'
-        >
+        <div class='modal-body py-4' >
             <TablerSchema
                 v-model='row'
                 :schema='schema'
@@ -28,7 +27,7 @@
             <button
                 v-if='!disabled'
                 class='btn btn-primary w-100 mt-4'
-                @click='$emit("done", row)'
+                @click='emit("done", row)'
             >
                 Done
             </button>
@@ -36,48 +35,38 @@
     </TablerModal>
 </template>
 
-<script>
+<script setup>
+import { ref, onMounted } from 'vue';
 import {
     TablerModal,
     TablerSchema,
     TablerDelete
 } from '@tak-ps/vue-tabler';
 
-export default {
-    name: 'LayerEnvironmentModal',
-    components: {
-        TablerModal,
-        TablerDelete,
-        TablerSchema
+const props = defineProps({
+    edit: {
+        type: Object,
+        required: true
     },
-    props: {
-        edit: {
-            type: Object,
-            required: true
-        },
-        disabled: {
-            type: Boolean,
-            default: true
-        },
-        schema: {
-            type: Object,
-            required: true
-        },
+    disabled: {
+        type: Boolean,
+        default: true
     },
-    emits: [
-        'close',
-        'remove',
-        'done'
-    ],
-    data: function() {
-        return {
-            loading: true,
-            row: {}
-        }
+    schema: {
+        type: Object,
+        required: true
     },
-    mounted: function() {
-        this.row = Object.assign(this.row, JSON.parse(JSON.stringify(this.edit)));
-        this.loading = false;
-    }
-}
+});
+
+const emit = defineEmits([
+    'close',
+    'remove',
+    'done'
+]);
+
+const row = ref({});
+
+onMounted(() => {
+    row.value = Object.assign(row.value, JSON.parse(JSON.stringify(props.edit)));
+})
 </script>

From 128d2be01d1137ff60333ca89891e6cb1df4df5a Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Mon, 9 Dec 2024 09:04:52 -0700
Subject: [PATCH 2/2] Fix SchemaModal

---
 api/web/src/components/Layer/utils/SchemaModal.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/web/src/components/Layer/utils/SchemaModal.vue b/api/web/src/components/Layer/utils/SchemaModal.vue
index cc5d9f2f0..6f4f838f1 100644
--- a/api/web/src/components/Layer/utils/SchemaModal.vue
+++ b/api/web/src/components/Layer/utils/SchemaModal.vue
@@ -17,7 +17,7 @@
                 />
             </div>
         </div>
-        <div class='modal-body py-4' >
+        <div v-if='!loading' class='modal-body py-4' >
             <TablerSchema
                 v-model='row'
                 :schema='schema'
@@ -64,9 +64,11 @@ const emit = defineEmits([
     'done'
 ]);
 
+const loading = ref(true);
 const row = ref({});
 
 onMounted(() => {
     row.value = Object.assign(row.value, JSON.parse(JSON.stringify(props.edit)));
+    loading.value = false;
 })
 </script>