Merge pull request #3415 from quadratichq/qa

QA Sept 5th

Author: AyushAgrawal-A2

.env.docker

@@ -17,24 +17,11 @@ PUBSUB_PASSWORD=""
 PUBSUB_ACTIVE_CHANNELS=active_channels
 PUBSUB_PROCESSED_TRANSACTIONS_CHANNEL=processed_transactions
 
-# auth: ory or auth0
+# auth: ory or workos
 AUTH_TYPE=ory
-# JWKS_URI=AUTH0_JWKS_URI
-JWKS_URI=http://host.docker.internal:3000/.well-known/jwks.json
 M2M_AUTH_TOKEN=M2M_AUTH_TOKEN
 ENCRYPTION_KEY=eb4758047f74bdb2603cce75c4370327ca2c3662c4786867659126da8e64dfcc
 
-# auth=auth0
-AUTH0_ISSUER=AUTH0_ISSUER
-AUTH0_AUDIENCE=AUTH0_AUDIENCE
-#client
-VITE_AUTH0_DOMAIN=VITE_AUTH0_DOMAIN
-VITE_AUTH0_CLIENT_ID=VITE_AUTH0_CLIENT_ID
-#api
-AUTH0_DOMAIN=AUTH0_DOMAIN
-AUTH0_CLIENT_ID=AUTH0_CLIENT_ID
-AUTH0_CLIENT_SECRET=AUTH0_CLIENT_SECRET
-
 # auth=ory
 ORY_IN_DOCKER_COMPOSE=true
 ORY_DSN=postgresql://postgres:postgres@host.docker.internal:5432/kratos?sslmode=disable
@@ -46,6 +33,12 @@ KRATOS_NODE_PORT=4455
 KRATOS_COOKIE_SECRET=changeme
 KRATOS_CSRF_COOKIE_NAME=__HOST-localhost-x-csrf-token
 KRATOS_CSRF_COOKIE_SECRET=changeme
+JWKS_URI=http://host.docker.internal:3000/.well-known/jwks.json
+
+# auth=workos
+WORKOS_CLIENT_ID=client_xxxxxxxxxxxxxxxxxxxxxxxxx
+WORKOS_API_KEY=WORKOS_API_KEY
+# JWKS_URI=https://api.workos.com/sso/jwks/client_xxxxxxxxxxxxxxxxxxxxxxxxx
 
 # caddy
 CADDY_IN_DOCKER_COMPOSE=false
@@ -58,6 +51,7 @@ QUADRATIC_API_IN_DOCKER_COMPOSE=true
 QUADRATIC_API_URL_EXTERNAL=http://localhost:8000
 QUADRATIC_API_URL_INTERNAL=http://host.docker.internal:8000
 QUADRATIC_API_CORS=*
+QUADRATIC_API_AUTH_CORS=http://localhost:3000
 
 # multiplayer
 QUADRATIC_MULTIPLAYER_IN_DOCKER_COMPOSE=true
@@ -130,9 +124,6 @@ BASETEN_API_KEY=BASETEN_API_KEY
 FIREWORKS_API_KEY=FIREWORKS_API_KEY
 OPEN_ROUTER_API_KEY=OPEN_ROUTER_API_KEY
 
-# use image from ECR or build locally
-ECR_OR_BUILD=build
-
 # build client in dev mode without wasm-opt
 CLIENT_DEV=false
 

.github/workflows/preview-build-deploy-test.yml

@@ -538,7 +538,7 @@ jobs:
     outputs:
       matrix: ${{ steps.generate-matrix.outputs.matrix }}
     env:
-      matrix_runner: 158
+      matrix_runner: 162
       e2e_url: ${{ needs.deploy_images.outputs.WEBSITE_URL }}
       deploy_time: ${{ needs.deploy_images.outputs.DEPLOY_TIME }}
     steps:
@@ -583,7 +583,7 @@ jobs:
       ]
     runs-on: blacksmith-2vcpu-ubuntu-2404
     container:
-      image: mcr.microsoft.com/playwright:v1.53.1-noble
+      image: mcr.microsoft.com/playwright:v1.55.0-noble
       options: --user root
     if: github.head_ref != 'qa' || github.base_ref != 'main'
     timeout-minutes: 15

.vscode/settings.json

@@ -5,6 +5,7 @@
     "acked",
     "actix",
     "allocvec",
+    "authkit",
     "autoclean",
     "autoincrement",
     "AVERAGEIF",
@@ -65,6 +66,7 @@
     "fholzer",
     "filechooser",
     "finitize",
+    "flate",
     "fontfaceobserver",
     "fontkit",
     "fontobject",
@@ -102,9 +104,11 @@
     "keepalive",
     "keyrings",
     "Kimi",
+    "Kircos",
     "kratos",
     "linkify",
     "localstack",
+    "mailchimp",
     "mailslurper",
     "MDSL",
     "micropip",
@@ -137,6 +141,7 @@
     "pointerupoutside",
     "Pooler",
     "prec",
+    "presigner",
     "profraw",
     "proptest",
     "prost",
@@ -159,6 +164,7 @@
     "rfind",
     "ROUNDDOWN",
     "rstar",
