Merge pull request #78 from specklesystems/JR-Morgan-patch-1

Update config.yml

.circleci/config.yml

@@ -116,7 +116,6 @@ 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: # Syncs certificates from Digicert into local user store
                 name: Sync Certs
                 command: |
@@ -126,7 +125,7 @@ jobs:
                 shell: cmd.exe
                 command:
                   | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
-                  speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss /Sbyparam=$p /DSIGN_INSTALLER
+                  speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss /Sbyparam=$p /DSIGN_INSTALLER /DCODE_SIGNING_CERT_FINGERPRINT=%SM_CODE_SIGNING_CERT_SHA1_HASH%
       - when:
           condition: << parameters.installer >>
           steps:
@@ -188,7 +187,7 @@ workflows: #happens with every PR to main
           requires:
             - get-ui
             - get-ci-tools
-          context: digicert-signing-connectors-test
+          context: digicert-keylocker
 
   deploy: # build installers and deploy
     jobs:
@@ -212,7 +211,7 @@ workflows: #happens with every PR to main
             - get-ui
             - get-ci-tools
           filters: *deploy_filters
-          context: digicert-signing-connectors-test
+          context: digicert-keylocker
       - publish-github-release:
           requires:
             - build-deploy-connector-win
@@ -225,4 +224,4 @@ workflows: #happens with every PR to main
           requires:
             - build-deploy-connector-win
           filters: *deploy_filters
-          context: do-spaces-speckle-releases
+          context: do-spaces-speckle-releases

speckle_toolbox/esri/toolboxes/speckle/speckle/speckle_arcgis.py

@@ -510,13 +510,13 @@ class SpeckleGIS:
             stream = validateStream(stream, self.dockwidget)
             print(stream)
             if not isinstance(stream, Stream):
-                logToUser(f"Speckle Project invalid", level=2, plugin=self.dockwidget)
+                logToUser(f"Stream invalid", level=2, plugin=self.dockwidget)
                 return
 
             branch = validateBranch(stream, branchName, False, self.dockwidget)
             branchId = branch.id
             if branch == None:
-                logToUser(f"Speckle Model invalid", level=2, plugin=self.dockwidget)
+                logToUser(f"Branch invalid", level=2, plugin=self.dockwidget)
                 return
 
             transport = validateTransport(client, streamId)

speckle_toolbox/esri/toolboxes/speckle/speckle/utils/validation.py

@@ -86,7 +86,7 @@ def validateStream(stream: Stream, dockwidget) -> Union[Stream, None]:
             return None
 
         if stream.branches is None:
-            logToUser("Speckle Project has no Models", level=1, plugin=dockwidget)
+            logToUser("Stream has no branches", level=1, plugin=dockwidget)
             return None
         return stream
     except Exception as e:

speckle_toolbox/esri/toolboxes/speckle/ui_widgets/main_window.py

@@ -106,7 +106,7 @@ class SpeckleGISDialog(SpeckleGISDialog_UI):
                 self.streamList.addItems(
                     [
                         (
-                            f"Speckle Project not accessible - {stream[0].stream_id}"
+                            f"Stream not accessible - {stream[0].stream_id}"
                             if stream[1] is None
                             or isinstance(stream[1], SpeckleException)
                             else f"{stream[1].name}, {stream[1].id} | {stream[0].stream_url.split('/streams')[0].split('/projects')[0]}"
@@ -115,7 +115,7 @@ class SpeckleGISDialog(SpeckleGISDialog_UI):
                 )
             if len(plugin.current_streams) == 0:
                 self.streamList.addItems([""])
-            self.streamList.addItems(["Create New Project"])
+            self.streamList.addItems(["Create New Stream"])
             set_project_streams(plugin)
             index = self.streamList.currentIndex()
             if index == -1: