Merge pull request #3250 from fosrl/dev

1.19.1

package.json

@@ -43,24 +43,24 @@
         "@novnc/novnc": "^1.7.0",
         "@oslojs/crypto": "1.0.1",
         "@oslojs/encoding": "1.1.0",
-        "@radix-ui/react-avatar": "1.1.12",
-        "@radix-ui/react-checkbox": "1.3.4",
-        "@radix-ui/react-collapsible": "1.1.13",
-        "@radix-ui/react-dialog": "1.1.16",
-        "@radix-ui/react-dropdown-menu": "2.1.17",
+        "@radix-ui/react-avatar": "1.1.11",
+        "@radix-ui/react-checkbox": "1.3.3",
+        "@radix-ui/react-collapsible": "1.1.12",
+        "@radix-ui/react-dialog": "1.1.15",
+        "@radix-ui/react-dropdown-menu": "2.1.16",
         "@radix-ui/react-icons": "1.3.2",
-        "@radix-ui/react-label": "2.1.9",
-        "@radix-ui/react-popover": "1.1.16",
-        "@radix-ui/react-progress": "1.1.9",
+        "@radix-ui/react-label": "2.1.8",
+        "@radix-ui/react-popover": "1.1.15",
+        "@radix-ui/react-progress": "1.1.8",
         "@radix-ui/react-radio-group": "1.3.8",
-        "@radix-ui/react-scroll-area": "1.2.11",
+        "@radix-ui/react-scroll-area": "1.2.10",
         "@radix-ui/react-select": "2.2.6",
-        "@radix-ui/react-separator": "1.1.9",
-        "@radix-ui/react-slot": "1.2.5",
+        "@radix-ui/react-separator": "1.1.8",
+        "@radix-ui/react-slot": "1.2.4",
         "@radix-ui/react-switch": "1.2.6",
-        "@radix-ui/react-tabs": "1.1.14",
-        "@radix-ui/react-toast": "1.2.16",
-        "@radix-ui/react-tooltip": "1.2.9",
+        "@radix-ui/react-tabs": "1.1.13",
+        "@radix-ui/react-toast": "1.2.15",
+        "@radix-ui/react-tooltip": "1.2.8",
         "@react-email/body": "0.3.0",
         "@react-email/components": "1.0.12",
         "@react-email/render": "2.0.8",
@@ -91,32 +91,32 @@
         "helmet": "8.2.0",
         "http-errors": "2.0.1",
         "input-otp": "1.4.2",
-        "ioredis": "5.11.1",
+        "ioredis": "5.11.0",
         "jmespath": "0.16.0",
         "js-yaml": "4.1.1",
         "jsonwebtoken": "9.0.3",
         "lucide-react": "1.17.0",
         "maxmind": "5.0.6",
         "moment": "2.30.1",
-        "next": "16.2.9",
+        "next": "16.2.6",
         "next-intl": "4.13.0",
         "next-themes": "0.4.6",
         "nextjs-toploader": "3.9.17",
         "node-cache": "5.1.2",
-        "nodemailer": "8.0.11",
+        "nodemailer": "8.0.9",
         "oslo": "1.2.1",
         "pg": "8.21.0",
         "posthog-node": "5.35.6",
         "qrcode.react": "4.2.0",
-        "react": "19.2.7",
+        "react": "19.2.6",
         "react-day-picker": "9.14.0",
-        "react-dom": "19.2.7",
+        "react-dom": "19.2.6",
         "react-easy-sort": "1.8.0",
         "react-hook-form": "7.76.1",
         "react-icons": "5.6.0",
         "recharts": "3.8.1",
         "reodotdev": "1.1.0",
-        "semver": "7.8.4",
+        "semver": "7.8.1",
         "sshpk": "1.18.0",
         "stripe": "22.2.0",
         "swagger-ui-express": "5.0.1",
@@ -152,10 +152,10 @@
         "@types/js-yaml": "4.0.9",
         "@types/jsonwebtoken": "9.0.10",
         "@types/node": "25.9.1",
-        "@types/nodemailer": "8.0.1",
+        "@types/nodemailer": "8.0.0",
         "@types/nprogress": "0.2.3",
         "@types/pg": "8.20.0",
-        "@types/react": "19.2.17",
+        "@types/react": "19.2.15",
         "@types/react-dom": "19.2.3",
         "@types/semver": "7.7.1",
         "@types/sshpk": "1.17.4",

server/setup/migrationsSqlite.ts

@@ -44,6 +44,7 @@ import m38 from "./scriptsSqlite/1.18.0";
 import m39 from "./scriptsSqlite/1.18.3";
 import m40 from "./scriptsSqlite/1.18.4";
 import m41 from "./scriptsSqlite/1.19.0";
+import m42 from "./scriptsSqlite/1.19.1";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -85,7 +86,8 @@ const migrations = [
     { version: "1.18.0", run: m38 },
     { version: "1.18.3", run: m39 },
     { version: "1.18.4", run: m40 },
-    { version: "1.19.0", run: m41 }
+    { version: "1.19.0", run: m41 },
+    { version: "1.19.1", run: m42 }
     // Add new migrations here as they are created
 ] as const;
 

server/setup/scriptsSqlite/1.19.0.ts

@@ -680,25 +680,6 @@ export default async function migration() {
                     deleteResourceRules.run(resource.resourceId);
                     deleteResourceWhitelist.run(resource.resourceId);
                 }
-                // remove not null/default from sso, applyRules, and emailWhitelistEnabled in preparation for resource policies
-                db.prepare(`ALTER TABLE 'resources' DROP COLUMN 'sso';`).run();
-                db.prepare(
-                    `ALTER TABLE 'resources' ADD COLUMN 'sso' integer;`
-                ).run();
-
-                db.prepare(
-                    `ALTER TABLE 'resources' DROP COLUMN 'applyRules';`
-                ).run();
-                db.prepare(
-                    `ALTER TABLE 'resources' ADD COLUMN 'applyRules' integer;`
-                ).run();
-
-                db.prepare(
-                    `ALTER TABLE 'resources' DROP COLUMN 'emailWhitelistEnabled';`
-                ).run();
-                db.prepare(
-                    `ALTER TABLE 'resources' ADD COLUMN 'emailWhitelistEnabled' integer;`
-                ).run();
             });
 
             migrateInlinePolicies();
@@ -707,6 +688,29 @@ export default async function migration() {
             );
         }
 
+        // add one more transaction
+        db.transaction(() => {
+            // remove not null/default from sso, applyRules, and emailWhitelistEnabled in preparation for resource policies
+            db.prepare(`ALTER TABLE 'resources' DROP COLUMN 'sso';`).run();
+            db.prepare(
+                `ALTER TABLE 'resources' ADD COLUMN 'sso' integer;`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'resources' DROP COLUMN 'applyRules';`
+            ).run();
+            db.prepare(
+                `ALTER TABLE 'resources' ADD COLUMN 'applyRules' integer;`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'resources' DROP COLUMN 'emailWhitelistEnabled';`
+            ).run();
+            db.prepare(
+                `ALTER TABLE 'resources' ADD COLUMN 'emailWhitelistEnabled' integer;`
+            ).run();
+        })();
+
         console.log("Migrated database");
     } catch (e) {
         console.log("Failed to migrate db:", e);

server/setup/scriptsSqlite/1.19.1.ts

@@ -0,0 +1,59 @@
+import { APP_PATH, __DIRNAME } from "@server/lib/consts";
+import Database from "better-sqlite3";
+import path from "path";
+
+const version = "1.19.1";
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    const location = path.join(APP_PATH, "db", "db.sqlite");
+    const db = new Database(location);
+
+    try {
+        db.transaction(() => {
+            // remove not null/default from sso, applyRules, and emailWhitelistEnabled in preparation for resource policies
+            db.prepare(
+                `ALTER TABLE 'resources' ADD COLUMN 'sso2' integer;`
+            ).run();
+            db.prepare(`UPDATE 'resources' SET "sso2" = "sso";`).run();
+            db.prepare(`ALTER TABLE 'resources' DROP COLUMN 'sso';`).run();
+            db.prepare(
+                `ALTER TABLE 'resources' RENAME COLUMN 'sso2' TO 'sso';`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'resources' ADD COLUMN 'applyRules2' integer;`
+            ).run();
+            db.prepare(
+                `UPDATE 'resources' SET "applyRules2" = "applyRules";`
+            ).run();
+            db.prepare(
+                `ALTER TABLE 'resources' DROP COLUMN 'applyRules';`
+            ).run();
+            db.prepare(
+                `ALTER TABLE 'resources' RENAME COLUMN 'applyRules2' TO 'applyRules';`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'resources' ADD COLUMN 'emailWhitelistEnabled2' integer;`
+            ).run();
+            db.prepare(
+                `UPDATE 'resources' SET "emailWhitelistEnabled2" = "emailWhitelistEnabled";`
+            ).run();
+            db.prepare(
+                `ALTER TABLE 'resources' DROP COLUMN 'emailWhitelistEnabled';`
+            ).run();
+            db.prepare(
+                `ALTER TABLE 'resources' RENAME COLUMN 'emailWhitelistEnabled2' TO 'emailWhitelistEnabled';`
+            ).run();
+        })();
+
+        console.log("Migrated database");
+    } catch (e) {
+        console.log("Failed to migrate db:", e);
+        throw e;
+    }
+
+    console.log(`${version} migration complete`);
+}

src/app/[orgId]/settings/sites/create/page.tsx

@@ -561,7 +561,7 @@ export default function Page() {
                                                             </Button>
                                                         </SettingsFormCell>
                                                         {showAdvancedSettings && (
-                                                            <SettingsFormCell span="quarter">
+                                                            <SettingsFormCell span="half">
                                                                 <FormField
                                                                     control={
                                                                         form.control