+    "russh",
     "RUSTC",
     "RUSTFLAGS",
     "rustup",
@@ -179,6 +185,7 @@
     "Spannable",
     "sqlcmd",
     "sqlservr",
+    "sqlx",
     "sslmode",
     "stdev",
     "Strftime",
@@ -196,6 +203,7 @@
     "Unspan",
     "Unspanned",
     "unspill",
+    "urlencoding",
     "useblacksmith",
     "usermod",
     "vals",
@@ -206,6 +214,7 @@
     "VLOOKUP",
     "websockets",
     "Westborough",
+    "workos",
     "XLOOKUP",
     "xlsxwriter",
     "xyxy",

Cargo.toml

@@ -15,7 +15,7 @@ edition = "2024"
 description = "Infinite data grid with Python, JavaScript, and SQL built-in"
 repository = "https://github.com/quadratichq/quadratic"
 license-file = "LICENSE"
-version = "0.17.2"
+version = "0.18.0"
 
 
 [profile.release]

VERSION

@@ -1 +1 @@
-0.17.2
+0.18.0

dev/cli.js

@@ -29,7 +29,6 @@ export class CLI {
             .option("-E, --hideRustClient", "Hide RustClient")
             .option("-S, --hideShared", "Hide Shared output")
             .option("-L, --servicesLocal", "Set Redis & Postgres as running locally")
-            .option("-D, --dockerDev", "Run dev in docker")
             .option("-d, --dark", "Use dark theme")
             .showHelpAfterError();
         program.parse();

dev/cli.ts

@@ -24,7 +24,6 @@ export class CLI {
     hidePython: boolean;
     hideShared: boolean;
     servicesLocal: boolean;
-    dockerDev: boolean;
     dark: boolean;
   };
 
@@ -67,7 +66,6 @@ export class CLI {
       .option("-E, --hideRustClient", "Hide RustClient")
       .option("-S, --hideShared", "Hide Shared output")
       .option("-L, --servicesLocal", "Set Redis & Postgres as running locally")
-      .option("-D, --dockerDev", "Run dev in docker")
       .option("-d, --dark", "Use dark theme")
       .showHelpAfterError();
 

dev/control.js

@@ -526,8 +526,8 @@ export class Control {
     runRust() {
         if (this.quitting)
             return;
-        this.ui.print("rust", "upgrading...");
-        this.rust = spawn("rustup", ["upgrade"]);
+        this.ui.print("rust", "installing...");
+        this.rust = spawn("rustup", ["show"]);
         this.rust.on("close", (code) => {
             if (code === 0) {
                 this.ui.print("rust", "completed");
@@ -545,10 +545,6 @@ export class Control {
         return new Promise((resolve) => {
             if (this.quitting)
                 resolve(false);
-            const dockerDev = this.cli.options.dockerDev;
-            if (dockerDev) {
-                resolve(true);
-            }
             const servicesLocal = this.cli.options.servicesLocal;
             const redis = servicesLocal
                 ? spawn("redis-cli", ["ping"])
@@ -567,10 +563,6 @@ export class Control {
         return new Promise((resolve) => {
             if (this.quitting)
                 resolve(false);
-            const dockerDev = this.cli.options.dockerDev;
-            if (dockerDev) {
-                resolve(true);
-            }
             const servicesLocal = this.cli.options.servicesLocal;
             const postgres = servicesLocal
                 ? spawn("pg_isready")

dev/control.ts

@@ -626,8 +626,8 @@ export class Control {
 
   runRust() {
     if (this.quitting) return;
-    this.ui.print("rust", "upgrading...");
-    this.rust = spawn("rustup", ["upgrade"]);
+    this.ui.print("rust", "installing...");
+    this.rust = spawn("rustup", ["show"]);
     this.rust.on("close", (code) => {
       if (code === 0) {
         this.ui.print("rust", "completed");
@@ -644,10 +644,6 @@ export class Control {
   isRedisRunning(): Promise<boolean | "not found"> {
     return new Promise((resolve) => {
       if (this.quitting) resolve(false);
-      const dockerDev = this.cli.options.dockerDev;
-      if (dockerDev) {
-        resolve(true);
-      }
       const servicesLocal = this.cli.options.servicesLocal;
       const redis = servicesLocal
         ? spawn("redis-cli", ["ping"])
@@ -666,10 +662,6 @@ export class Control {
   isPostgresRunning(): Promise<boolean | "not found"> {
     return new Promise((resolve) => {
       if (this.quitting) resolve(false);
-      const dockerDev = this.cli.options.dockerDev;
-      if (dockerDev) {
-        resolve(true);
-      }
       const servicesLocal = this.cli.options.servicesLocal;
       const postgres = servicesLocal
         ? spawn("pg_isready")

dev/input.js

@@ -136,10 +136,6 @@ export class Input {
                 this.cli.options.servicesLocal = !this.cli.options.servicesLocal;
                 this.control.checkServices();
                 break;
-            case "D":
-                this.cli.options.dockerDev = !this.cli.options.dockerDev;
-                this.control.checkServices();
-                break;
         }
     };
 }