Merge d12d5f94eb into 277d6fe0ce

db/knex_migrations/2024-11-27-1927-fix-info-json-data-type.js

@@ -0,0 +1,13 @@
+// Update info_json column to LONGTEXT mainly for MariaDB
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor_tls_info", function (table) {
+            table.text("info_json", "longtext").alter();
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor_tls_info", function (table) {
+        table.text("info_json", "text").alter();
+    });
+};

server/database.js

@@ -775,8 +775,6 @@ class Database {
             await migrationServer.start(port, hostname);
         }
 
-        await Settings.set("migrateAggregateTableState", "migrating");
-
         log.info("db", "Migrating Aggregate Table");
 
         log.info("db", "Getting list of unique monitors");
@@ -799,6 +797,8 @@ class Database {
             }
         }
 
+        await Settings.set("migrateAggregateTableState", "migrating");
+
         let progressPercent = 0;
         let part = 100 / monitors.length;
         let i = 1;

server/socket-handlers/status-page-socket-handler.js

@@ -288,6 +288,7 @@ module.exports.statusPageSocketHandler = (socket) => {
                 ok: true,
                 msg: "successAdded",
                 msgi18n: true,
+                slug: slug
             });
 
         } catch (error) {

src/pages/AddStatusPage.vue

@@ -16,14 +16,11 @@
                         <label for="slug" class="form-label">{{ $t("Slug") }}</label>
                         <div class="input-group">
                             <span id="basic-addon3" class="input-group-text">/status/</span>
-                            <input id="slug" v-model="slug" type="text" class="form-control" required data-testid="slug-input">
+                            <input id="slug" v-model="slug" type="text" class="form-control" autocapitalize="none" required data-testid="slug-input">
                         </div>
                         <div class="form-text">
                             <ul>
                                 <li>{{ $t("Accept characters:") }} <mark>a-z</mark> <mark>0-9</mark> <mark>-</mark></li>
-                                <i18n-t tag="li" keypath="startOrEndWithOnly">
-                                    <mark>a-z</mark> <mark>0-9</mark>
-                                </i18n-t>
                                 <li>{{ $t("No consecutive dashes") }} <mark>--</mark></li>
                                 <i18n-t tag="li" keypath="statusPageSpecialSlugDesc">
                                     <mark class="me-1">default</mark>
@@ -65,7 +62,7 @@ export default {
                 this.processing = false;
 
                 if (res.ok) {
-                    location.href = "/status/" + this.slug + "?edit";
+                    location.href = "/status/" + res.slug + "?edit";
                 } else {
 
                     if (res.msg.includes("UNIQUE constraint")) {
@@ -85,4 +82,8 @@ export default {
 .shadow-box {
     padding: 20px;
 }
+
+#slug {
+    text-transform: lowercase;
+}
 </style>