Merge remote-tracking branch 'origin/development'

.circleci/config.yml

@@ -70,13 +70,14 @@ 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 /DCODE_SIGNING_CERT_FINGERPRINT=%SM_CODE_SIGNING_CERT_SHA1_HASH%
+                command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss /Sbyparam=$p /DSIGN_INSTALLER
                 shell: cmd.exe
       - persist_to_workspace:
           root: ./
@@ -142,8 +143,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
@@ -175,7 +176,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
@@ -251,7 +252,7 @@ workflows:
           filters:
             tags:
               only: /.*/
-          context: digicert-keylocker
+          context: digicert-signing-connectors-test
 
       - build-connector-mac:
           slug: sketchup

speckle_connector/src/preferences/preferences.rb

@@ -12,9 +12,9 @@ module SpeckleConnector
     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\":true}');"
+    DEFAULT_CONFIG = "('configSketchup', '{\"dark_theme\":false, \"diffing\":false, \"register_speckle_entity\":false, \"fe2\":false}');"
     # rubocop:enable Layout/LineLength
-    DEFAULT_PREFERENCES = '{"dark_theme":false, "diffing":false, "register_speckle_entity": false, "fe2": true}'
+    DEFAULT_PREFERENCES = '{"dark_theme":false, "diffing":false, "register_speckle_entity": false, "fe2": false}'
 
     # @param sketchup_model [Sketchup::Model] active model.
     def self.read_preferences(sketchup_model)

ui/src/components/dialogs/CreateStreamDialog.vue

@@ -206,13 +206,6 @@ 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!){

ui/src/utils/streamWrapper.js

@@ -17,13 +17,9 @@ export class StreamWrapper {
         }
     }
 
-    matchUrl(streamUrl){
-        const fe2UrlRegex = /\/projects\/(?<projectId>[\w\d]+)(?:\/models\/(?<model>[\w\d]+(?:@[\w\d]+)?)(?:,(?<additionalModels>[\w\d]+(?:@[\w\d]+)?))*)?/
-        return fe2UrlRegex.exec(streamUrl);
-    }
-
     checkIsFE2(streamUrl){
-        const match = this.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 match !== null;
     }