Merge remote-tracking branch 'origin/development'

specklesystems · Mar 19, 2024 · 20528f7 · 20528f7
2 parents ad9af9b + 7de08d9
commit 20528f7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,14 +70,13 @@ jobs:
                   cd C:\
                   echo $env:SM_CLIENT_CERT_FILE_B64 > certificate.txt
                   certutil -decode certificate.txt certificate.p12
-                  echo $env:SM_OV_PEM_CERT > SpeckleOVCertificate-2024.pem
             - run:
                 name: "Sync Certs"
                 command: |
                   & $env:SSM\smksp_cert_sync.exe
             - run:
                 name: "Build Installer"
-                command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss /Sbyparam=$p /DSIGN_INSTALLER
+                command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss /Sbyparam=$p /DSIGN_INSTALLER /DCODE_SIGNING_CERT_FINGERPRINT=%SM_CODE_SIGNING_CERT_SHA1_HASH%
                 shell: cmd.exe
       - persist_to_workspace:
           root: ./
@@ -143,8 +142,8 @@ jobs:
       - run:
           name: Copy files to installer
           command: |
-                  mkdir -p speckle-sharp-ci-tools/Mac/<< parameters.installername >>/.installationFiles/
-                  cp << parameters.slug >>-mac.zip speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles
+            mkdir -p speckle-sharp-ci-tools/Mac/<< parameters.installername >>/.installationFiles/
+            cp << parameters.slug >>-mac.zip speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles
       # Create installer
       - run:
           name: Exit if External PR
@@ -176,7 +175,7 @@ jobs:
                 root: ./
                 paths:
                   - speckle-sharp-ci-tools/Installers
-  
+
   get-ci-tools: # Clones our ci tools and persists them to the workspace
     docker:
       - image: cimg/base:2021.01
@@ -252,7 +251,7 @@ workflows:
           filters:
             tags:
               only: /.*/
-          context: digicert-signing-connectors-test
+          context: digicert-keylocker
 
       - build-connector-mac:
           slug: sketchup

diff --git a/speckle_connector/src/preferences/preferences.rb b/speckle_connector/src/preferences/preferences.rb
@@ -12,9 +12,9 @@ module Preferences
     include Immutable::ImmutableUtils
     DICT_HANDLER = SketchupModel::Dictionary::SpeckleModelDictionaryHandler
     # rubocop:disable Layout/LineLength
-    DEFAULT_CONFIG = "('configSketchup', '{\"dark_theme\":false, \"diffing\":false, \"register_speckle_entity\":false, \"fe2\":false}');"
+    DEFAULT_CONFIG = "('configSketchup', '{\"dark_theme\":false, \"diffing\":false, \"register_speckle_entity\":false, \"fe2\":true}');"
     # rubocop:enable Layout/LineLength
-    DEFAULT_PREFERENCES = '{"dark_theme":false, "diffing":false, "register_speckle_entity": false, "fe2": false}'
+    DEFAULT_PREFERENCES = '{"dark_theme":false, "diffing":false, "register_speckle_entity": false, "fe2": true}'
 
     # @param sketchup_model [Sketchup::Model] active model.
     def self.read_preferences(sketchup_model)

diff --git a/ui/src/components/dialogs/CreateStreamDialog.vue b/ui/src/components/dialogs/CreateStreamDialog.vue
@@ -206,6 +206,13 @@ export default {
     async getStream(){
       try {
         const streamWrapper = new StreamWrapper(this.createStreamByIdText, this.accountId, this.serverUrl)
+        const match = streamWrapper.matchUrl(this.createStreamByIdText)
+        if (match.groups.additionalModels !== undefined){
+          this.$eventHub.$emit('error', {
+            text: 'Multi-model URLs are not supported!\nTry to select just one single model in the web app and paste that in.',
+          })
+          return
+        }
         let res = await this.$apollo.query({
           query: gql`
             query Stream($id: String!){

diff --git a/ui/src/utils/streamWrapper.js b/ui/src/utils/streamWrapper.js
@@ -17,9 +17,13 @@ export class StreamWrapper {
         }
     }
 
-    checkIsFE2(streamUrl){
+    matchUrl(streamUrl){
         const fe2UrlRegex = /\/projects\/(?<projectId>[\w\d]+)(?:\/models\/(?<model>[\w\d]+(?:@[\w\d]+)?)(?:,(?<additionalModels>[\w\d]+(?:@[\w\d]+)?))*)?/
-        const match = fe2UrlRegex.exec(streamUrl);
+        return fe2UrlRegex.exec(streamUrl);
+    }
+
+    checkIsFE2(streamUrl){
+        const match = this.matchUrl(streamUrl)
         return match !== null;
     }