From f8d2d6412add559069279667d674400cd53dbb53 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 12:48:02 -0600
Subject: [PATCH 01/10] Add TablerIconButton where possible

---
 .../src/components/CloudTAK/Menu/Iconset.vue  | 34 ++++++------
 .../src/components/CloudTAK/Menu/Iconsets.vue | 55 ++++++-------------
 2 files changed, 33 insertions(+), 56 deletions(-)

diff --git a/api/web/src/components/CloudTAK/Menu/Iconset.vue b/api/web/src/components/CloudTAK/Menu/Iconset.vue
index b35a41e4c..6661647ba 100644
--- a/api/web/src/components/CloudTAK/Menu/Iconset.vue
+++ b/api/web/src/components/CloudTAK/Menu/Iconset.vue
@@ -1,27 +1,23 @@
 <template>
     <MenuTemplate :name='iconset.name'>
         <template #buttons>
-            <IconPlus
+            <TablerIconButton
                 v-if='iconset.username || profile.system_admin'
-                v-tooltip='"Create Icon"'
-                :size='32'
-                :stroke='1'
-                class='cursor-pointer'
+                title='Create Icon'
                 @click='editIconModal = {}'
-            /> <IconSettings
+            ><IconPlus :size='32' :stroke='1'/></TablerIconButton>
+
+            <TablerIconButton
                 v-if='iconset.username || profile.system_admin'
-                class='cursor-pointer'
-                :size='32'
-                :stroke='1'
+                title='Settings'
                 @click='editIconsetModal = iconset'
-            />
-            <IconDownload
-                v-tooltip='"Download TAK Zip"'
-                :size='32'
-                :stroke='1'
-                class='cursor-pointer'
+            ><IconSettings :size='32' :stroke='1'/></TablerIconButton>
+
+            <TablerIconButton
+                title='Download TAK Zip'
                 @click.stop='download'
-            />
+            ><IconDownload :size='32' :stroke='1'/></TablerIconButton>
+
             <TablerDelete
                 v-if='iconset.username || profile.system_admin'
                 displaytype='icon'
