Merge branch 'development'

Author: alexjpwalker

.circleci/config.yml

@@ -334,12 +334,6 @@ jobs:
       - install-rust
       - deploy-mac-release:
           target-arch: arm64
-      - run: |
-          mkdir -p ~/dist && cp bazel-bin/typedb-studio-mac-arm64.dmg ~/dist
-      - persist_to_workspace:
-          root: ~/dist
-          paths:
-            - ./*
 
   deploy-mac-x86_64-release:
     executor: mac-arm64
@@ -354,12 +348,6 @@ jobs:
       - install-rust
       - deploy-mac-release:
           target-arch: x86_64
-      - run: |
-          mkdir -p ~/dist && cp bazel-bin/typedb-studio-mac-x86_64.dmg ~/dist
-      - persist_to_workspace:
-          root: ~/dist
-          paths:
-            - ./*
 
   deploy-linux-arm64-release:
     executor: linux-arm64

.gitignore

@@ -13,6 +13,7 @@ yarn-error.log
 
 # IDEs and editors
 .idea/
+.ijwb
 .project
 .classpath
 .c9/

BUILD

@@ -67,7 +67,7 @@ exports_files(["VERSION"])
 
 genrule(
     name = "native-artifact-mac-x86_64-dmg",
-    outs = ["typedb-studio_3.4.0-rc0_amd64.dmg"],  # replace with your actual output, e.g., .exe, .AppImage
+    outs = ["typedb-studio_3.4.0-rc1_amd64.dmg"],  # replace with your actual output, e.g., .exe, .AppImage
     cmd = """
         cp src-tauri/target/release/bundle/dmg/*.dmg "$(OUTS)"
     """,
@@ -77,7 +77,7 @@ genrule(
 
 genrule(
     name = "native-artifact-mac-arm64-dmg",
-    outs = ["typedb-studio_3.4.0-rc0_aarch64.dmg"],  # replace with your actual output, e.g., .exe, .AppImage
+    outs = ["typedb-studio_3.4.0-rc1_aarch64.dmg"],  # replace with your actual output, e.g., .exe, .AppImage
     cmd = """
         cp src-tauri/target/release/bundle/dmg/*.dmg "$(OUTS)"
     """,
@@ -87,7 +87,7 @@ genrule(
 
 genrule(
     name = "native-artifact-linux-arm64-deb",
-    outs = ["typedb-studio_3.4.0-rc0_arm64.deb"],  # replace with your actual output, e.g., .exe, .AppImage
+    outs = ["typedb-studio_3.4.0-rc1_arm64.deb"],  # replace with your actual output, e.g., .exe, .AppImage
     cmd = """
         cp src-tauri/target/release/bundle/deb/*.deb "$(OUTS)"
     """,
@@ -97,7 +97,7 @@ genrule(
 
 genrule(
     name = "native-artifact-linux-x86_64-deb",
-    outs = ["typedb-studio_3.4.0-rc0_amd64.deb"],  # replace with your actual output, e.g., .exe, .AppImage
+    outs = ["typedb-studio_3.4.0-rc1_amd64.deb"],  # replace with your actual output, e.g., .exe, .AppImage
     cmd = """
         cp src-tauri/target/release/bundle/deb/*.deb "$(OUTS)"
     """,
@@ -107,7 +107,7 @@ genrule(
 
 genrule(
     name = "native-artifact-windows-x86_64-msi",
-    outs = ["typedb-studio_3.4.0-rc0_amd64.msi"],  # replace with your actual output, e.g., .exe, .AppImage
+    outs = ["typedb-studio_3.4.0-rc1_amd64.msi"],  # replace with your actual output, e.g., .exe, .AppImage
     cmd = """
         cp src-tauri/target/release/bundle/msi/*.msi "$(OUTS)"
     """,
@@ -245,6 +245,7 @@ deploy_artifact(
     version_file = ":VERSION",
     visibility = ["//visibility:public"],
     target_compatible_with = constraint_mac_x86_64,
+    tags = ["manual", "no-ide"],
 )
 
 deploy_artifact(
@@ -257,6 +258,7 @@ deploy_artifact(
     version_file = ":VERSION",
     visibility = ["//visibility:public"],
     target_compatible_with = constraint_mac_arm64,
+    tags = ["manual", "no-ide"],
 )
 
 deploy_artifact(
@@ -269,6 +271,7 @@ deploy_artifact(
     version_file = ":VERSION",
     visibility = ["//visibility:public"],
     target_compatible_with = constraint_linux_x86_64,
+    tags = ["manual", "no-ide"],
 )
 
 deploy_artifact(
@@ -281,6 +284,7 @@ deploy_artifact(
     version_file = ":VERSION",
     visibility = ["//visibility:public"],
     target_compatible_with = constraint_linux_arm64,
+    tags = ["manual", "no-ide"],
 )
 
 deploy_artifact(
@@ -293,6 +297,7 @@ deploy_artifact(
     version_file = ":VERSION",
     visibility = ["//visibility:public"],
     target_compatible_with = constraint_win_x86_64,
+    tags = ["manual", "no-ide"],
 )
 
 label_flag(

VERSION

@@ -1 +1 @@
-3.4.0-rc0
+3.4.0-rc1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typedb-studio",
-  "version": "3.4.0-rc0",
+  "version": "3.4.0-rc1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "typedb-studio"
-version = "3.4.0-rc0"
+version = "3.4.0-rc1"
 description = "A Tauri App"
 authors = ["you"]
 edition = "2021"

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "typedb-studio",
-  "version": "3.4.0-rc0",
+  "version": "3.4.0-rc1",
   "identifier": "com.typedb.studio",
   "build": {
     "beforeDevCommand": "pnpm start",
@@ -33,7 +33,7 @@
     ],
     "windows": {
       "wix": {
-        "version": "0.0.340"
+        "version": "0.0.341"
       }
     },
     "macOS": {

src-tauri/tauri.conf.json

@@ -7,5 +7,5 @@
 export const sidebarStates = ["expanded", "collapsed"] as const;
 export type SidebarState = typeof sidebarStates[number];
 
-export const tools = ["query", "explore"] as const;
+export const tools = ["query", "explore", "schema"] as const;
 export type Tool = typeof tools[number];

src/concept/view-state.ts

@@ -51,7 +51,6 @@ export class GraphVisualiser {
         if (res.ok.answerType == "conceptRows" && res.ok.query != null) {
             let converter = new StudioConverter(this.graph, res.ok.query, false, this.structureParameters, this.styleParameters);
             let logicalGraph = constructGraphFromRowsResult(res.ok); // In memory, not visualised
-            this.graph.clear();
             convertLogicalGraphWith(logicalGraph, converter);
         }
     }