@@ -60,7 +56,8 @@ import { std, stdurl } from '/src/std.ts';
 import CombinedIcons from '../util/Icons.vue'
 import {
     TablerDelete,
-    TablerLoading
+    TablerLoading,
+    TablerIconButton,
 } from '@tak-ps/vue-tabler';
 import {
     IconPlus,
@@ -84,7 +81,8 @@ export default {
         MenuTemplate,
         CombinedIcons,
         TablerDelete,
-        TablerLoading
+        TablerLoading,
+        TablerIconButton
     },
     data: function() {
         return {
diff --git a/api/web/src/components/CloudTAK/Menu/Iconsets.vue b/api/web/src/components/CloudTAK/Menu/Iconsets.vue
index 1958ddafe..86c8dc9b6 100644
--- a/api/web/src/components/CloudTAK/Menu/Iconsets.vue
+++ b/api/web/src/components/CloudTAK/Menu/Iconsets.vue
@@ -1,29 +1,22 @@
 <template>
     <MenuTemplate name='Iconsets'>
         <template #buttons>
-            <IconPlus
-                v-tooltip='"Create Iconset"'
-                :size='32'
-                :stroke='1'
-                class='cursor-pointer'
+            <TablerIconButton
+                title='Create Iconset'
                 @click='editModal = {}'
-            />
-            <IconFileUpload
+            ><IconPlus :size='32' :stroke='1'/></TablerIconButton>
+
+            <TablerIconButton
                 v-if='!upload'
-                v-tooltip='"Zip Upload"'
-                :size='32'
-                :stroke='1'
-                class='cursor-pointer'
+                title='Zip Upload'
                 @click='upload = true'
-            />
-            <IconRefresh
+            ><IconFileUpload :size='32' :stroke='1'/></TablerIconButton>
+
+            <TablerIconButton
                 v-if='!loading'
-                v-tooltip='"Refresh"'
-                :size='32'
-                :stroke='1'
-                class='cursor-pointer'
+                title='Refresh'
                 @click='fetchList'
-            />
+            ><IconRefresh :size='32' :stroke='1'/></TablerIconButton>
         </template>
         <template #default>
             <template v-if='upload'>
@@ -86,21 +79,9 @@
                             <h3 class='card-title'>
                                 Iconsets
                             </h3>
-
-                            <div class='ms-auto btn-list'>
-                                <IconSearch
-                                    :size='32'
-                                    :stroke='1'
-                                    class='cursor-pointer'
-                                    @click='search = !search'
-                                />
-                            </div>
                         </div>
 
-                        <div
-                            v-if='search'
-                            class='col-12 px-2'
-                        >
+                        <div class='col-12 px-2'>
                             <TablerInput
                                 v-model='paging.filter'
                                 placeholder='Filter'
@@ -134,13 +115,10 @@
                                     v-else
                                     class='mx-3 ms-auto badge border bg-red text-white'
                                 >Private</span>
-                                <IconDownload
-                                    v-tooltip='"Download TAK Zip"'
-                                    :size='32'
-                                    :stroke='1'
-                                    class='cursor-pointer'
+                                <TablerIconButton
+                                    title='Download TAK Zip'
                                     @click.stop='download(iconset)'
-                                />
+                                ><IconDownload :size='32' :stroke='1'/></TablerIconButton>
                             </div>
                         </div>
                     </div>
@@ -183,6 +161,7 @@ import {
     TablerPager,
     TablerInput,
     TablerLoading,
+    TablerIconButton,
 } from '@tak-ps/vue-tabler';
 import {
     IconRefresh,
@@ -210,6 +189,7 @@ export default {
         TablerPager,
         TablerInput,
         TablerLoading,
+        TablerIconButton,
         IconRefresh,
         IconSearch,
     },
@@ -220,7 +200,6 @@ export default {
             loading: true,
             upload: false,
             editModal: false,
-            search: false,
             paging: {
                 limit: 20,
                 filter: '',

From f1d45afbc21df0d12fb958c87be79799e11f45a4 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 12:53:10 -0600
Subject: [PATCH 02/10] Fix Iconset Filter

---
 .../src/components/CloudTAK/util/Icons.vue    | 29 +++----------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/api/web/src/components/CloudTAK/util/Icons.vue b/api/web/src/components/CloudTAK/util/Icons.vue
index ae35b0ee1..ce15c7cda 100644
--- a/api/web/src/components/CloudTAK/util/Icons.vue
+++ b/api/web/src/components/CloudTAK/util/Icons.vue
@@ -1,24 +1,10 @@
 <template>
     <div class='card'>
         <div class='card-header'>
-            <h3 class='card-title'>
-                Icons
-            </h3>
-
-            <div class='ms-auto btn-list'>
-                <IconSearch
-                    :size='32'
-                    :stroke='1'
-                    class='cursor-pointer'
-                    @click='search = !search'
-                />
-            </div>
+            <h3 class='card-title'>Icons</h3>
         </div>
 
-        <div
-            v-if='search'
-            class='col-12 px-2'
-        >
+        <div class='col-12 px-2'>
             <TablerInput
                 v-model='paging.filter'
                 placeholder='Filter'
@@ -102,16 +88,14 @@ import {
     TablerLoading
 } from '@tak-ps/vue-tabler';
 import {
-    IconSearch
 } from '@tabler/icons-vue'
 
 export default {
-    name: 'IconCombineds',
+    name: 'IconsCombined',
     components: {
         TablerNone,
         TablerPager,
         TablerInput,
-        IconSearch,
         TablerLoading
     },
     props: {
@@ -127,7 +111,6 @@ export default {
         return {
             err: false,
             loading: true,
-            search: false,
             paging: {
                 filter: '',
                 limit: 100 - 4, // keeps the icon in an even grid
@@ -140,9 +123,6 @@ export default {
         }
     },
     watch: {
-        search: function() {
-            if (!this.search) this.paging.filter = '';
-        },
         paging: {
             deep: true,
             handler: async function() {
@@ -151,7 +131,6 @@ export default {
         }
     },
     mounted: async function() {
-        // If the icon has a `:` it is part of an iconset, otherwise it is derived from the type
         await this.fetchList();
     },
     methods: {
@@ -166,7 +145,7 @@ export default {
             url.searchParams.append('filter', this.paging.filter);
             url.searchParams.append('limit', this.paging.limit);
             url.searchParams.append('page', this.paging.page);
-            if (this.iconset && this.iconset.includes(':')) url.searchParams.append('iconset', this.iconset);
+            if (this.iconset) url.searchParams.append('iconset', this.iconset);
             this.list = await std(url);
             this.loading = false;
         }

From 894c45da13c96b657c55bbcaa8cde7352a86b199 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 12:56:31 -0600
Subject: [PATCH 03/10] Update Schema

---
 api/lib/schema.ts | 128 +++++++++++++++++++++++-----------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/api/lib/schema.ts b/api/lib/schema.ts
index 132981576..ce6f87371 100644
--- a/api/lib/schema.ts
+++ b/api/lib/schema.ts
@@ -15,90 +15,90 @@ import { json, boolean, numeric, integer, timestamp, pgTable, serial, varchar, t
 
 /** Internal Tables for Postgis for use with drizzle-kit push:pg */
 export const SpatialRefSys = pgTable('spatial_ref_sys', {
-    srid: integer('srid').primaryKey(),
-    auth_name: varchar('auth_name', { length: 256 }),
-    auth_srid: integer('auth_srid'),
-    srtext: varchar('srtext', { length: 2048 }),
-    proj4text: varchar('proj4text', { length: 2048 })
+    srid: integer().primaryKey(),
+    auth_name: varchar({ length: 256 }),
+    auth_srid: integer(),
+    srtext: varchar({ length: 2048 }),
+    proj4text: varchar({ length: 2048 })
 });
 
 /** ==== END ==== */
 
 export const Profile = pgTable('profile', {
-    id: integer('id'),
-    name: text('name').default('Unknown'),
-    username: text('username').primaryKey(),
-    last_login: timestamp('last_login', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    auth: json('auth').$type<ConnectionAuth>().notNull(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    phone: text('phone').notNull().default(''),
-    tak_callsign: text('tak_callsign').notNull().default('CloudTAK User'),
-    tak_group: text('tak_group').$type<TAKGroup>().notNull().default(TAKGroup.ORANGE),
-    tak_role: text('tak_role').$type<TAKRole>().notNull().default(TAKRole.TEAM_MEMBER),
-    tak_loc: geometry('tak_loc', { srid: 4326, type: GeometryType.Point }),
-    display_stale: text('display_stale').$type<Profile_Stale>().notNull().default(Profile_Stale.TenMinutes),
-    display_distance: text('display_distance').$type<Profile_Distance>().notNull().default(Profile_Distance.MILE),
-    display_elevation: text('display_elevation').$type<Profile_Elevation>().notNull().default(Profile_Elevation.FEET),
-    display_speed: text('display_speed').$type<Profile_Speed>().notNull().default(Profile_Speed.MPH),
-    display_text: text('display_text').$type<Profile_Text>().notNull().default(Profile_Text.Medium),
-    system_admin: boolean('system_admin').notNull().default(false),
-    agency_admin: json('agency_admin').notNull().$type<Array<number>>().default([])
+    id: integer(),
+    name: text().default('Unknown'),
+    username: text().primaryKey(),
+    last_login: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    auth: json().$type<ConnectionAuth>().notNull(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    phone: text().notNull().default(''),
+    tak_callsign: text().notNull().default('CloudTAK User'),
+    tak_group: text().$type<TAKGroup>().notNull().default(TAKGroup.ORANGE),
+    tak_role: text().$type<TAKRole>().notNull().default(TAKRole.TEAM_MEMBER),
+    tak_loc: geometry({ srid: 4326, type: GeometryType.Point }),
+    display_stale: text().$type<Profile_Stale>().notNull().default(Profile_Stale.TenMinutes),
+    display_distance: text().$type<Profile_Distance>().notNull().default(Profile_Distance.MILE),
+    display_elevation: text().$type<Profile_Elevation>().notNull().default(Profile_Elevation.FEET),
+    display_speed: text().$type<Profile_Speed>().notNull().default(Profile_Speed.MPH),
+    display_text: text().$type<Profile_Text>().notNull().default(Profile_Text.Medium),
+    system_admin: boolean().notNull().default(false),
+    agency_admin: json().notNull().$type<Array<number>>().default([])
 });
 
 export const ProfileChat = pgTable('profile_chats', {
-    id: serial('id').primaryKey(),
-    username: text('username').notNull().references(() => Profile.username),
-    chatroom: text('chatroom').notNull(),
-    sender_callsign: text('sender_callsign').notNull(),
-    sender_uid: text('sender_uid').notNull(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    message_id: text('message_id').notNull(),
-    message: text('message').notNull()
+    id: serial().primaryKey(),
+    username: text().notNull().references(() => Profile.username),
+    chatroom: text().notNull(),
+    sender_callsign: text().notNull(),
+    sender_uid: text().notNull(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    message_id: text().notNull(),
+    message: text().notNull()
 });
 
 export const VideoLease = pgTable('video_lease', {
-    id: serial('id').primaryKey(),
-    name: text('name').notNull(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    username: text('username').notNull().references(() => Profile.username),
+    id: serial().primaryKey(),
+    name: text().notNull(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    username: text().notNull().references(() => Profile.username),
 
-    ephemeral: boolean('ephemeral').notNull().default(false),
-    expiration: timestamp('expiration', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now() + INTERVAL 1 HOUR;`),
-    path: text('path').notNull(),
-    stream_user: text('stream_user'),
-    stream_pass: text('stream_pass'),
+    ephemeral: boolean().notNull().default(false),
+    expiration: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now() + INTERVAL 1 HOUR;`),
+    path: text().notNull(),
+    stream_user: text(),
+    stream_pass: text(),
 
     // Optional Proxy Mode
-    proxy: text('proxy'),
+    proxy: text(),
 });
 
 export const ProfileFeature = pgTable('profile_features', {
-    id: text('id').primaryKey(),
-    path: text('path').notNull().default('/'),
-    username: text('username').notNull().references(() => Profile.username),
-    properties: json('properties').notNull().default({}),
-    geometry: geometry('geometry', { type: GeometryType.GeometryZ, srid: 4326 }).notNull()
+    id: text().primaryKey(),
+    path: text().notNull().default('/'),
+    username: text().notNull().references(() => Profile.username),
+    properties: json().notNull().default({}),
+    geometry: geometry({ type: GeometryType.GeometryZ, srid: 4326 }).notNull()
 });
 
 export const Basemap = pgTable('basemaps', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    url: text('url').notNull(),
-    overlay: boolean('overlay').notNull().default(false),
-    username: text('username').references(() => Profile.username),
-    bounds: geometry('bounds', { type: GeometryType.Polygon, srid: 4326 }).$type<Polygon>(),
-    center: geometry('center', { type: GeometryType.Point, srid: 4326 }).$type<Point>(),
-    minzoom: integer('minzoom').notNull().default(0),
-    maxzoom: integer('maxzoom').notNull().default(16),
-    format: text('format').$type<Basemap_Format>().notNull().default(Basemap_Format.PNG),
-    style: text('style').$type<Basemap_Style>().notNull().default(Basemap_Style.ZXY),
-    styles: json('styles').$type<Array<unknown>>().notNull().default([]),
-    type: text('type').$type<Basemap_Type>().notNull().default(Basemap_Type.RASTER)
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    url: text().notNull(),
+    overlay: boolean().notNull().default(false),
+    username: text().references(() => Profile.username),
+    bounds: geometry({ type: GeometryType.Polygon, srid: 4326 }).$type<Polygon>(),
+    center: geometry({ type: GeometryType.Point, srid: 4326 }).$type<Point>(),
+    minzoom: integer().notNull().default(0),
+    maxzoom: integer().notNull().default(16),
+    format: text().$type<Basemap_Format>().notNull().default(Basemap_Format.PNG),
+    style: text().$type<Basemap_Style>().notNull().default(Basemap_Style.ZXY),
+    styles: json().$type<Array<unknown>>().notNull().default([]),
+    type: text().$type<Basemap_Type>().notNull().default(Basemap_Type.RASTER)
 }, (table) => {
     return {
         username_idx: index("basemaps_username_idx").on(table.username),

From b60c9766abdb8397cb5d9efc1d3bc05cc2af15bb Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 12:59:23 -0600
Subject: [PATCH 04/10] Fix Build

---
 api/package-lock.json     | 102 +++++++++++++++++++-------------------
 api/routes/video-lease.ts |  11 ++--
 2 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/api/package-lock.json b/api/package-lock.json
index d27648287..6b64425e8 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -3554,9 +3554,9 @@
             }
         },
         "node_modules/@sinonjs/fake-timers": {
-            "version": "13.0.2",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.2.tgz",
-            "integrity": "sha512-4Bb+oqXZTSTZ1q27Izly9lv8B9dlV61CROxPiVtywwzv5SnytJqhvYe6FclHYuXml4cd1VHPo1zd5PmTeJozvA==",
+            "version": "13.0.3",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.3.tgz",
+            "integrity": "sha512-golm/Sc4CqLV/ZalIP14Nre7zPgd8xG/S3nHULMTBHMX0llyTNhE1O6nrgbfvLX2o0y849CnLKdu8OE05Ztiiw==",
             "dev": true,
             "license": "BSD-3-Clause",
             "dependencies": {
@@ -5000,17 +5000,17 @@
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.9.0.tgz",
-            "integrity": "sha512-Y1n621OCy4m7/vTXNlCbMVp87zSd7NH0L9cXD8aIpOaNlzeWxIK4+Q19A68gSmTNRZn92UjocVUWDthGxtqHFg==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.10.0.tgz",
+            "integrity": "sha512-phuB3hoP7FFKbRXxjl+DRlQDuJqhpOnm5MmtROXyWi3uS/Xg2ZXqiQfcG2BJHiN4QKyzdOJi3NEn/qTnjUlkmQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.9.0",
-                "@typescript-eslint/type-utils": "8.9.0",
-                "@typescript-eslint/utils": "8.9.0",
-                "@typescript-eslint/visitor-keys": "8.9.0",
+                "@typescript-eslint/scope-manager": "8.10.0",
+                "@typescript-eslint/type-utils": "8.10.0",
+                "@typescript-eslint/utils": "8.10.0",
+                "@typescript-eslint/visitor-keys": "8.10.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -5034,16 +5034,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.9.0.tgz",
-            "integrity": "sha512-U+BLn2rqTTHnc4FL3FJjxaXptTxmf9sNftJK62XLz4+GxG3hLHm/SUNaaXP5Y4uTiuYoL5YLy4JBCJe3+t8awQ==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.10.0.tgz",
+            "integrity": "sha512-E24l90SxuJhytWJ0pTQydFT46Nk0Z+bsLKo/L8rtQSL93rQ6byd1V/QbDpHUTdLPOMsBCcYXZweADNCfOCmOAg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.9.0",
-                "@typescript-eslint/types": "8.9.0",
-                "@typescript-eslint/typescript-estree": "8.9.0",
-                "@typescript-eslint/visitor-keys": "8.9.0",
+                "@typescript-eslint/scope-manager": "8.10.0",
+                "@typescript-eslint/types": "8.10.0",
+                "@typescript-eslint/typescript-estree": "8.10.0",
+                "@typescript-eslint/visitor-keys": "8.10.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -5081,14 +5081,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.9.0.tgz",
-            "integrity": "sha512-bZu9bUud9ym1cabmOYH9S6TnbWRzpklVmwqICeOulTCZ9ue2/pczWzQvt/cGj2r2o1RdKoZbuEMalJJSYw3pHQ==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.10.0.tgz",
+            "integrity": "sha512-AgCaEjhfql9MDKjMUxWvH7HjLeBqMCBfIaBbzzIcBbQPZE7CPh1m6FF+L75NUMJFMLYhCywJXIDEMa3//1A0dw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.9.0",
-                "@typescript-eslint/visitor-keys": "8.9.0"
+                "@typescript-eslint/types": "8.10.0",
+                "@typescript-eslint/visitor-keys": "8.10.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5099,14 +5099,14 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.9.0.tgz",
-            "integrity": "sha512-JD+/pCqlKqAk5961vxCluK+clkppHY07IbV3vett97KOV+8C6l+CPEPwpUuiMwgbOz/qrN3Ke4zzjqbT+ls+1Q==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.10.0.tgz",
+            "integrity": "sha512-PCpUOpyQSpxBn230yIcK+LeCQaXuxrgCm2Zk1S+PTIRJsEfU6nJ0TtwyH8pIwPK/vJoA+7TZtzyAJSGBz+s/dg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.9.0",
-                "@typescript-eslint/utils": "8.9.0",
+                "@typescript-eslint/typescript-estree": "8.10.0",
+                "@typescript-eslint/utils": "8.10.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.3.0"
             },
@@ -5142,9 +5142,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.9.0.tgz",
-            "integrity": "sha512-SjgkvdYyt1FAPhU9c6FiYCXrldwYYlIQLkuc+LfAhCna6ggp96ACncdtlbn8FmnG72tUkXclrDExOpEYf1nfJQ==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.10.0.tgz",
+            "integrity": "sha512-k/E48uzsfJCRRbGLapdZgrX52csmWJ2rcowwPvOZ8lwPUv3xW6CcFeJAXgx4uJm+Ge4+a4tFOkdYvSpxhRhg1w==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -5156,14 +5156,14 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.9.0.tgz",
-            "integrity": "sha512-9iJYTgKLDG6+iqegehc5+EqE6sqaee7kb8vWpmHZ86EqwDjmlqNNHeqDVqb9duh+BY6WCNHfIGvuVU3Tf9Db0g==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.10.0.tgz",
+            "integrity": "sha512-3OE0nlcOHaMvQ8Xu5gAfME3/tWVDpb/HxtpUZ1WeOAksZ/h/gwrBzCklaGzwZT97/lBbbxJ16dMA98JMEngW4w==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "8.9.0",
-                "@typescript-eslint/visitor-keys": "8.9.0",
+                "@typescript-eslint/types": "8.10.0",
+                "@typescript-eslint/visitor-keys": "8.10.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -5229,16 +5229,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.9.0.tgz",
-            "integrity": "sha512-PKgMmaSo/Yg/F7kIZvrgrWa1+Vwn036CdNUvYFEkYbPwOH4i8xvkaRlu148W3vtheWK9ckKRIz7PBP5oUlkrvQ==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.10.0.tgz",
+            "integrity": "sha512-Oq4uZ7JFr9d1ZunE/QKy5egcDRXT/FrS2z/nlxzPua2VHFtmMvFNDvpq1m/hq0ra+T52aUezfcjGRIB7vNJF9w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.9.0",
-                "@typescript-eslint/types": "8.9.0",
-                "@typescript-eslint/typescript-estree": "8.9.0"
+                "@typescript-eslint/scope-manager": "8.10.0",
+                "@typescript-eslint/types": "8.10.0",
+                "@typescript-eslint/typescript-estree": "8.10.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5252,13 +5252,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.9.0.tgz",
-            "integrity": "sha512-Ht4y38ubk4L5/U8xKUBfKNYGmvKvA1CANoxiTRMM+tOLk3lbF3DvzZCxJCRSE+2GdCMSh6zq9VZJc3asc1XuAA==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.10.0.tgz",
+            "integrity": "sha512-k8nekgqwr7FadWk548Lfph6V3r9OVqjzAIVskE7orMZR23cGJjAOVazsZSJW+ElyjfTM4wx/1g88Mi70DDtG9A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.9.0",
+                "@typescript-eslint/types": "8.10.0",
                 "eslint-visitor-keys": "^3.4.3"
             },
             "engines": {
@@ -11960,15 +11960,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.9.0.tgz",
-            "integrity": "sha512-AuD/FXGYRQyqyOBCpNLldMlsCGvmDNxptQ3Dp58/NXeB+FqyvTfXmMyba3PYa0Vi9ybnj7G8S/yd/4Cw8y47eA==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.10.0.tgz",
+            "integrity": "sha512-YIu230PeN7z9zpu/EtqCIuRVHPs4iSlqW6TEvjbyDAE3MZsSl2RXBo+5ag+lbABCG8sFM1WVKEXhlQ8Ml8A3Fw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.9.0",
-                "@typescript-eslint/parser": "8.9.0",
-                "@typescript-eslint/utils": "8.9.0"
+                "@typescript-eslint/eslint-plugin": "8.10.0",
+                "@typescript-eslint/parser": "8.10.0",
+                "@typescript-eslint/utils": "8.10.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/api/routes/video-lease.ts b/api/routes/video-lease.ts
index fe3b0e289..e5850c404 100644
--- a/api/routes/video-lease.ts
+++ b/api/routes/video-lease.ts
@@ -161,23 +161,22 @@ export default async function router(schema: Schema, config: Config) {
         try {
             const user = await Auth.as_user(config, req);
 
-            if (user.access !== AuthUserAccess.ADMIN && req.body.duration > 60 * 60 * 16) {
+            if (user.access !== AuthUserAccess.ADMIN && req.body.duration && req.body.duration > 60 * 60 * 16) {
                 throw new Err(400, null, 'Only Administrators can request a lease > 16 hours')
             }
 
-            let lease;
+            let lease = await config.models.VideoLease.from(req.params.lease);
+
             if (user.access === AuthUserAccess.ADMIN) {
                 lease = await config.models.VideoLease.commit(req.params.lease, {
                     ...req.body,
-                    expiration: moment().add(req.body.duration, 'seconds').toISOString(),
+                    expiration: req.body.duration ? moment().add(req.body.duration, 'seconds').toISOString() : lease.expiration,
                 });
             } else {
-                lease = await config.models.VideoLease.from(req.params.lease);
-
                 if (lease.username === user.email) {
                     lease = await config.models.VideoLease.commit(req.params.lease, {
                         ...req.body,
-                        expiration: moment().add(req.body.duration, 'seconds').toISOString(),
+                        expiration: req.body.duration ? moment().add(req.body.duration, 'seconds').toISOString() : lease.expiration,
                     });
                 } else {
                     throw new Err(400, null, 'You can only update a lease you created');

From 626f3958e216ec76b3b256d3651b94bfcf9352b3 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 12:59:33 -0600
Subject: [PATCH 05/10] Custom DB Migration

---
 api/migrations/0067_strange_lifeguard.sql |    1 +
 api/migrations/meta/0067_snapshot.json    | 2044 +++++++++++++++++++++
 api/migrations/meta/_journal.json         |    7 +
 3 files changed, 2052 insertions(+)
 create mode 100644 api/migrations/0067_strange_lifeguard.sql
 create mode 100644 api/migrations/meta/0067_snapshot.json

diff --git a/api/migrations/0067_strange_lifeguard.sql b/api/migrations/0067_strange_lifeguard.sql
new file mode 100644
index 000000000..a67a1d22a
--- /dev/null
+++ b/api/migrations/0067_strange_lifeguard.sql
@@ -0,0 +1 @@
+ALTER TABLE "settings" ALTER COLUMN "value" SET DATA TYPE json;
\ No newline at end of file
diff --git a/api/migrations/meta/0067_snapshot.json b/api/migrations/meta/0067_snapshot.json
new file mode 100644
index 000000000..6c39d5f0a
--- /dev/null
+++ b/api/migrations/meta/0067_snapshot.json
@@ -0,0 +1,2044 @@
+{
+  "id": "45e93a71-0c29-41c3-9f9a-df9c342cb64c",
+  "prevId": "65b3e3c9-b394-455e-8ff6-a1dd6201a9f7",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.basemaps": {
+      "name": "basemaps",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "overlay": {
+          "name": "overlay",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "bounds": {
+          "name": "bounds",
+          "type": "GEOMETRY(POLYGON, 4326)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "center": {
+          "name": "center",
+          "type": "GEOMETRY(POINT, 4326)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "minzoom": {
+          "name": "minzoom",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "maxzoom": {
+          "name": "maxzoom",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 16
+        },
+        "format": {
+          "name": "format",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'png'"
+        },
+        "style": {
+          "name": "style",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'zxy'"
+        },
+        "styles": {
+          "name": "styles",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::json"
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'raster'"
+        }
+      },
+      "indexes": {
+        "basemaps_username_idx": {
+          "name": "basemaps_username_idx",
+          "columns": [
+            {
+              "expression": "username",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "basemaps_username_profile_username_fk": {
+          "name": "basemaps_username_profile_username_fk",
+          "tableFrom": "basemaps",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.connections": {
+      "name": "connections",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "agency": {
+          "name": "agency",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "auth": {
+          "name": "auth",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.connection_sinks": {
+      "name": "connection_sinks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "connection": {
+          "name": "connection",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body": {
+          "name": "body",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "logging": {
+          "name": "logging",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "connection_sinks_connection_connections_id_fk": {
+          "name": "connection_sinks_connection_connections_id_fk",
+          "tableFrom": "connection_sinks",
+          "tableTo": "connections",
+          "columnsFrom": [
+            "connection"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.connection_tokens": {
+      "name": "connection_tokens",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connection": {
+          "name": "connection",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "connection_tokens_connection_connections_id_fk": {
+          "name": "connection_tokens_connection_connections_id_fk",
+          "tableFrom": "connection_tokens",
+          "tableTo": "connections",
+          "columnsFrom": [
+            "connection"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.data": {
+      "name": "data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "auto_transform": {
+          "name": "auto_transform",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "mission_sync": {
+          "name": "mission_sync",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "mission_diff": {
+          "name": "mission_diff",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "mission_role": {
+          "name": "mission_role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'MISSION_SUBSCRIBER'"
+        },
+        "mission_token": {
+          "name": "mission_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mission_groups": {
+          "name": "mission_groups",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "assets": {
+          "name": "assets",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[\"*\"]'::json"
+        },
+        "connection": {
+          "name": "connection",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "data_connection_connections_id_fk": {
+          "name": "data_connection_connections_id_fk",
+          "tableFrom": "data",
+          "tableTo": "connections",
+          "columnsFrom": [
+            "connection"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.icons": {
+      "name": "icons",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "iconset": {
+          "name": "iconset",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type2525b": {
+          "name": "type2525b",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "data": {
+          "name": "data",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "icons_iconset_iconsets_uid_fk": {
+          "name": "icons_iconset_iconsets_uid_fk",
+          "tableFrom": "icons",
+          "tableTo": "iconsets",
+          "columnsFrom": [
+            "iconset"
+          ],
+          "columnsTo": [
+            "uid"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.iconsets": {
+      "name": "iconsets",
+      "schema": "",
+      "columns": {
+        "uid": {
+          "name": "uid",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default_group": {
+          "name": "default_group",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default_friendly": {
+          "name": "default_friendly",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default_hostile": {
+          "name": "default_hostile",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default_neutral": {
+          "name": "default_neutral",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default_unknown": {
+          "name": "default_unknown",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "skip_resize": {
+          "name": "skip_resize",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "iconsets_username_idx": {
+          "name": "iconsets_username_idx",
+          "columns": [
+            {
+              "expression": "username",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "iconsets_username_profile_username_fk": {
+          "name": "iconsets_username_profile_username_fk",
+          "tableFrom": "iconsets",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.imports": {
+      "name": "imports",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Pending'"
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "batch": {
+          "name": "batch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "result": {
+          "name": "result",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mode": {
+          "name": "mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Unknown'"
+        },
+        "mode_id": {
+          "name": "mode_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "imports_username_profile_username_fk": {
+          "name": "imports_username_profile_username_fk",
+          "tableFrom": "imports",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.layers": {
+      "name": "layers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "priority": {
+          "name": "priority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'off'"
+        },
+        "alarm_period": {
+          "name": "alarm_period",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 30
+        },
+        "alarm_evals": {
+          "name": "alarm_evals",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 5
+        },
+        "alarm_points": {
+          "name": "alarm_points",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 4
+        },
+        "alarm_threshold": {
+          "name": "alarm_threshold",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "enabled_styles": {
+          "name": "enabled_styles",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "styles": {
+          "name": "styles",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "logging": {
+          "name": "logging",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "stale": {
+          "name": "stale",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 20
+        },
+        "task": {
+          "name": "task",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connection": {
+          "name": "connection",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cron": {
+          "name": "cron",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment": {
+          "name": "environment",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "ephemeral": {
+          "name": "ephemeral",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "config": {
+          "name": "config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "memory": {
+          "name": "memory",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 128
+        },
+        "timeout": {
+          "name": "timeout",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 128
+        },
+        "data": {
+          "name": "data",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "schema": {
+          "name": "schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{\"type\":\"object\",\"required\":[],\"properties\":{}}'::json"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "layers_connection_connections_id_fk": {
+          "name": "layers_connection_connections_id_fk",
+          "tableFrom": "layers",
+          "tableTo": "connections",
+          "columnsFrom": [
+            "connection"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "layers_data_data_id_fk": {
+          "name": "layers_data_data_id_fk",
+          "tableFrom": "layers",
+          "tableTo": "data",
+          "columnsFrom": [
+            "data"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "layers_connection_name_unique": {
+          "name": "layers_connection_name_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "connection",
+            "name"
+          ]
+        }
+      },
+      "checkConstraints": {}
+    },
+    "public.layer_alerts": {
+      "name": "layer_alerts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "layer": {
+          "name": "layer",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'alert-circle'"
+        },
+        "priority": {
+          "name": "priority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'yellow'"
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Details Unknown'"
+        },
+        "hidden": {
+          "name": "hidden",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "layer_alerts_layer_layers_id_fk": {
+          "name": "layer_alerts_layer_layers_id_fk",
+          "tableFrom": "layer_alerts",
+          "tableTo": "layers",
+          "columnsFrom": [
+            "layer"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.layers_template": {
+      "name": "layers_template",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "datasync": {
+          "name": "datasync",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "priority": {
+          "name": "priority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'off'"
+        },
+        "enabled_styles": {
+          "name": "enabled_styles",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "styles": {
+          "name": "styles",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "logging": {
+          "name": "logging",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "stale": {
+          "name": "stale",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 20
+        },
+        "task": {
+          "name": "task",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cron": {
+          "name": "cron",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "memory": {
+          "name": "memory",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 128
+        },
+        "timeout": {
+          "name": "timeout",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 128
+        },
+        "alarm_period": {
+          "name": "alarm_period",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 30
+        },
+        "alarm_evals": {
+          "name": "alarm_evals",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 5
+        },
+        "alarm_points": {
+          "name": "alarm_points",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 4
+        },
+        "alarm_threshold": {
+          "name": "alarm_threshold",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "layers_template_username_profile_username_fk": {
+          "name": "layers_template_username_profile_username_fk",
+          "tableFrom": "layers_template",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.profile": {
+      "name": "profile",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'Unknown'"
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "last_login": {
+          "name": "last_login",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "auth": {
+          "name": "auth",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "phone": {
+          "name": "phone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "tak_callsign": {
+          "name": "tak_callsign",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'CloudTAK User'"
+        },
+        "tak_group": {
+          "name": "tak_group",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Orange'"
+        },
+        "tak_role": {
+          "name": "tak_role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Team Member'"
+        },
+        "tak_loc": {
+          "name": "tak_loc",
+          "type": "GEOMETRY(POINT, 4326)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "display_stale": {
+          "name": "display_stale",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'10 Minutes'"
+        },
+        "display_distance": {
+          "name": "display_distance",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'mile'"
+        },
+        "display_elevation": {
+          "name": "display_elevation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'feet'"
+        },
+        "display_speed": {
+          "name": "display_speed",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'mi/h'"
+        },
+        "display_text": {
+          "name": "display_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Medium'"
+        },
+        "system_admin": {
+          "name": "system_admin",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "agency_admin": {
+          "name": "agency_admin",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::json"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.profile_chats": {
+      "name": "profile_chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chatroom": {
+          "name": "chatroom",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sender_callsign": {
+          "name": "sender_callsign",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sender_uid": {
+          "name": "sender_uid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "message_id": {
+          "name": "message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message": {
+          "name": "message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "profile_chats_username_profile_username_fk": {
+          "name": "profile_chats_username_profile_username_fk",
+          "tableFrom": "profile_chats",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.profile_features": {
+      "name": "profile_features",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'/'"
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "properties": {
+          "name": "properties",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "geometry": {
+          "name": "geometry",
+          "type": "GEOMETRY(GEOMETRYZ, 4326)",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "profile_features_username_profile_username_fk": {
+          "name": "profile_features_username_profile_username_fk",
+          "tableFrom": "profile_features",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.profile_missions": {
+      "name": "profile_missions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "guid": {
+          "name": "guid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.profile_overlays": {
+      "name": "profile_overlays",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "pos": {
+          "name": "pos",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 5
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'vector'"
+        },
+        "opacity": {
+          "name": "opacity",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'1'"
+        },
+        "visible": {
+          "name": "visible",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "styles": {
+          "name": "styles",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::json"
+        },
+        "mode": {
+          "name": "mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mode_id": {
+          "name": "mode_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "profile_overlays_username_profile_username_fk": {
+          "name": "profile_overlays_username_profile_username_fk",
+          "tableFrom": "profile_overlays",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "profile_overlays_username_url_unique": {
+          "name": "profile_overlays_username_url_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "username",
+            "url"
+          ]
+        }
+      },
+      "checkConstraints": {}
+    },
+    "public.server": {
+      "name": "server",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'Default'"
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "auth": {
+          "name": "auth",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "api": {
+          "name": "api",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "provider_url": {
+          "name": "provider_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "provider_secret": {
+          "name": "provider_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "provider_client": {
+          "name": "provider_client",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.settings": {
+      "name": "settings",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.spatial_ref_sys": {
+      "name": "spatial_ref_sys",
+      "schema": "",
+      "columns": {
+        "srid": {
+          "name": "srid",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "auth_name": {
+          "name": "auth_name",
+          "type": "varchar(256)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "auth_srid": {
+          "name": "auth_srid",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "srtext": {
+          "name": "srtext",
+          "type": "varchar(2048)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "proj4text": {
+          "name": "proj4text",
+          "type": "varchar(2048)",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.tasks": {
+      "name": "tasks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "prefix": {
+          "name": "prefix",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "readme": {
+          "name": "readme",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "tasks_prefix_unique": {
+          "name": "tasks_prefix_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "prefix"
+          ]
+        }
+      },
+      "checkConstraints": {}
+    },
+    "public.tokens": {
+      "name": "tokens",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "public.video_lease": {
+      "name": "video_lease",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created": {
+          "name": "created",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "updated": {
+          "name": "updated",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now()"
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ephemeral": {
+          "name": "ephemeral",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "expiration": {
+          "name": "expiration",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "Now() + INTERVAL 1 HOUR;"
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stream_user": {
+          "name": "stream_user",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stream_pass": {
+          "name": "stream_pass",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "proxy": {
+          "name": "proxy",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "video_lease_username_profile_username_fk": {
+          "name": "video_lease_username_profile_username_fk",
+          "tableFrom": "video_lease",
+          "tableTo": "profile",
+          "columnsFrom": [
+            "username"
+          ],
+          "columnsTo": [
+            "username"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/api/migrations/meta/_journal.json b/api/migrations/meta/_journal.json
index 35987c2ec..6a641cd0f 100644
--- a/api/migrations/meta/_journal.json
+++ b/api/migrations/meta/_journal.json
@@ -470,6 +470,13 @@
       "when": 1728402823549,
       "tag": "0066_dusty_earthquake",
       "breakpoints": true
+    },
+    {
+      "idx": 67,
+      "version": "7",
+      "when": 1729191573168,
+      "tag": "0067_strange_lifeguard",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file

From a0b95e5cc7acfea8120ea76bd63c50a964c02188 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 13:21:13 -0600
Subject: [PATCH 06/10] Finish Schema Migration

---
 api/lib/schema.ts                         | 337 +++++++++++-----------
 api/migrations/0067_strange_lifeguard.sql |   5 +-
 2 files changed, 173 insertions(+), 169 deletions(-)

diff --git a/api/lib/schema.ts b/api/lib/schema.ts
index ce6f87371..5655ec136 100644
--- a/api/lib/schema.ts
+++ b/api/lib/schema.ts
@@ -106,45 +106,45 @@ export const Basemap = pgTable('basemaps', {
 })
 
 export const Import = pgTable('imports', {
-    id: text('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    status: text('status').notNull().default('Pending'),
-    error: text('error'),
-    batch: text('batch'),
-    result: json('result').notNull().default({}),
-    username: text('username').notNull().references(() => Profile.username),
-    mode: text('mode').notNull().default('Unknown'),
-    mode_id: text('mode_id'),
-    config: json('config').notNull().default({})
+    id: text().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    status: text().notNull().default('Pending'),
+    error: text(),
+    batch: text(),
+    result: json().notNull().default({}),
+    username: text().notNull().references(() => Profile.username),
+    mode: text().notNull().default('Unknown'),
+    mode_id: text(),
+    config: json().notNull().default({})
 });
 
 export const Task = pgTable('tasks', {
-    id: serial('id').primaryKey(),
-    prefix: text('prefix').notNull(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    repo: text('repo'),
-    readme: text('readme')
+    id: serial().primaryKey(),
+    prefix: text().notNull(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    repo: text(),
+    readme: text()
 }, (t) => ({
     unq: unique().on(t.prefix)
 }));
 
 export const Iconset = pgTable('iconsets', {
-    uid: text('uid').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    version: integer('version').notNull(),
-    name: text('name').notNull(),
-    username: text('username').references(() => Profile.username),
-    default_group: text('default_group'),
-    default_friendly: text('default_friendly'),
-    default_hostile: text('default_hostile'),
-    default_neutral: text('default_neutral'),
-    default_unknown: text('default_unknown'),
-    skip_resize: boolean('skip_resize').notNull().default(false)
+    uid: text().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    version: integer().notNull(),
+    name: text().notNull(),
+    username: text().references(() => Profile.username),
+    default_group: text(),
+    default_friendly: text(),
+    default_hostile: text(),
+    default_neutral: text(),
+    default_unknown: text(),
+    skip_resize: boolean().notNull().default(false)
 }, (table) => {
     return {
         username_idx: index("iconsets_username_idx").on(table.username),
@@ -153,190 +153,191 @@ export const Iconset = pgTable('iconsets', {
 
 
 export const Icon = pgTable('icons', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    iconset: text('iconset').notNull().references(() => Iconset.uid),
-    type2525b: text('type2525b'),
-    data: text('data').notNull(),
-    path: text('path').notNull()
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    iconset: text().notNull().references(() => Iconset.uid),
+    type2525b: text(),
+    data: text().notNull(),
+    data_alt: text().notNull(),
+    path: text().notNull()
 });
 
 export const Connection = pgTable('connections', {
-    id: serial('id').primaryKey(),
-    agency: integer('agency'),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    description: text('description').notNull().default(''),
-    enabled: boolean('enabled').notNull().default(true),
-    auth: json('auth').$type<ConnectionAuth>().notNull()
+    id: serial().primaryKey(),
+    agency: integer(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    description: text().notNull().default(''),
+    enabled: boolean().notNull().default(true),
+    auth: json().$type<ConnectionAuth>().notNull()
 });
 
 export const ConnectionSink = pgTable('connection_sinks', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    enabled: boolean('enabled').notNull().default(true),
-    connection: integer('connection').notNull().references(() => Connection.id),
-    type: text('type').notNull(),
-    body: json('body').notNull().default({}),
-    logging: boolean('logging').notNull().default(false)
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    enabled: boolean().notNull().default(true),
+    connection: integer().notNull().references(() => Connection.id),
+    type: text().notNull(),
+    body: json().notNull().default({}),
+    logging: boolean().notNull().default(false)
 });
 
 export const Data = pgTable('data', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    description: text('description').notNull().default(''),
-    auto_transform: boolean('auto_transform').notNull().default(false),
-    mission_sync: boolean('mission_sync').notNull().default(false),
-    mission_diff: boolean('mission_diff').notNull().default(false),
-    mission_role: text('mission_role').notNull().default('MISSION_SUBSCRIBER'),
-    mission_token: text('mission_token'),
-    mission_groups: text('mission_groups').array().notNull().default([]),
-    assets: json('assets').$type<Array<string>>().notNull().default(["*"]),
-    connection: integer('connection').notNull().references(() => Connection.id)
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    description: text().notNull().default(''),
+    auto_transform: boolean().notNull().default(false),
+    mission_sync: boolean().notNull().default(false),
+    mission_diff: boolean().notNull().default(false),
+    mission_role: text().notNull().default('MISSION_SUBSCRIBER'),
+    mission_token: text(),
+    mission_groups: text().array().notNull().default([]),
+    assets: json().$type<Array<string>>().notNull().default(["*"]),
+    connection: integer().notNull().references(() => Connection.id)
 });
 
 export const Layer = pgTable('layers', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    priority: text('priority').$type<Layer_Priority>().notNull().default(Layer_Priority.OFF),
-    alarm_period: integer('alarm_period').notNull().default(30),
-    alarm_evals: integer('alarm_evals').notNull().default(5),
-    alarm_points: integer('alarm_points').notNull().default(4),
-    alarm_threshold: integer('alarm_threshold').notNull().default(0),
-    description: text('description').notNull().default(''),
-    enabled: boolean('enabled').notNull().default(true),
-    enabled_styles: boolean('enabled_styles').notNull().default(false),
-    styles: json('styles').$type<Static<typeof StyleContainer>>().notNull().default({}),
-    logging: boolean('logging').notNull().default(true),
-    stale: integer('stale').notNull().default(20),
-    task: text('task').notNull(),
-    connection: integer('connection').notNull().references(() => Connection.id),
-    cron: text('cron').notNull(),
-    environment: json('environment').notNull().default({}),
-    ephemeral: json('ephemeral').$type<Record<string, string>>().notNull().default({}),
-    config: json('config').$type<Static<typeof Layer_Config>>().notNull().default({}),
-    memory: integer('memory').notNull().default(128),
-    timeout: integer('timeout').notNull().default(128),
-    data: integer('data').references(() => Data.id),
-    schema: json('schema').notNull().default({ type: 'object', required: [], properties: {} })
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    priority: text().$type<Layer_Priority>().notNull().default(Layer_Priority.OFF),
+    alarm_period: integer().notNull().default(30),
+    alarm_evals: integer().notNull().default(5),
+    alarm_points: integer().notNull().default(4),
+    alarm_threshold: integer().notNull().default(0),
+    description: text().notNull().default(''),
+    enabled: boolean().notNull().default(true),
+    enabled_styles: boolean().notNull().default(false),
+    styles: json().$type<Static<typeof StyleContainer>>().notNull().default({}),
+    logging: boolean().notNull().default(true),
+    stale: integer().notNull().default(20),
+    task: text().notNull(),
+    connection: integer().notNull().references(() => Connection.id),
+    cron: text().notNull(),
+    environment: json().notNull().default({}),
+    ephemeral: json().$type<Record<string, string>>().notNull().default({}),
+    config: json().$type<Static<typeof Layer_Config>>().notNull().default({}),
+    memory: integer().notNull().default(128),
+    timeout: integer().notNull().default(128),
+    data: integer().references(() => Data.id),
+    schema: json().notNull().default({ type: 'object', required: [], properties: {} })
 }, (t) => ({
     unq: unique().on(t.connection, t.name)
 }));
 
 export const LayerTemplate = pgTable('layers_template', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull(),
-    description: text('description').notNull().default(''),
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull(),
+    description: text().notNull().default(''),
 
-    username: text('username').notNull().references(() => Profile.username),
+    username: text().notNull().references(() => Profile.username),
 
     // Should the template be used when attached to a DataSync
-    datasync: boolean('datasync').notNull().default(false),
+    datasync: boolean().notNull().default(false),
 
     // Layer Specific Properties
-    priority: text('priority').$type<Layer_Priority>().notNull().default(Layer_Priority.OFF),
-    enabled_styles: boolean('enabled_styles').notNull().default(false),
-    styles: json('styles').$type<Static<typeof StyleContainer>>().notNull().default({}),
-    logging: boolean('logging').notNull().default(true),
-    stale: integer('stale').notNull().default(20),
-    task: text('task').notNull(),
-    cron: text('cron').notNull(),
-    config: json('config').$type<Static<typeof Layer_Config>>().notNull().default({}),
-    memory: integer('memory').notNull().default(128),
-    timeout: integer('timeout').notNull().default(128),
-    alarm_period: integer('alarm_period').notNull().default(30),
-    alarm_evals: integer('alarm_evals').notNull().default(5),
-    alarm_points: integer('alarm_points').notNull().default(4),
-    alarm_threshold: integer('alarm_threshold').notNull().default(0),
+    priority: text().$type<Layer_Priority>().notNull().default(Layer_Priority.OFF),
+    enabled_styles: boolean().notNull().default(false),
+    styles: json().$type<Static<typeof StyleContainer>>().notNull().default({}),
+    logging: boolean().notNull().default(true),
+    stale: integer().notNull().default(20),
+    task: text().notNull(),
+    cron: text().notNull(),
+    config: json().$type<Static<typeof Layer_Config>>().notNull().default({}),
+    memory: integer().notNull().default(128),
+    timeout: integer().notNull().default(128),
+    alarm_period: integer().notNull().default(30),
+    alarm_evals: integer().notNull().default(5),
+    alarm_points: integer().notNull().default(4),
+    alarm_threshold: integer().notNull().default(0),
 });
 
 
 export const LayerAlert = pgTable('layer_alerts', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    layer: integer('layer').notNull().references(() => Layer.id),
-    icon: text('icon').notNull().default('alert-circle'),
-    priority: text('priority').notNull().default('yellow'),
-    title: text('title').notNull(),
-    description: text('description').notNull().default('Details Unknown'),
-    hidden: boolean('hidden').notNull().default(false)
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    layer: integer().notNull().references(() => Layer.id),
+    icon: text().notNull().default('alert-circle'),
+    priority: text().notNull().default('yellow'),
+    title: text().notNull(),
+    description: text().notNull().default('Details Unknown'),
+    hidden: boolean().notNull().default(false)
 });
 
 export const Setting = pgTable('settings', {
-    key: text('key').primaryKey(),
-    value: json('value').notNull().default('')
+    key: text().primaryKey(),
+    value: text().notNull().default('')
 });
 
 export const Server = pgTable('server', {
-    id: serial('id').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    name: text('name').notNull().default('Default'),
-    url: text('url').notNull(),
-    auth: json('auth').$type<{
+    id: serial().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    name: text().notNull().default('Default'),
+    url: text().notNull(),
+    auth: json().$type<{
         cert?: string;
         key?: string;
     }>().notNull().default({}),
-    api: text('api').notNull().default(''),
-    provider_url: text('provider_url').notNull().default(''),
-    provider_secret: text('provider_secret').notNull().default(''),
-    provider_client: text('provider_client').notNull().default(''),
+    api: text().notNull().default(''),
+    provider_url: text().notNull().default(''),
+    provider_secret: text().notNull().default(''),
+    provider_client: text().notNull().default(''),
 });
 
 export const Token = pgTable('tokens', {
-    id: serial('id').notNull(),
-    email: text('email').notNull(),
-    name: text('name').notNull(),
-    token: text('token').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    id: serial().notNull(),
+    email: text().notNull(),
+    name: text().notNull(),
+    token: text().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
 });
 
 export const ConnectionToken = pgTable('connection_tokens', {
-    id: serial('id').notNull(),
-    connection: integer('connection').notNull().references(() => Connection.id),
-    name: text('name').notNull(),
-    token: text('token').primaryKey(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    id: serial().notNull(),
+    connection: integer().notNull().references(() => Connection.id),
+    name: text().notNull(),
+    token: text().primaryKey(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
 });
 
 export const ProfileMission = pgTable('profile_missions', {
-    id: serial('id').primaryKey(),
-    name: text('name').notNull(),
-    guid: text('guid').notNull(),
-    token: text('token').notNull(),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    id: serial().primaryKey(),
+    name: text().notNull(),
+    guid: text().notNull(),
+    token: text().notNull(),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
 });
 
 export const ProfileOverlay = pgTable('profile_overlays', {
-    id: serial('id').primaryKey(),
-    name: text('name').notNull(),
-    username: text('username').notNull().references(() => Profile.username),
-    created: timestamp('created', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    updated: timestamp('updated', { withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
-    pos: integer('pos').notNull().default(5),
-    type: text('type').notNull().default('vector'),
-    opacity: numeric('opacity').notNull().default('1'),
-    visible: boolean('visible').notNull().default(true),
-    token: text('token'),
-    styles: json('styles').$type<Array<unknown>>().notNull().default([]),
-    mode: text('mode').notNull(),
-    mode_id: text('mode_id'), // Used for Data not for Profile
-    url: text('url').notNull()
+    id: serial().primaryKey(),
+    name: text().notNull(),
+    username: text().notNull().references(() => Profile.username),
+    created: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    updated: timestamp({ withTimezone: true, mode: 'string' }).notNull().default(sql`Now()`),
+    pos: integer().notNull().default(5),
+    type: text().notNull().default('vector'),
+    opacity: numeric().notNull().default('1'),
+    visible: boolean().notNull().default(true),
+    token: text(),
+    styles: json().$type<Array<unknown>>().notNull().default([]),
+    mode: text().notNull(),
+    mode_id: text(), // Used for Data not for Profile
+    url: text().notNull()
 }, (t) => ({
     unq: unique().on(t.username, t.url)
 }));
diff --git a/api/migrations/0067_strange_lifeguard.sql b/api/migrations/0067_strange_lifeguard.sql
index a67a1d22a..cc76ac882 100644
--- a/api/migrations/0067_strange_lifeguard.sql
+++ b/api/migrations/0067_strange_lifeguard.sql
@@ -1 +1,4 @@
-ALTER TABLE "settings" ALTER COLUMN "value" SET DATA TYPE json;
\ No newline at end of file
+UPDATE settings
+    SET value = Replace(value, '"', '')
+    WHERE Starts_With(key, 'group:')
+

From 330394af8c31c64445cf5a1d352dd0be7a013694 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 13:30:56 -0600
Subject: [PATCH 07/10] Add Data_Alt Column

---
 api/lib/models/Icon.ts                    | 2 ++
 api/lib/schema.ts                         | 2 +-
 api/lib/sprites.ts                        | 6 +++---
 api/migrations/0067_strange_lifeguard.sql | 4 +++-
 api/routes/icons.ts                       | 2 ++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api/lib/models/Icon.ts b/api/lib/models/Icon.ts
index 782b94b6f..b377acfed 100644
--- a/api/lib/models/Icon.ts
+++ b/api/lib/models/Icon.ts
@@ -11,6 +11,7 @@ export type Icon = {
     iconset: string;
     type2525b: string;
     data: string;
+    data_alt: string;
     path: string;
     username: string;
 }
@@ -40,6 +41,7 @@ export default class IconModel extends Modeler<typeof pgschema.Icon> {
             iconset: pgschema.Icon.iconset,
             type2525b: pgschema.Icon.type2525b,
             data: pgschema.Icon.data,
+            data_alt: pgschema.Icon.data_alt,
             path: pgschema.Icon.path,
             username: pgschema.Iconset.username
         }).from(this.generic)
diff --git a/api/lib/schema.ts b/api/lib/schema.ts
index 5655ec136..5df7aede3 100644
--- a/api/lib/schema.ts
+++ b/api/lib/schema.ts
@@ -160,7 +160,7 @@ export const Icon = pgTable('icons', {
     iconset: text().notNull().references(() => Iconset.uid),
     type2525b: text(),
     data: text().notNull(),
-    data_alt: text().notNull(),
+    data_alt: text(),
     path: text().notNull()
 });
 
diff --git a/api/lib/sprites.ts b/api/lib/sprites.ts
index dbaaad5b1..9e0f0a567 100644
--- a/api/lib/sprites.ts
+++ b/api/lib/sprites.ts
@@ -1,8 +1,8 @@
 import spritesmith from 'spritesmith';
 import Vinyl from 'vinyl';
 import { promisify } from 'node:util'
-import type { Icon } from './schema.js';
-import { type InferSelectModel } from 'drizzle-orm';
+import { Static } from '@sinclair/typebox';
+import { IconResponse } from './types.js';
 
 const SpriteSmith = promisify(spritesmith.run);
 
@@ -10,7 +10,7 @@ type SpriteConfig = {
     name?: string;
 };
 
-export default async function(icons: Array<InferSelectModel<typeof Icon>>, config: SpriteConfig = {}) {
+export default async function(icons: Array<Static<typeof IconResponse>>, config: SpriteConfig = {}) {
     const doc = await SpriteSmith({
         src: icons.map((icon) => {
             return new Vinyl({
diff --git a/api/migrations/0067_strange_lifeguard.sql b/api/migrations/0067_strange_lifeguard.sql
index cc76ac882..edca39dac 100644
--- a/api/migrations/0067_strange_lifeguard.sql
+++ b/api/migrations/0067_strange_lifeguard.sql
@@ -1,4 +1,6 @@
 UPDATE settings
     SET value = Replace(value, '"', '')
-    WHERE Starts_With(key, 'group:')
+    WHERE Starts_With(key, 'group:');
 
+ALTER TABLE icons
+    ADD COLUMN data_alt TEXT;
diff --git a/api/routes/icons.ts b/api/routes/icons.ts
index 1cdd8a146..e65a193c4 100644
--- a/api/routes/icons.ts
+++ b/api/routes/icons.ts
@@ -292,6 +292,7 @@ export default async function router(schema: Schema, config: Config) {
         body: Type.Object({
             name: Default.NameField,
             data: Type.String(),
+            data_alt: Type.Optional(Type.String()),
             type2525b: Type.Optional(Type.Union([Type.String(), Type.Null()]))
         }),
         res: IconResponse
@@ -404,6 +405,7 @@ export default async function router(schema: Schema, config: Config) {
         body: Type.Object({
             name: Type.Optional(Type.String()),
             data: Type.Optional(Type.String()),
+            data_alt: Type.Optional(Type.String()),
             type2525b: Type.Optional(Type.Union([Type.String(), Type.Null()]))
         }),
         res: IconResponse

From 1f8bb40fa135a1dffe519c4ea6c9921ef32880ec Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 14:27:21 -0600
Subject: [PATCH 08/10] Fix CoT filtering

---
 api/lib/sprites.ts                 |   3 +-
 api/package-lock.json              | 106 ++++++++++++++++-------------
 api/routes/connection-layer-cot.ts |  11 +--
 3 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/api/lib/sprites.ts b/api/lib/sprites.ts
index 9e0f0a567..998bc71fa 100644
--- a/api/lib/sprites.ts
+++ b/api/lib/sprites.ts
@@ -8,6 +8,7 @@ const SpriteSmith = promisify(spritesmith.run);
 
 type SpriteConfig = {
     name?: string;
+    useDataAlt?: boolean;
 };
 
 export default async function(icons: Array<Static<typeof IconResponse>>, config: SpriteConfig = {}) {
@@ -16,7 +17,7 @@ export default async function(icons: Array<Static<typeof IconResponse>>, config:
             return new Vinyl({
                 // @ts-expect-error Deal with indexing issue on icon
                 path: config.name ? icon[config.name] + '.png' : icon.path.replace(/.*?\//, ''),
-                contents: Buffer.from(icon.data, 'base64'),
+                contents: Buffer.from(config.useDataAlt && icon.data_alt ? icon.data_alt : icon.data, 'base64'),
             })
         })
     });
diff --git a/api/package-lock.json b/api/package-lock.json
index 6b64425e8..037af0bb0 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -361,9 +361,9 @@
             }
         },
         "node_modules/@aws-sdk/client-cloudformation": {
-            "version": "3.672.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.672.0.tgz",
-            "integrity": "sha512-PsQ+Qg/3fGz7oI+zrN+kBGkpGrZ20tWCA/sUqyfDIroBFpmQ1YqxeQT4mFD7u57QB42Pbhm2k15+lH4j8hdTPQ==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.674.0.tgz",
+            "integrity": "sha512-K2/U5p2qF57qL+KZ2R1sQ7qdCWVnKbZMNA+2NqqS46XUIq4Ve6Y+192SskXAHXjgHPWf8U6CXxrvKd59R1RQ6g==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
@@ -407,6 +407,7 @@
                 "@smithy/util-retry": "^3.0.7",
                 "@smithy/util-utf8": "^3.0.0",
                 "@smithy/util-waiter": "^3.1.6",
+                "@types/uuid": "^9.0.1",
                 "tslib": "^2.6.2",
                 "uuid": "^9.0.1"
             },
@@ -469,9 +470,9 @@
             }
         },
         "node_modules/@aws-sdk/client-cloudwatch-logs": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.670.0.tgz",
-            "integrity": "sha512-5EARAsAH01rxrSr3/L0nHiupQWrkJs2K0NvSFlajEOjEwa08gQZHMrTnASaRc8VazIU73y63ddjxHR+Fk4Xhng==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.674.0.tgz",
+            "integrity": "sha512-wnrp9IB2J0pf4IeVCfG9XnLzr02ZZyzrUMX/9O716PP/+EdKYocrqnySMniaVHAjpvw5fdLRjPXTmkhPEb9Ymw==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
@@ -517,6 +518,7 @@
                 "@smithy/util-middleware": "^3.0.7",
                 "@smithy/util-retry": "^3.0.7",
                 "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
                 "tslib": "^2.6.2",
                 "uuid": "^9.0.1"
             },
@@ -525,9 +527,9 @@
             }
         },
         "node_modules/@aws-sdk/client-dynamodb": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-dynamodb/-/client-dynamodb-3.670.0.tgz",
-            "integrity": "sha512-K0VAFpHzVnAgAxUb8z7/93WsyNx1v296VhVmYsIYZW1judLpAyWYW0EWaKkVb52X2r7khm8q1PtGtykRNiFAzQ==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-dynamodb/-/client-dynamodb-3.674.0.tgz",
+            "integrity": "sha512-LLLIOPpal6ZxS/4pSTDLtvHmteRQZBt8NyHNV7FsYsCsQhwIzDpl0zVEQ7V1pLmXdrs72dfUuFjpvJHXB6faXw==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
@@ -572,6 +574,7 @@
                 "@smithy/util-retry": "^3.0.7",
                 "@smithy/util-utf8": "^3.0.0",
                 "@smithy/util-waiter": "^3.1.6",
+                "@types/uuid": "^9.0.1",
                 "tslib": "^2.6.2",
                 "uuid": "^9.0.1"
             },
@@ -580,9 +583,9 @@
             }
         },
         "node_modules/@aws-sdk/client-ec2": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-ec2/-/client-ec2-3.670.0.tgz",
-            "integrity": "sha512-e19jbRUEJ/1HPxmS0V0mByyfzjdXak/pzuenkmiusYtKPTTfIPo+APfjNW6cwhj9LrVFgcIYxuIX2E2CYKFRtw==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-ec2/-/client-ec2-3.674.0.tgz",
+            "integrity": "sha512-EnbAechu9WGtqHU834pi/sMPI5W29barWDAIPxkPEWax8Y8r9gNRjf9HAjhf97Ri3Fd/fK6hzHROPWbZY31bHw==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
@@ -627,6 +630,7 @@
                 "@smithy/util-retry": "^3.0.7",
                 "@smithy/util-utf8": "^3.0.0",
                 "@smithy/util-waiter": "^3.1.6",
+                "@types/uuid": "^9.0.1",
                 "tslib": "^2.6.2",
                 "uuid": "^9.0.1"
             },
@@ -688,9 +692,9 @@
             }
         },
         "node_modules/@aws-sdk/client-ecs": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-ecs/-/client-ecs-3.670.0.tgz",
-            "integrity": "sha512-foTdNseNPdGBXL7pLolGbqVA9VP2ocDJFUKInB2HXO10cv9hCl/x6X2LftDJVEJcQI4ynJxmiDEmQzl3jwsRZQ==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-ecs/-/client-ecs-3.674.0.tgz",
+            "integrity": "sha512-HViyj8vNniolpsrWo8QuQ0IRNWUbDZXMxFRfKDzUCmVyJ51cLQKkxia5UwyOvGii6OYINNyvFY1bhU61HrgM+w==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -735,6 +739,7 @@
                 "@smithy/util-retry": "^3.0.7",
                 "@smithy/util-utf8": "^3.0.0",
                 "@smithy/util-waiter": "^3.1.6",
+                "@types/uuid": "^9.0.1",
                 "tslib": "^2.6.2",
                 "uuid": "^9.0.1"
             },
@@ -743,9 +748,9 @@
             }
         },
         "node_modules/@aws-sdk/client-eventbridge": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-eventbridge/-/client-eventbridge-3.670.0.tgz",
-            "integrity": "sha512-L/QOkYbW1ld652dwxC6lPh4F6Ni1+RPkzY+PH0r7yIo+hdQs0bPkqdh2FQi+SaSQtEir6hJkOotPVzvUGXSOkA==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-eventbridge/-/client-eventbridge-3.674.0.tgz",
+            "integrity": "sha512-mdvHRhXDCxNwHtvXurP7m6AfC9bBw/ywydWXDNY5Z2LD7GWoRKaRuuvu33xQT7D5E9gJDaz8qMksmuR7UqCPkQ==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
@@ -759,7 +764,7 @@
                 "@aws-sdk/middleware-recursion-detection": "3.667.0",
                 "@aws-sdk/middleware-user-agent": "3.669.0",
                 "@aws-sdk/region-config-resolver": "3.667.0",
-                "@aws-sdk/signature-v4-multi-region": "3.669.0",
+                "@aws-sdk/signature-v4-multi-region": "3.674.0",
                 "@aws-sdk/types": "3.667.0",
                 "@aws-sdk/util-endpoints": "3.667.0",
                 "@aws-sdk/util-user-agent-browser": "3.670.0",
@@ -853,9 +858,9 @@
             }
         },
         "node_modules/@aws-sdk/client-s3": {
-            "version": "3.673.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.673.0.tgz",
-            "integrity": "sha512-GREQlgG13Jveu9I+4pH2wfxHnl8TN0geVdUO8vOh6VbudmtfdC8hXUuMiTMX7VZ6c4zyOFStzBwysUv0Ze7kFg==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.674.0.tgz",
+            "integrity": "sha512-/pbAGFXUFqhZPrb4vACYdJzAc/lX/MPW1sxRoiX46BVjvpT7QkYwRjlzuifskLyDf2TjkGNsXu+F6AgPGCXFUg==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha1-browser": "5.2.0",
@@ -872,11 +877,11 @@
                 "@aws-sdk/middleware-location-constraint": "3.667.0",
                 "@aws-sdk/middleware-logger": "3.667.0",
                 "@aws-sdk/middleware-recursion-detection": "3.667.0",
-                "@aws-sdk/middleware-sdk-s3": "3.669.0",
+                "@aws-sdk/middleware-sdk-s3": "3.674.0",
                 "@aws-sdk/middleware-ssec": "3.667.0",
                 "@aws-sdk/middleware-user-agent": "3.669.0",
                 "@aws-sdk/region-config-resolver": "3.667.0",
-                "@aws-sdk/signature-v4-multi-region": "3.669.0",
+                "@aws-sdk/signature-v4-multi-region": "3.674.0",
                 "@aws-sdk/types": "3.667.0",
                 "@aws-sdk/util-endpoints": "3.667.0",
                 "@aws-sdk/util-user-agent-browser": "3.670.0",
@@ -922,9 +927,9 @@
             }
         },
         "node_modules/@aws-sdk/client-secrets-manager": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.670.0.tgz",
-            "integrity": "sha512-O5M94wRBqvGuD2+atCTWPFZfCvsRAMOV96ftw6Mje/Ug375dC4aLc/FvsG9YQGiuGbzhzu02hOIOiGvnJqxj4A==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.674.0.tgz",
+            "integrity": "sha512-emzNqq5CZ1h52oGWBzMIFORgJ3sF2ddnRqXwRGfbFvZchNjMTRm0PbXx9P4gAIA6ZbB5SWMI9wsBRbnVE7J++Q==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
@@ -967,6 +972,7 @@
                 "@smithy/util-middleware": "^3.0.7",
                 "@smithy/util-retry": "^3.0.7",
                 "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
                 "tslib": "^2.6.2",
                 "uuid": "^9.0.1"
             },
@@ -1380,13 +1386,13 @@
             }
         },
         "node_modules/@aws-sdk/lib-dynamodb": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/lib-dynamodb/-/lib-dynamodb-3.670.0.tgz",
-            "integrity": "sha512-YoySUx1SIy/pfWODeRuv3k5RaOG57ewdINHzuOB6rCQcx1sU6eXu/omHGMkhNCah8xOfwYGeXJ6b3kTI6lHTxg==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/lib-dynamodb/-/lib-dynamodb-3.674.0.tgz",
+            "integrity": "sha512-Ahy6y2EHeDTqNrLh1YwlgldmJGvsPFO0U839538bdT+Uu1oHlXFBdVUsX/5O/3XESYlDp4STHM/vWmCb4BeosA==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-sdk/core": "3.667.0",
-                "@aws-sdk/util-dynamodb": "3.670.0",
+                "@aws-sdk/util-dynamodb": "3.674.0",
                 "@smithy/core": "^2.4.8",
                 "@smithy/smithy-client": "^3.4.0",
                 "@smithy/types": "^3.5.0",
@@ -1396,13 +1402,13 @@
                 "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "@aws-sdk/client-dynamodb": "^3.670.0"
+                "@aws-sdk/client-dynamodb": "^3.674.0"
             }
         },
         "node_modules/@aws-sdk/lib-storage": {
-            "version": "3.673.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.673.0.tgz",
-            "integrity": "sha512-KDhCYCEQ7vOQre907TFTzA7cSoMOetSavAwSc2Xk550oBgw6LmPeWf2OsWyeScGaASdqZ/ZhpQSiasQo8KcILg==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.674.0.tgz",
+            "integrity": "sha512-66mSM4pp0Z6O2pLP/b5veFSIMpvR/7/c0f75RSDweE0VV2kr3WOr8uZYxY6jYkjj6CDYaN0PGhLJXt2vdfxRng==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@smithy/abort-controller": "^3.1.5",
@@ -1417,7 +1423,7 @@
                 "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "@aws-sdk/client-s3": "^3.673.0"
+                "@aws-sdk/client-s3": "^3.674.0"
             }
         },
         "node_modules/@aws-sdk/middleware-bucket-endpoint": {
@@ -1570,9 +1576,9 @@
             }
         },
         "node_modules/@aws-sdk/middleware-sdk-s3": {
-            "version": "3.669.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.669.0.tgz",
-            "integrity": "sha512-b2QUQ7DcIcVCUFhvmFEDI90BemvQhO0ntIajllLqQSy88PSNdLDCVx5mIzfxaaK/1tdY/UsEDRRm1kMQHJDQpg==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.674.0.tgz",
+            "integrity": "sha512-IvXnWrKy4mO+I44kLYHd6Wlw+FdB4sg1jvHCmnZo1KNaAFIA3x1iXgOaZynKoBdEmol3xfr2uDbeXUQvIwoIgg==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-sdk/core": "3.667.0",
@@ -1661,12 +1667,12 @@
             }
         },
         "node_modules/@aws-sdk/signature-v4-multi-region": {
-            "version": "3.669.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.669.0.tgz",
-            "integrity": "sha512-TVwlWAxfBHnFjnfTBQWUhzVJzjwVhkq1+KR0JZV7JrfqeyBOdZjAaV9ie3VNY9HUouecq1fDuKaSwe4JiWQsHg==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.674.0.tgz",
+            "integrity": "sha512-VMQWbtcbg4FV/fILrODADV21pPg9AghuEzQlW2kH0hCtacvBwFl7eBxIiCBLLtkNple+CVPJvyBcqOZdBkEv/w==",
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/middleware-sdk-s3": "3.669.0",
+                "@aws-sdk/middleware-sdk-s3": "3.674.0",
                 "@aws-sdk/types": "3.667.0",
                 "@smithy/protocol-http": "^4.1.4",
                 "@smithy/signature-v4": "^4.2.0",
@@ -1722,9 +1728,9 @@
             }
         },
         "node_modules/@aws-sdk/util-dynamodb": {
-            "version": "3.670.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-dynamodb/-/util-dynamodb-3.670.0.tgz",
-            "integrity": "sha512-d+kb5njjqi5uU4X8O9FTfdOSFisxH9Zi7iyoeSDzo2B+cxYG26uhk5jmLbZ7Usq/h6OQoCsMecWoTQyZU6+VXA==",
+            "version": "3.674.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-dynamodb/-/util-dynamodb-3.674.0.tgz",
+            "integrity": "sha512-edxrLzjnc/1VbR0XL955BrJ/W43gk2i4txod2ZXFu1vBfXRz6RFq50J/H4UbkQWsFLxT5S3BALnoAUsJjy7znQ==",
             "license": "Apache-2.0",
             "dependencies": {
                 "tslib": "^2.6.2"
@@ -1733,7 +1739,7 @@
                 "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "@aws-sdk/client-dynamodb": "^3.670.0"
+                "@aws-sdk/client-dynamodb": "^3.674.0"
             }
         },
         "node_modules/@aws-sdk/util-endpoints": {
@@ -4968,6 +4974,12 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/uuid": {
+            "version": "9.0.8",
+            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
+            "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+            "license": "MIT"
+        },
         "node_modules/@types/vinyl": {
             "version": "2.0.12",
             "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz",
diff --git a/api/routes/connection-layer-cot.ts b/api/routes/connection-layer-cot.ts
index 8fe7a79a9..2cca4b0c6 100644
--- a/api/routes/connection-layer-cot.ts
+++ b/api/routes/connection-layer-cot.ts
@@ -75,7 +75,7 @@ export default async function router(schema: Schema, config: Config) {
             }
 
             const errors: Array<Static<typeof LayerError>> = [];
-            const cots = [];
+            let cots = [];
             for (const feat of req.body.features) {
                 try {
                     cots.push(CoT.from_geojson(feat))
@@ -129,16 +129,17 @@ export default async function router(schema: Schema, config: Config) {
                         existMap.set(String(feat.id), feat);
                     }
 
-
-                    for (const cot of cots) {
+                    cots = cots.filter((cot) => {
                         const exist = existMap.get(cot.uid());
                         if (exist && data.mission_diff) {
                             const b = CoT.from_geojson(exist);
-                            if (!cot.isDiff(b)) continue;
+                            if (!cot.isDiff(b)) return false;
                         }
 
                         cot.addDest({ mission: data.name, path: `layer-${layer.id}`, after: '' });
-                    }
+
+                        return true;
+                    })
                 } else {
                     for (const cot of cots) {
                         cot.addDest({ mission: data.name });

From 3c15585c3c46f45060ebdf26873b03d614da58a7 Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 14:34:39 -0600
Subject: [PATCH 09/10] Fix Lints

---
 .../src/components/CloudTAK/Menu/Iconset.vue  | 21 +++++++++++--
 .../src/components/CloudTAK/Menu/Iconsets.vue | 30 +++++++++++++++----
 .../src/components/CloudTAK/util/Icons.vue    |  4 ++-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/api/web/src/components/CloudTAK/Menu/Iconset.vue b/api/web/src/components/CloudTAK/Menu/Iconset.vue
index 6661647ba..771094a56 100644
--- a/api/web/src/components/CloudTAK/Menu/Iconset.vue
+++ b/api/web/src/components/CloudTAK/Menu/Iconset.vue
@@ -5,18 +5,33 @@
                 v-if='iconset.username || profile.system_admin'
                 title='Create Icon'
                 @click='editIconModal = {}'
-            ><IconPlus :size='32' :stroke='1'/></TablerIconButton>
+            >
+                <IconPlus
+                    :size='32'
+                    :stroke='1'
+                />
+            </TablerIconButton>
 
             <TablerIconButton
                 v-if='iconset.username || profile.system_admin'
                 title='Settings'
                 @click='editIconsetModal = iconset'
-            ><IconSettings :size='32' :stroke='1'/></TablerIconButton>
+            >
+                <IconSettings
+                    :size='32'
+                    :stroke='1'
+                />
+            </TablerIconButton>
 
             <TablerIconButton
                 title='Download TAK Zip'
                 @click.stop='download'
-            ><IconDownload :size='32' :stroke='1'/></TablerIconButton>
+            >
+                <IconDownload
+                    :size='32'
+                    :stroke='1'
+                />
+            </TablerIconButton>
 
             <TablerDelete
                 v-if='iconset.username || profile.system_admin'
diff --git a/api/web/src/components/CloudTAK/Menu/Iconsets.vue b/api/web/src/components/CloudTAK/Menu/Iconsets.vue
index 86c8dc9b6..fa0f19c72 100644
--- a/api/web/src/components/CloudTAK/Menu/Iconsets.vue
+++ b/api/web/src/components/CloudTAK/Menu/Iconsets.vue
@@ -4,19 +4,34 @@
             <TablerIconButton
                 title='Create Iconset'
                 @click='editModal = {}'
-            ><IconPlus :size='32' :stroke='1'/></TablerIconButton>
+            >
+                <IconPlus
+                    :size='32'
+                    :stroke='1'
+                />
+            </TablerIconButton>
 
             <TablerIconButton
                 v-if='!upload'
                 title='Zip Upload'
                 @click='upload = true'
-            ><IconFileUpload :size='32' :stroke='1'/></TablerIconButton>
+            >
+                <IconFileUpload
+                    :size='32'
+                    :stroke='1'
+                />
+            </TablerIconButton>
 
             <TablerIconButton
                 v-if='!loading'
                 title='Refresh'
                 @click='fetchList'
-            ><IconRefresh :size='32' :stroke='1'/></TablerIconButton>
+            >
+                <IconRefresh
+                    :size='32'
+                    :stroke='1'
+                />
+            </TablerIconButton>
         </template>
         <template #default>
             <template v-if='upload'>
@@ -118,7 +133,12 @@
                                 <TablerIconButton
                                     title='Download TAK Zip'
                                     @click.stop='download(iconset)'
-                                ><IconDownload :size='32' :stroke='1'/></TablerIconButton>
+                                >
+                                    <IconDownload
+                                        :size='32'
+                                        :stroke='1'
+                                    />
+                                </TablerIconButton>
                             </div>
                         </div>
                     </div>
@@ -167,7 +187,6 @@ import {
     IconRefresh,
     IconDownload,
     IconFileUpload,
-    IconSearch,
     IconAlbum,
     IconPhoto,
     IconPlus
@@ -191,7 +210,6 @@ export default {
         TablerLoading,
         TablerIconButton,
         IconRefresh,
-        IconSearch,
     },
     data: function() {
         return {
diff --git a/api/web/src/components/CloudTAK/util/Icons.vue b/api/web/src/components/CloudTAK/util/Icons.vue
index ce15c7cda..365526a3b 100644
--- a/api/web/src/components/CloudTAK/util/Icons.vue
+++ b/api/web/src/components/CloudTAK/util/Icons.vue
@@ -1,7 +1,9 @@
 <template>
     <div class='card'>
         <div class='card-header'>
-            <h3 class='card-title'>Icons</h3>
+            <h3 class='card-title'>
+                Icons
+            </h3>
         </div>
 
         <div class='col-12 px-2'>

From 07bb1e42fde5b6973d433e189209da6db47dd39e Mon Sep 17 00:00:00 2001
From: ingalls <nick@ingalls.ca>
Date: Thu, 17 Oct 2024 15:05:40 -0600
Subject: [PATCH 10/10] Automatically Resize

---
 api/lib/sprites.ts                      | 25 ++++++++++++++++---------
 api/routes/icons.ts                     | 18 +++++++++++++++---
 api/web/src/components/CloudTAK/Map.vue |  2 +-
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/api/lib/sprites.ts b/api/lib/sprites.ts
index 998bc71fa..6ba426c35 100644
--- a/api/lib/sprites.ts
+++ b/api/lib/sprites.ts
@@ -3,6 +3,7 @@ import Vinyl from 'vinyl';
 import { promisify } from 'node:util'
 import { Static } from '@sinclair/typebox';
 import { IconResponse } from './types.js';
+import Sharp from 'sharp';
 
 const SpriteSmith = promisify(spritesmith.run);
 
@@ -12,15 +13,21 @@ type SpriteConfig = {
 };
 
 export default async function(icons: Array<Static<typeof IconResponse>>, config: SpriteConfig = {}) {
-    const doc = await SpriteSmith({
-        src: icons.map((icon) => {
-            return new Vinyl({
-                // @ts-expect-error Deal with indexing issue on icon
-                path: config.name ? icon[config.name] + '.png' : icon.path.replace(/.*?\//, ''),
-                contents: Buffer.from(config.useDataAlt && icon.data_alt ? icon.data_alt : icon.data, 'base64'),
-            })
-        })
-    });
+    const src = [];
+    for (const icon of icons) {
+        const contents = await Sharp(Buffer.from(config.useDataAlt && icon.data_alt ? icon.data_alt : icon.data, 'base64'))
+            .resize(32)
+            .png()
+            .toBuffer();
+
+        src.push(new Vinyl({
+            // @ts-expect-error Deal with indexing issue on icon
+            path: config.name ? icon[config.name] + '.png' : icon.path.replace(/.*?\//, ''),
+                contents
+        }))
+    }
+
+    const doc = await SpriteSmith({ src });
 
     const coords: Record<string, any> = {};
     for (const key in doc.coordinates) {
diff --git a/api/routes/icons.ts b/api/routes/icons.ts
index e65a193c4..a21450c86 100644
--- a/api/routes/icons.ts
+++ b/api/routes/icons.ts
@@ -478,6 +478,10 @@ export default async function router(schema: Schema, config: Config) {
         }),
         query: Type.Object({
             token: Type.Optional(Type.String()),
+            alt: Type.Boolean({
+                default: false,
+                description: 'Use alternate icon if possible'
+            })
         }),
         description: 'Icon Data',
     }, async (req, res) => {
@@ -493,7 +497,11 @@ export default async function router(schema: Schema, config: Config) {
                 (${req.params.iconset} = iconset AND ${req.params.icon} = name)
             `);
 
-            res.status(200).send(Buffer.from(icon.data, 'base64'));
+            if (req.query.alt && icon.data_alt) {
+                res.status(200).send(Buffer.from(icon.data, 'base64'));
+            } else {
+                res.status(200).send(Buffer.from(icon.data, 'base64'));
+            }
         } catch (err) {
             Err.respond(err, res);
         }
@@ -535,7 +543,9 @@ export default async function router(schema: Schema, config: Config) {
                     `
                 })
 
-                const sprites = await Sprites(icons.items);
+                const sprites = await Sprites(icons.items, {
+                    useDataAlt: true
+                });
 
                 SpriteMap[req.query.iconset] = { image: sprites.image, json: sprites.json };
 
@@ -582,7 +592,9 @@ export default async function router(schema: Schema, config: Config) {
                         AND ${scope}
                     `
                 })
-                const sprites = await Sprites(icons.items);
+                const sprites = await Sprites(icons.items, {
+                    useDataAlt: true
+                });
 
                 SpriteMap[req.query.iconset] = { image: sprites.image, json: sprites.json };
 
diff --git a/api/web/src/components/CloudTAK/Map.vue b/api/web/src/components/CloudTAK/Map.vue
index 58da2dc97..9e1d69a22 100644
--- a/api/web/src/components/CloudTAK/Map.vue
+++ b/api/web/src/components/CloudTAK/Map.vue
@@ -924,7 +924,7 @@ export default {
                     // Eventually make a sprite URL part of the overlay so KMLs can load a sprite package
                     const iconsets = await std('/api/iconset');
                     for (const iconset of iconsets.items) {
-                        mapStore.map.addSprite(iconset.uid, String(stdurl(`/api/icon/sprite?token=${localStorage.token}&iconset=${iconset.uid}`)))
+                        mapStore.map.addSprite(iconset.uid, String(stdurl(`/api/icon/sprite?token=${localStorage.token}&iconset=${iconset.uid}&alt=true`)))
                     }
 
                     await mapStore.initOverlays();