Add dummy dialog for test worker

.circleci/config.yml

@@ -1,17 +1,289 @@
 version: 2.1
 
-# Define the jobs we want to run for this project
-jobs:
-  build:
-    docker:
-      - image: cimg/base:2023.03
-    steps:
-      - run: echo "so long and thanks for all the fish"
+orbs:
+  # Using windows for builds
+  win: circleci/windows@2.4.0
+  # Upload artifacts to s3
+  aws-s3: circleci/aws-s3@2.0.0
+
+jobs:
+  build-ui:
+    docker:
+      - image: "circleci/node:16"
+    steps:
+      - checkout
+      - run:
+          command: "npm install"
+          working_directory: "ui"
+      - run:
+          command: "npm run build"
+          working_directory: "ui"
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle_connector/vue_ui
+
+  build-connector: # Reusable job for basic connectors
+    executor:
+      name: win/default # comes with python 3.7.3
+      shell: powershell.exe
+    parameters:
+      slug:
+        type: string
+        default: ""
+    environment:
+      SSM: 'C:\Program Files\DigiCert\DigiCert One Signing Manager Tools'
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Set Environment Variable
+          shell: powershell.exe
+          command: |
+            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "2.0.999" } else { $env:CIRCLE_TAG }
+            $semver = if($tag.Contains('/')) {$tag.Split("/")[0] } else { $tag }
+            $ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
+            $version = "$($ver).$($env:WORKFLOW_NUM)"
+            python patch_version.py $semver
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - unless: # Build installers unsigned on non-tagged builds
+          condition: << pipeline.git.tag >>
+          steps:
+            - run:
+                name: Build Installer
+                command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss /Sbyparam=$p
+                shell: cmd.exe # does not work in powershell
+      - when: # Setup certificates and build installers signed for tagged builds
+          condition: << pipeline.git.tag >>
+          steps:
+            - run:
+                name: "Digicert Signing Manager Setup"
+                command: |
+                  cd C:\
+                  curl.exe -X GET https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:$env:SM_API_KEY" -o smtools-windows-x64.msi
+                  msiexec.exe /i smtools-windows-x64.msi /quiet /qn | Wait-Process
+            - run:
+                name: "Create Auth & OV Signing Cert"
+                command: |
+                  cd C:\
+                  echo $env:SM_CLIENT_CERT_FILE_B64 > certificate.txt
+                  certutil -decode certificate.txt certificate.p12
+            - 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%
+                shell: cmd.exe
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle-sharp-ci-tools/Installers
+
+  build-connector-mac:
+    macos:
+      xcode: 12.5.1
+    parameters:
+      projname:
+        type: string
+        default: ""
+      slug:
+        type: string
+        default: ""
+      installer:
+        type: boolean
+        default: false
+      converter-files:
+        type: string
+        default: ""
+      installername:
+        type: string
+        default: ""
+      build-config:
+        type: string
+        default: Release
+      bundlename:
+        type: string
+        default: ""
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Install dotnet
+          command: |
+            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel Current
+
+            $HOME/.dotnet/dotnet --version
+            $HOME/.dotnet/dotnet --list-runtimes
+            $HOME/.dotnet/dotnet --list-sdks
+      - run:
+          name: Create installer target dir
+          command: |
+            mkdir -p speckle-sharp-ci-tools/Installers/<< parameters.slug >>
+      - run:
+          name: Set Environment Variable
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            VER=$(echo "$SEMVER" | sed -e 's/-.*//')
+            VERSION=$(echo $VER.$WORKFLOW_NUM)
+            python3 patch_version.py $SEMVER
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - run:
+          name: Zip Connector files
+          command: |
+            zip -r << parameters.slug >>-mac.zip "./speckle_connector" "./speckle_connector.rb"
+            # Copy installer files
+      - 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
+      # Create installer
+      - run:
+          name: Exit if External PR
+          command: if [ "$CIRCLE_PR_REPONAME" ]; then circleci-agent step halt; fi
+      - run:
+          name: Build Mac installer
+          command: ~/.dotnet/dotnet publish speckle-sharp-ci-tools/Mac/<<parameters.installername>>/<<parameters.installername>>.sln -r osx-x64 -c Release
+      - run:
+          name: Zip installer
+          command: |
+            cd speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/
+            zip -r <<parameters.slug>>.zip ./
+      - store_artifacts:
+          path: speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip
+      - run:
+          name: Copy to installer location
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            VER=$(echo "$SEMVER" | sed -e 's/-.*//')
+            VERSION=$(echo $VER.$WORKFLOW_NUM)
+            cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<<parameters.slug>>-$SEMVER.zip
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - when:
+          condition: << pipeline.git.tag >>
+          steps:
+            - persist_to_workspace:
+                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
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "03:2e:ee:4f:14:67:2b:88:32:e8:cc:f0:cb:df:92:29"
+      - run:
+          name: I know Github as a host
+          command: |
+            mkdir ~/.ssh
+            ssh-keyscan github.com >> ~/.ssh/known_hosts
+      - run:
+          name: Clone
+          command: git clone git@github.com:specklesystems/speckle-sharp-ci-tools.git speckle-sharp-ci-tools
+      - run:
+          name: Checkout branch
+          command: |
+            cd speckle-sharp-ci-tools
+            if [ -z "$CIRCLE_TAG" ]
+            then
+                  git checkout ${CIRCLE_BRANCH} || git checkout main
+            else
+                  git checkout ${CIRCLE_TAG} || git checkout main
+            fi
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle-sharp-ci-tools
+
+  deploy-manager2:
+    docker:
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
+    parameters:
+      slug:
+        type: string
+      os:
+        type: string
+      extension:
+        type: string
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Install Manager Feed CLI
+          command: dotnet tool install --global Speckle.Manager.Feed
+      - run:
+          name: Upload new version
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            /root/.dotnet/tools/Speckle.Manager.Feed deploy -s << parameters.slug >> -v ${SEMVER} -u https://releases.speckle.dev/installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> -o << parameters.os >> -f speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >>
 
-# Orchestrate our job run sequence
 workflows:
-  build_and_test:
-    when:
-      false
+  build-and-deploy:
     jobs:
-      - build
+      - get-ci-tools:
+          filters:
+            tags:
+              only: /.*/
+
+      - build-ui:
+          filters:
+            tags:
+              only: /.*/
+
+      - build-connector:
+          slug: sketchup
+          requires:
+            - get-ci-tools
+            - build-ui
+          filters:
+            tags:
+              only: /.*/
+          context: digicert-keylocker
+
+      - build-connector-mac:
+          slug: sketchup
+          requires:
+            - get-ci-tools
+            - build-ui
+          filters:
+            tags:
+              only: /.*/
+          installername: SpeckleSketchUpInstall
+
+      - deploy-manager2:
+          context: do-spaces-speckle-releases
+          slug: sketchup
+          os: Win
+          extension: exe
+          requires:
+            - build-connector
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/ # For testing only! /ci\/.*/
+      - deploy-manager2:
+          context: do-spaces-speckle-releases
+          slug: sketchup
+          os: OSX
+          extension: zip
+          requires:
+            - build-connector-mac
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/ # For testing only! /ci\/.*/

.github/workflows/build.yml

@@ -1,64 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-
-name: Build
-
-on:
-  pull_request:
-  workflow_call:
-    outputs:
-      semver:
-        description: "The full SemVer 2.0 version of this build, e.g. '3.0.0-alpha.1234' (note: no 'v'-prefix)"
-        value: ${{ jobs.build.outputs.semver }}
-      file_version:
-        description: "The file info version, e.g. '3.0.0.1234'"
-        value: ${{ jobs.build.outputs.file_version }}
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    outputs:
-      semver: ${{ steps.set-version.outputs.semver }}
-      file_version: ${{ steps.set-version.outputs.file-version }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10"
-
-      - id: set-version
-        name: Set version to output
-        shell: bash
-        run: |
-          TAG=${{ github.ref_name }}
-          if [[ "${{ github.ref }}" != refs/tags/* ]]; then
-            TAG="v3.0.99.${{ github.run_number }}"
-          fi
-          SEMVER="${TAG#v}"
-          FILE_VERSION=$(echo "$TAG" | sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
-          FILE_VERSION="$FILE_VERSION.${{ github.run_number }}"
-
-          echo "semver=$SEMVER" >> "$GITHUB_OUTPUT"
-          echo "file-version=$FILE_VERSION" >> "$GITHUB_OUTPUT"
-
-          echo $SEMVER
-          echo $FILE_VERSION
-
-      - name: Set connector version
-        run: |
-          python patch_version.py ${{steps.set-version.outputs.semver}}
-
-      - uses: montudor/action-zip@v1
-        with:
-          args: zip -q -r sketchup.zip vendor speckle_connector_3/ speckle_connector_3.rb
-          
-      - name: ⬆️ Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: output-${{steps.set-version.outputs.semver}}
-          path: sketchup.zip
-          retention-days: 1
-          if-no-files-found: error
-          compression-level: 0 # no compression

.github/workflows/close-issue.yml

@@ -0,0 +1,78 @@
+name: Update issue Status
+
+on:
+  issues:
+    types: [closed]
+
+jobs:
+  update_issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
+          ORGANIZATION: specklesystems
+          PROJECT_NUMBER: 9
+        run: |
+          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
+            query($org: String!, $number: Int!) {
+              organization(login: $org){
+                projectNext(number: $number) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          
+          echo "$PROJECT_ID"
+          echo "$STATUS_FIELD_ID"
+          
+          echo 'DONE_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .settings | fromjson | .options[] | select(.name== "Done") | .id' project_data.json) >> $GITHUB_ENV
+          echo "$DONE_ID"
+
+      - name: Add Issue to project #it's already in the project, but we do this to get its node id!
+        env:
+          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
+            mutation($project:ID!, $id:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          
+          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
+          
+      - name: Update Status
+        env:
+          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
+            mutation($project:ID!, $status:ID!, $id:ID!, $value:String!) {
+              set_status: updateProjectNextItemField(
+                input: {
+                  projectId: $project
+                  itemId: $id
+                  fieldId: $status
+                  value: $value
+                }
+              ) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f status=$STATUS_FIELD_ID -f id=$ITEM_ID -f value=${{ env.DONE_ID }}
+          

.github/workflows/deploy.yml

@@ -1,42 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-
-name: Build and deploy
-
-on:
-  push:
-    branches: ["main", "installer-test/**"]
-    tags: ["v3.*.*"] # Manual delivery on every 3.x tag
-
-jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-
-  deploy-installers:
-    runs-on: ubuntu-latest
-    needs: build
-    env:
-      IS_PUBLIC_RELEASE: ${{ github.ref_type == 'tag' }}
-    steps:
-      - name: 🔫 Trigger Build Installer(s)
-        uses: the-actions-org/workflow-dispatch@v4.0.0
-        with:
-          workflow: Build Installers
-          repo: specklesystems/connector-installers
-          token: ${{ secrets.CONNECTORS_GH_TOKEN }}
-          inputs: '{
-            "run_id": "${{ github.run_id }}",
-            "semver": "${{ needs.build.outputs.semver }}",
-            "file_version": "${{ needs.build.outputs.file_version }}",
-            "repo": "${{ github.repository }}",
-            "is_public_release": ${{ env.IS_PUBLIC_RELEASE }}
-            }'
-          ref: main
-          wait-for-completion: true
-          wait-for-completion-interval: 10s
-          wait-for-completion-timeout: 10m
-          display-workflow-run-url: true
-          display-workflow-run-url-interval: 10s
-      - uses: geekyeggo/delete-artifact@v5
-        with:
-          name: output-*

.github/workflows/open-issue.yml

@@ -0,0 +1,50 @@
+name: Move new issues into Project
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  track_issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
+          ORGANIZATION: specklesystems
+          PROJECT_NUMBER: 9
+        run: |
+          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
+            query($org: String!, $number: Int!) {
+              organization(login: $org){
+                projectNext(number: $number) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+     
+      - name: Add Issue to project
+        env:
+          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
+            mutation($project:ID!, $id:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          
+          echo 'ITEM_ID='$item_id >> $GITHUB_ENV

.github/workflows/ruby.yml

@@ -0,0 +1,38 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+        # change this to (see https://github.com/ruby/setup-ruby#versioning):
+        # uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

.gitignore

@@ -10,8 +10,8 @@
 settings.json
 
 # vue app build dist folder
-speckle_connector_3/vue_ui
-speckle_connector_3/html
+speckle_connector/vue_ui
+speckle_connector/html
 
 # speckle-sharp-ci-tools
 /speckle-sharp-ci-tools

.rubocop.yml

@@ -18,7 +18,7 @@ AllCops:
     - '_tools/su_attributes/**/*.rb'
     - '_sqlite3/**/*.rb'
     - 'ui/**/*'
-    - 'speckle_connector_3/src/ext/**/*.rb'
+    - 'speckle_connector/src/ext/**/*.rb'
     - 'vendor/bundle/**/*'
     - 'tests/**/*.rb'
   SketchUp:

.solargraph.yml

@@ -1,6 +1,6 @@
 require_paths:
 - "C:/Program Files/SketchUp/SketchUp 2021/Tools"
-- speckle_connector_3
+- speckle_connector
 
 require:
 - sketchup-api-stubs

Gemfile

@@ -24,8 +24,6 @@ group :development do
   gem 'rubycritic', '~> 4.3', '>= 4.3.3', require: false
   # Auto completions for SketchUp API.
   gem 'sketchup-api-stubs'
-  # Runtime dependency of skippy for Ruby 3.2. Have it!
-  gem 'sorted_set', '~> 1.0'
   # Aid with common SketchUp extension tasks.
-  gem 'skippy', '~> 0.5.2.a'
+  gem 'skippy', '~> 0.4.1.a'
 end

Gemfile.lock

@@ -26,7 +26,7 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    git (1.19.1)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     ice_nine (0.11.2)
@@ -51,7 +51,6 @@ GEM
     public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rbtree (0.4.6)
     rchardet (1.8.0)
     reek (6.1.1)
       kwalify (~> 0.7.0)
@@ -90,7 +89,6 @@ GEM
       simplecov (>= 0.17.0)
       tty-which (~> 0.4.0)
       virtus (~> 1.0)
-    set (1.1.0)
     sexp_processor (4.16.1)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -99,15 +97,11 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sketchup-api-stubs (0.7.8)
-    skippy (0.5.2.a)
+    skippy (0.4.3.a)
       git (~> 1.3)
       naturally (~> 2.1)
-      sorted_set (~> 1.0)
-      thor (>= 0.19, < 2.0)
-    sorted_set (1.0.3)
-      rbtree
-      set (~> 1.0)
-    thor (1.3.1)
+      thor (~> 0.19)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tty-which (0.4.2)
     unicode-display_width (1.8.0)
@@ -118,7 +112,6 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
-  x64-mingw-ucrt
   x64-mingw32
   x64-unknown
   x86_64-linux
@@ -134,8 +127,7 @@ DEPENDENCIES
   rubocop-sketchup
   rubycritic (~> 4.3, >= 4.3.3)
   sketchup-api-stubs
-  skippy (~> 0.5.2.a)
-  sorted_set (~> 1.0)
+  skippy (~> 0.4.1.a)
 
 BUNDLED WITH
    2.3.25

GitVersion.yml

@@ -1,11 +0,0 @@
-workflow: GitFlow/v1
-next-version: 3.0.0
-mode: ManualDeployment
-branches:
-  main:
-    label: rc
-  develop:
-    regex: ^dui3/alpha$
-    label: beta
-  unknown:
-    increment: None

README.md

@@ -49,9 +49,9 @@ This repo is split into three parts:
 ### 1. **Speckle Connector extension** 
    
    Includes the `ruby` source files to run extension on SketchUp environment. SketchUp Extensions are composed of
-   a **.rb** file as entry and **folder** that .rb file refers to. In our case entry file is `speckle_connector_3.rb`
+   a **.rb** file as entry and **folder** that .rb file refers to. In our case entry file is `speckle_connector.rb`
    that responsible to register Speckle Connector extension to SketchUp and also it shows address to where extension
-   will start to read extension. Source folder is `speckle_connector_3`.
+   will start to read extension. Source folder is `speckle_connector`.
 
 ### 2. **User Interface**
 
@@ -64,7 +64,7 @@ This repo is split into three parts:
    we use extensions as native part of the source `ruby` code. 
 
    After building `sqlite3.sln` file, compiled `sqlite3.so` (for Windows) and `sqlite3.bundle` (for OSX) dynamic library files are created
-   by solution to place them into source code into `speckle_connector_3/src/ext`. Building this project should be only
+   by solution to place them into source code into `speckle_connector/src/ext`. Building this project should be only
    happen when SketchUp starts to support newer Ruby versions (currently it is `2.7`).
 
 ## Contribution Guide
@@ -115,23 +115,9 @@ You can now open up the repo in VS Code or you can use JetBrains' tools RubyMine
 
 If you will use VS Code, make sure you've installed the Ruby extension for VS Code.
 
-#### RubyMine
-
-To debug: 
-- Add configuration as **'Ruby remote debug'**
-  - Remote host: localhost
-  - Remote port: 7000
-  - Remote root folder: <repo_path>
-  - Local port: 26162
-  - Local root folder: <repo_path>
-- Run below script
-
-      bundle exec skippy sketchup:debug 2024
-- When sketchup opened, click Debug button on RubyMine
-
 ### Loading the Speckle Connector Plugin
 
-1. Find already prepared `speckle_connector_3_loader.rb` file on the `_tools`
+1. Find already prepared `speckle_connector_loader.rb` file on the `_tools`
 folder.
 2. Copy this Ruby file into your SketchUp Plugins directory. You will likely find this at:
     `C:\Users\{YOU}\AppData\Roaming\SketchUp\SketchUp 20XX\SketchUp\Plugins`

Rakefile

@@ -32,12 +32,12 @@ end
 
 # Glob pattern to match source files. Defaults to FileList['.'].
 ruby_critic_paths = FileList[
-  'speckle_connector_3/**/*.rb',
-  'speckle_connector_3.rb',
+  'speckle_connector/**/*.rb',
+  'speckle_connector.rb',
   'tests/**/*.rb'] -
                     FileList[
                     '_tools/**/*.rb',
-                    'speckle_connector_3/src/ext/**/*.rb',
+                    'speckle_connector/src/ext/**/*.rb',
                     ]
 
 # for local

_tools/debugger/skippy_exec_2024.rb

@@ -1,15 +0,0 @@
-# This is for automated pre-debugger configuration.
-# We run skippy first, then activate debugger.
-# The purpose of this file to wait till skp is live
-
-# To establish a configuration
-#  1. Create 'Run External Tool' before lunch step
-#  2. Program -> C:\Ruby32-x64\bin\ruby.exe or whatever
-#  3. Arguments -> C:\Users\KORAL\Documents\Git\Speckle\speckle-sketchup\_tools\debugger\bundle_exec_2024.rb or whatever
-#  4. Working directory -> C:\Users\KORAL\Documents\Git\Speckle\speckle-sketchup or whatever
-
-# Add a delay of 10 seconds, it is arbitrary, do not hesitate to change for what works best for you
-sleep(10)
-
-# Execute the original command
-exec('bundle exec skippy sketchup:debug 2024')

_tools/jf_RubyPanel/rubytoolbar.rb

@@ -24,7 +24,7 @@ module JF_RubyToolbar
   def self.load_toolbar
     @last_dir = "#{$LOAD_PATH[0]}/"
     @last_dir = @last_dir.gsub('/', '\\\\\\\\')
-    @last_dir = File.join($JF_RUBYTOOLBAR, 'speckle_connector_3')
+    @last_dir = File.join($JF_RUBYTOOLBAR, 'speckle_connector')
     curdir = File.dirname __FILE__
 
     # create toolbar

_tools/speckle_connector_loader.rb

@@ -10,7 +10,7 @@
 # Create a link to Plugins folder with this command
 
 # rubocop:disable Layout/LineLength
-# New-Item -ItemType SymbolicLink -Path '~\AppData\Roaming\SketchUp\SketchUp 2022\SketchUp\Plugins\speckle_connector_3_loader.rb' -Target ~\Git\Speckle\speckle-sketchup\_tools\speckle_connector_3_loader.rb
+# New-Item -ItemType SymbolicLink -Path '~\AppData\Roaming\SketchUp\SketchUp 2022\SketchUp\Plugins\speckle_connector_loader.rb' -Target ~\Git\Speckle\speckle-sketchup\_tools\speckle_connector_loader.rb
 # rubocop:enable Layout/LineLength
 
 SKETCHUP_CONSOLE.show # if you want to show Ruby console on startup
@@ -32,7 +32,7 @@ $LOAD_PATH << File.join(speckle_path, '_tools')
 $JF_RUBYTOOLBAR = speckle_path
 # rubocop:enable Style/GlobalVars
 
-files = %w[speckle_connector_3 jf_RubyPanel su_attributes]
+files = %w[speckle_connector jf_RubyPanel su_attributes]
 
 files.each do |ruby_file|
   puts "Loading #{ruby_file}"

patch_version.py

@@ -4,7 +4,7 @@ import sys
 
 def patch_connector(tag):
     """Patches the connector version within the connector file"""
-    rb_file = "speckle_connector_3.rb"
+    rb_file = "speckle_connector.rb"
 
     with open(rb_file, "r") as file:
         lines = file.readlines()
@@ -15,12 +15,6 @@ def patch_connector(tag):
                 print(f"Patched connector version number in {rb_file}")
                 break
 
-        for (index, line) in enumerate(lines):
-            if 'DEV_MODE = ' in line:
-                lines[index] = f'    DEV_MODE = false\n'
-                print(f"Patched dev mode to false in {rb_file}")
-                break
-
         with open(rb_file, "w") as file:
             file.writelines(lines)
 
@@ -51,7 +45,7 @@ def main():
 
     print(f"Patching version: {tag}")
     patch_connector(tag)
-    # patch_installer(tag)
+    patch_installer(tag)
 
 
 if __name__ == "__main__":

speckle_connector.rb

@@ -4,7 +4,7 @@ require 'sketchup'
 require 'extensions'
 
 # Speckle connector module to enable multiplayer mode ON!
-module SpeckleConnector3
+module SpeckleConnector
   # Version - patched by CI
   CONNECTOR_VERSION = '0.0.0'
 
@@ -23,11 +23,11 @@ module SpeckleConnector3
   PATH = File.join(PATH_ROOT, folder_name).freeze
 
   # Run from localhost or from build files
-  DEV_MODE = true
+  DEV_MODE = false
   puts("Loading Speckle Connector v#{CONNECTOR_VERSION} from #{DEV_MODE ? 'dev' : 'build'}")
 
   unless file_loaded?(__FILE__)
-    ex = SketchupExtension.new('Speckle SketchUp v3', File.join(PATH, 'bootstrap'))
+    ex = SketchupExtension.new('Speckle SketchUp', File.join(PATH, 'bootstrap'))
     ex.description = 'Speckle Connector for SketchUp'
     ex.version     = CONNECTOR_VERSION
     ex.copyright   = 'AEC Systems Ltd.'

speckle_connector/bootstrap.rb

@@ -2,7 +2,7 @@
 
 require 'sketchup'
 require 'pathname'
-require 'speckle_connector_3/debug'
+require 'speckle_connector/debug'
 require_relative 'src/log/log'
 require_relative 'src/ui/sketchup_ui'
 require_relative 'src/ui/ui_controller'
@@ -13,7 +13,7 @@ require_relative 'src/states/initial_state'
 require_relative 'src/commands/speckle_menu_commands'
 
 # Speckle Connector on SketchUp to enable Multiplayer mode ON!
-module SpeckleConnector3
+module SpeckleConnector
   SKETCHUP_VERSION = Sketchup.version.to_i
 
   dir = __dir__.dup
@@ -24,9 +24,9 @@ module SpeckleConnector3
     sketchup_ui = Ui::SketchupUi.new
     ui_controller = Ui::UiController.new(sketchup_ui)
     menu_commands = Commands::MenuCommandHandler.new
-    user_state = SpeckleConnector3::States::UserState.new({})
-    initial_state = SpeckleConnector3::States::InitialState.new(user_state)
-    app = SpeckleConnector3::App::SpeckleConnectorApp.new(menu_commands, initial_state, ui_controller)
+    user_state = SpeckleConnector::States::UserState.new({})
+    initial_state = SpeckleConnector::States::InitialState.new(user_state)
+    app = SpeckleConnector::App::SpeckleConnectorApp.new(menu_commands, initial_state, ui_controller)
     # Add menu commands to SketchUp and Speckle application
     Commands::SpeckleMenuCommands.add_initial_commands!(app)
     app

speckle_connector/debug.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Speckle connector module to enable multiplayer mode ON!
-module SpeckleConnector3
+module SpeckleConnector
   # from thomthom
   # https://github.com/thomthom/true-bend/blob/master/src/tt_truebend/debug.rb
 

speckle_connector/src/accounts/accounts.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'JSON'
+require_relative '../ext/sqlite3'
+require_relative '../constants/path_constants'
+
+module SpeckleConnector
+  # Accounts to communicate with models on user's account.
+  module Accounts
+    # Load accounts from user's app data.
+    def self.load_accounts
+      db_path = SPECKLE_ACCOUNTS_DB_PATH
+      unless File.exist?(db_path)
+        raise(
+          IOError,
+          "No Accounts db found. Please read the guide for different options for adding your account:\n
+             https://speckle.guide/user/manager.html#adding-accounts"
+        )
+      end
+
+      db = Sqlite3::Database.new(db_path)
+      rows = db.exec('SELECT * FROM objects')
+      db.close
+      rows.map { |row| JSON.parse(row[1]) }
+    end
+
+    def self.get_account_by_id(id)
+      accounts = load_accounts
+      accounts.select { |acc| acc['id'] == id }[0]
+    end
+
+    # Default account on the user computer.
+    def self.default_account
+      accounts = load_accounts
+      accounts.select { |acc| acc['isDefault'] }[0] || accounts[0]
+    end
+
+    # Try to get local server account for debug/test purposes.
+    def self.try_get_local_server_account
+      accounts = load_accounts
+      accounts.select { |acc| acc['serverInfo']['url'].include?('localhost') }[0] || nil
+    end
+  end
+end

speckle_connector/src/actions/action.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # State changer object.
     class Action

speckle_connector/src/actions/activate_diffing.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative 'deactivate_diffing'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Deactivate diffing for stream.
     class ActivateDiffing < Action

speckle_connector/src/actions/add_material.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Adds material to speckle state and Sketchup.
     class AddMaterial < Action

speckle_connector/src/actions/apply_mappings.rb

@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Apply mappings for selected entities.
     class ApplyMappings < Action
@@ -37,7 +37,7 @@ module SpeckleConnector3
                    end
 
         # Collect entities from entity ids that comes from UI as list
-        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id.to_s) }
+        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id) }
 
         # Switch to definitions if all entities are component instance and UI flag shows that
         if entities_to_map.all? { |e| e.is_a?(Sketchup::ComponentInstance) } && @is_definition

speckle_connector/src/actions/base_actions/add_model.rb

@@ -10,7 +10,7 @@ require_relative '../../filters/send/selection_filter'
 require_relative '../../filters/send_filters'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to add send card.
     class AddModel < Action

speckle_connector/src/actions/base_actions/add_receive_model_card.rb

@@ -3,12 +3,13 @@
 require_relative '../action'
 require_relative '../../cards/send_card'
 require_relative '../../cards/receive_card'
+require_relative '../../cards/receive_result'
 require_relative '../../filters/send/everything_filter'
 require_relative '../../filters/send/selection_filter'
 require_relative '../../filters/send_filters'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to add receive model card.
     class AddReceiveModelCard < Action
@@ -17,29 +18,26 @@ module SpeckleConnector3
       def self.update_state(state, resolve_id, data)
         model_card_id = data['modelCardId']
         account_id = data['accountId']
-        server_url = data['serverUrl']
-        workspace_id = data['workspaceId']
-        workspace_slug = data['workspaceSlug']
         project_id = data['projectId']
         model_id = data['modelId']
         project_name = data['projectName']
         model_name = data['modelName']
         expired = data['expired']
         selected_version_id = data['selectedVersionId']
-        selected_version_source_app = data['selectedVersionSourceApp']
-        selected_version_user_id = data['selectedVersionUserId']
         latest_version_id = data['latestVersionId']
-        latest_version_source_app = data['latestVersionSourceApp']
-        latest_version_user_id = data['latestVersionUserId']
         has_dismissed_update_warning = data['hasDismissedUpdateWarning']
-        baked_object_ids = data['bakedObjectIds'].nil? ? nil : data['bakedObjectIds'].values
+        if data['receiveResult']
+          receive_result = Cards::ReceiveResult.new(
+            data['receiveResult']['bakedObjectIds'].values, # NOTE: IDK why UI sends it as object...
+            data['receiveResult']['display']
+          )
+        end
 
-        receive_card = Cards::ReceiveCard.new(model_card_id, account_id, server_url, workspace_id, workspace_slug,
+        receive_card = Cards::ReceiveCard.new(model_card_id, account_id,
                                               project_id, model_id,
                                               project_name, model_name,
-                                              selected_version_id, selected_version_source_app, selected_version_user_id,
-                                              latest_version_id, latest_version_source_app, latest_version_user_id,
-                                              has_dismissed_update_warning, expired, baked_object_ids)
+                                              selected_version_id, latest_version_id,
+                                              has_dismissed_update_warning, expired, receive_result)
         SketchupModel::Dictionary::ModelCardDictionaryHandler
           .save_receive_card_to_model(receive_card, state.sketchup_state.sketchup_model)
         new_speckle_state = state.speckle_state.with_receive_card(receive_card)

speckle_connector/src/actions/base_actions/add_send_model_card.rb

@@ -6,10 +6,9 @@ require_relative '../../cards/receive_card'
 require_relative '../../filters/send/everything_filter'
 require_relative '../../filters/send/selection_filter'
 require_relative '../../filters/send_filters'
-require_relative '../../settings/card_settings'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to add send model card.
     class AddSendModelCard < Action
@@ -17,22 +16,9 @@ module SpeckleConnector3
       # @return [States::State] the new updated state object
       def self.update_state(state, resolve_id, data)
         send_filter = Filters::SendFilters.get_filter_from_ui_data(data['sendFilter'])
-        # settings = Settings::CardSetting.get_setting_from_ui_data(data['settings'])
         # Init card and add to the state
-        send_card = Cards::SendCard.new(
-          data['modelCardId'],
-          data['accountId'],
-          data['serverUrl'],
-          data['workspaceId'],
-          data['workspaceSlug'],
-          data['projectId'],
-          data['projectName'],
-          data['modelId'],
-          data['modelName'],
-          data['latestCreatedVersionId'],
-          send_filter,
-          data['settings']
-        )
+        send_card = Cards::SendCard.new(data['modelCardId'], data['accountId'], data['projectId'], data['modelId'],
+                                        data['latestCreatedVersionId'], send_filter, {})
 
         SketchupModel::Dictionary::ModelCardDictionaryHandler
           .save_send_card_to_model(send_card, state.sketchup_state.sketchup_model)

speckle_connector/src/actions/base_actions/get_connector_version.rb

@@ -2,7 +2,7 @@
 
 require_relative '../action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Get connector version.
     class GetConnectorVersion < Action

speckle_connector/src/actions/base_actions/get_document_state.rb

@@ -2,9 +2,10 @@
 
 require_relative '../action'
 require_relative '../../filters/send_filters'
+require_relative '../../cards/receive_result'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Gets document state.
     class GetDocumentState < Action
@@ -14,37 +15,18 @@ module SpeckleConnector3
         send_cards_hash = SketchupModel::Dictionary::ModelCardDictionaryHandler
                           .get_send_cards_from_dict(state.sketchup_state.sketchup_model)
 
-        # TODO: CONVERTER_V2: Extract into new actions
         send_cards = send_cards_hash.collect do |id, card|
           filter = Filters::SendFilters.get_filter_from_document(card['sendFilter'])
-          settings = Settings::CardSetting.get_filter_from_document(card['sendSettings'])
-          send_card = Cards::SendCard.new(
-            id,
-            card['account_id'],
-            card['server_url'],
-            card['workspace_id'],
-            card['workspace_slug'],
-            card['project_id'],
-            card['project_name'],
-            card['model_id'],
-            card['model_name'],
-            card['latest_created_version_id'],
-            filter,
-            settings
-          )
+          send_card = Cards::SendCard.new(id, card['account_id'], card['project_id'], card['model_id'], card['latest_created_version_id'], filter, {})
 
           new_speckle_state = state.speckle_state.with_send_card(send_card)
           state = state.with_speckle_state(new_speckle_state)
           {
             modelCardId: send_card.model_card_id,
             accountId: send_card.account_id,
-            serverUrl: send_card.server_url,
-            workspaceId: send_card.workspace_id,
-            workspaceSlug: send_card.workspace_slug,
             projectId: send_card.project_id,
             modelId: send_card.model_id,
             sendFilter: send_card.send_filter,
-            settings: send_card.send_settings,
             latestCreatedVersionId: send_card.latest_created_version_id,
             typeDiscriminator: send_card.type_discriminator
           }
@@ -53,36 +35,30 @@ module SpeckleConnector3
         receive_cards_hash = SketchupModel::Dictionary::ModelCardDictionaryHandler
                              .get_receive_cards_from_dict(state.sketchup_state.sketchup_model)
 
-        # TODO: CONVERTER_V2: Extract into new actions
         receive_cards = receive_cards_hash.collect do |id, card|
-          receive_card = Cards::ReceiveCard.new(id, card['account_id'], card['server_url'], card['workspace_id'],  card['workspace_slug'], card['project_id'], card['model_id'],
+          receive_result = Cards::ReceiveResult.new(
+            card['receive_result']['bakedObjectIds'],
+            card['receive_result']['display']
+          )
+          receive_card = Cards::ReceiveCard.new(id, card['account_id'], card['project_id'], card['model_id'],
                                                 card['project_name'], card['model_name'], card['selected_version_id'],
-                                                card['selected_version_source_app'], card['selected_version_user_id'],
-                                                card['latest_version_id'], card['latest_version_source_app'],
-                                                card['latest_version_user_id'], card['has_dismissed_update_warning'],
-                                                card['expired'], card['baked_object_ids'])
+                                                card['latest_version_id'], card['has_dismissed_update_warning'],
+                                                card['expired'], receive_result)
 
           new_speckle_state = state.speckle_state.with_receive_card(receive_card)
           state = state.with_speckle_state(new_speckle_state)
           {
             modelCardId: receive_card.model_card_id,
             accountId: receive_card.account_id,
-            serverUrl: receive_card.server_url,
-            workspaceId: receive_card.workspace_id,
-            workspaceSlug: receive_card.workspace_slug,
             projectId: receive_card.project_id,
             modelId: receive_card.model_id,
             projectName: receive_card.project_name,
             modelName: receive_card.model_name,
             selectedVersionId: receive_card.selected_version_id,
-            selectedVersionSourceApp: receive_card.selected_version_source_app,
-            selectedVersionUserId: receive_card.selected_version_user_id,
             latestVersionId: receive_card.latest_version_id,
-            latestVersionSourceApp: receive_card.latest_version_source_app,
-            latestVersionUserId: receive_card.latest_version_user_id,
             hasDismissedUpdateWarning: receive_card.has_dismissed_update_warning,
             expired: receive_card.expired,
-            bakedObjectIds: receive_card.baked_object_ids,
+            receiveResult: receive_card.receive_result,
             typeDiscriminator: receive_card.type_discriminator
           }
         end

speckle_connector/src/actions/base_actions/get_send_filters.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../../filters/send_filters'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to get send filter.
     class GetSendFilters < Action

speckle_connector/src/actions/base_actions/get_source_app_name.rb

@@ -2,7 +2,7 @@
 
 require_relative '../action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Get source app name.
     class GetSourceAppName < Action

speckle_connector/src/actions/base_actions/get_source_app_version.rb

@@ -2,7 +2,7 @@
 
 require_relative '../action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Get source app version.
     class GetSourceAppVersion < Action

speckle_connector/src/actions/base_actions/highlight_model.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../../sketchup_model/query/entity'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to add send card.
     class HighlightModel < Action
@@ -15,12 +15,26 @@ module SpeckleConnector3
         card = receiver_card || sender_card
 
         objects_to_highlight = if card.type_discriminator == 'ReceiverModelCard'
-                                 state.speckle_state.receive_cards[model_card_id].baked_object_ids
+                                 state.speckle_state.receive_cards[model_card_id].receive_result.baked_object_ids
                                else
                                  state.speckle_state.send_cards[model_card_id].send_filter.selected_object_ids
                                end
 
-        SketchupModel::Utils::ViewUtils.highlight_entities(state.sketchup_state.sketchup_model, objects_to_highlight)
+        state.sketchup_state.sketchup_model.selection.clear
+
+        # Flat entities to select entities on card
+        flat_entities = SketchupModel::Query::Entity.flat_entities(state.sketchup_state.sketchup_model.entities)
+
+        flat_entities.each do |entity|
+          next unless objects_to_highlight.include?(entity.persistent_id)
+
+          if entity.is_a?(Sketchup::ComponentDefinition)
+            state.sketchup_state.sketchup_model.selection.add(entity.instances)
+          end
+          state.sketchup_state.sketchup_model.selection.add(entity)
+        end
+
+        state.sketchup_state.sketchup_model.active_view.zoom(state.sketchup_state.sketchup_model.selection)
 
         # Resolve promise
         js_script = "baseBinding.receiveResponse('#{resolve_id}')"

speckle_connector/src/actions/base_actions/remove_model.rb

@@ -8,7 +8,7 @@ require_relative '../../filters/send/selection_filter'
 require_relative '../../filters/send_filters'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to remove send card.
     class RemoveModel < Action

speckle_connector/src/actions/base_actions/update_send_filter.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to update send filter.
     class UpdateSendFilter < Action

speckle_connector/src/actions/clear_mapper_source.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear mapper source.
     class ClearMapperSource < Action

speckle_connector/src/actions/clear_mappings.rb

@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear mappings for selected entities.
     class ClearMappings < Action
@@ -28,7 +28,7 @@ module SpeckleConnector3
                    end
 
         # Collect entities from entity ids that comes from UI as list
-        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id.to_s) }
+        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id) }
 
         # Switch to definitions if all entities are component instance and UI flag shows that
         if entities_to_map.all? { |e| e.is_a?(Sketchup::ComponentInstance) } && @is_definition

speckle_connector/src/actions/clear_mappings_from_table.rb

@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear mappings for selected entities from mapped elements table.
     class ClearMappingsFromTable < Action
@@ -20,7 +20,7 @@ module SpeckleConnector3
         # Store speckle state to update with mapped entities.
         speckle_state = state.speckle_state
         flat_entities.each do |entity|
-          next unless entity_ids.include?(entity.persistent_id.to_s)
+          next unless entity_ids.include?(entity.persistent_id)
 
           SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.remove_dictionary(entity)
           speckle_state = speckle_state.with_removed_mapped_entity(entity)

speckle_connector/src/actions/clear_queue.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear queue from state.
     class ClearQueue < Action

speckle_connector/src/actions/collect_preferences.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative '../ext/sqlite3'
 require_relative '../constants/path_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to collect preferences from database to UI.
     class CollectPreferences < Action

speckle_connector/src/actions/collect_versions.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to collect versions from sketchup and connector to track user's version by mixpanel.
     class CollectVersions < Action
@@ -11,7 +11,7 @@ module SpeckleConnector3
       def self.update_state(state, _resolve_id, _data)
         versions = {
           sketchup: Sketchup.version.to_i,
-          speckle: SpeckleConnector3::CONNECTOR_VERSION
+          speckle: SpeckleConnector::CONNECTOR_VERSION
         }
         state.with_add_queue('collectVersions', versions.to_json, [])
       end

speckle_connector/src/actions/config_actions/get_config.rb

@@ -2,7 +2,7 @@
 
 require_relative '../action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to get config.
     class GetConfig < Action
@@ -12,7 +12,14 @@ module SpeckleConnector3
         # Previously it was stored in user state
         # config = state.user_state.preferences.to_json
         config = {
-          darkTheme: state.user_state.user_preferences[:dark_theme]
+          global: {
+
+          },
+          connectors: {
+            sketchup: {
+              darkTheme: state.user_state.user_preferences[:dark_theme]
+            }
+          }
         }
         js_script = "configBinding.receiveResponse('#{resolve_id}', #{config.to_json})"
         state.with_add_queue_js_command('getConfig', js_script)

speckle_connector/src/actions/config_actions/update_config.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../user_preferences_updated'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to update config.
     class UpdateConfig < Action
@@ -15,7 +15,7 @@ module SpeckleConnector3
       # @return [States::State] the new updated state object
       def self.update_state(state, resolve_id, config)
         config.each do |key, value|
-          state = Actions::UserPreferencesUpdated.new('Sketchup', KEY_VALUES[key], value).update_state(state)
+          state = Actions::UserPreferencesUpdated.new('configSketchup', KEY_VALUES[key], value).update_state(state)
         end
 
         js_script = "configBinding.receiveResponse('#{resolve_id}')"

speckle_connector/src/actions/connected.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to update connected state of application.
     class Connected < Action

speckle_connector/src/actions/create_stream.rb

@@ -6,7 +6,7 @@ require_relative '../actions/save_stream'
 require_relative '../actions/queue_send'
 require_relative '../convertors/converter'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Create stream.
     class CreateStream < Action

speckle_connector/src/actions/deactivate_diffing.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Deactivate diffing.
     class DeactivateDiffing < Action

speckle_connector/src/actions/events/app_event_action.rb

@@ -5,7 +5,7 @@ require_relative 'on_document_changed'
 require_relative '../load_sketchup_model'
 require_relative '../collect_preferences'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
       # Handle events that are triggered by the {AppObserver}.

speckle_connector/src/actions/events/entities_event_action.rb

@@ -4,14 +4,12 @@ require_relative 'event_action'
 require_relative '../../actions/send_actions/send_card_expiration_check'
 require_relative '../../sketchup_model/utils/face_utils'
 require_relative '../../constants/dict_constants'
-require_relative '../../sketchup_model/query/path'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
       # Event actions related to entities.
       class EntitiesEventAction < EventAction
-        PATH = SketchupModel::Query::Path
         # Event action when element added.
         class OnElementAdded
           # @param state [States::State] the current state of the SpeckleConnector Application
@@ -20,15 +18,8 @@ module SpeckleConnector3
             # do not copy speckle base object specific attributes, because they are entity specific
             modified_entities.each { |entity| entity.delete_attribute(SPECKLE_BASE_OBJECT) }
 
-            # All parent ids on current active path
-            parent_ids = PATH.parents_with_definitions(state.sketchup_state.sketchup_model).collect(&:persistent_id).collect(&:to_s)
-
-            # All instances that changed potentially because of potential definition update
-            path_instance_ids = PATH.instances(state.sketchup_state.sketchup_model).collect(&:persistent_id).collect(&:to_s)
             wrapped_entity_ids = wrapped_entity_ids(modified_entities)
-            ids_to_check = parent_ids + wrapped_entity_ids + path_instance_ids +
-              modified_entities.collect(&:persistent_id).collect(&:to_s) # NOTE: It fixes the same weird face problems. Ideally the push-pull result should hit the OnElementModified but for some cases we found the edge here......
-            state = EntitiesEventAction.run_expiration_checks(state, ids_to_check) if ids_to_check.any?
+            state = EntitiesEventAction.run_expiration_checks(state, wrapped_entity_ids) if wrapped_entity_ids.any?
 
             attach_edge_entity_observer(modified_entities.grep(Sketchup::Edge), state.speckle_state.observers[ENTITY_OBSERVER])
             state
@@ -37,7 +28,7 @@ module SpeckleConnector3
           def self.wrapped_entity_ids(modified_entities)
             wrapped_entity_ids = []
             modified_entities.select { |e| e.respond_to?(:definition) }.each do |c|
-              wrapped_entity_ids += c.definition.entities.collect(&:persistent_id).collect(&:to_s)
+              wrapped_entity_ids += c.definition.entities.collect(&:persistent_id)
             end
             wrapped_entity_ids
           end
@@ -58,24 +49,20 @@ module SpeckleConnector3
         class OnElementModified
           # @param state [States::State] the current state of the SpeckleConnector Application
           def self.update_state(state, event_data)
+            # modified_entity = event_data[0][1]
             modified_entities = event_data.collect { |data| data[1] }.to_a
+            # near_faces = get_near_faces(modified_entities)
             definition_faces = get_definition_faces(modified_entities)
-            near_faces = get_near_faces(modified_entities)
-            modified_persistent_ids = modified_entities.collect(&:persistent_id).collect(&:to_s) +
-              definition_faces.collect(&:persistent_id).collect(&:to_s) +
-              near_faces.collect(&:persistent_id).collect(&:to_s)
-
-            parent_ids = PATH.parents_with_definitions(state.sketchup_state.sketchup_model).collect(&:persistent_id).collect(&:to_s)
-
-            path_instance_ids = PATH.instances(state.sketchup_state.sketchup_model).collect(&:persistent_id).collect(&:to_s)
-            modified_persistent_ids += parent_ids + path_instance_ids
-            state = EntitiesEventAction.run_expiration_checks(state, modified_persistent_ids)
+            modified_entity_ids = modified_entities.collect(&:persistent_id) + definition_faces.collect(&:persistent_id)
+            parent_ids = parent_ids(state.sketchup_state.sketchup_model)
+            modified_entity_ids += parent_ids
+            state = EntitiesEventAction.run_expiration_checks(state, modified_entity_ids)
             # if modified_entity.is_a?(Sketchup::Face)
             #   path = state.sketchup_state.sketchup_model.active_path
             #   modified_faces = SketchupModel::Utils::FaceUtils.near_faces(modified_entity.edges)
             #   path_objects = path.nil? ? [] : path + path.collect(&:definition)
-            #   parent_ids = path_objects.collect(&:persistent_id).collect(&:to_s)
-            #   ids_to_invalidate = modified_faces.collect(&:persistent_id).collect(&:to_s) + parent_ids
+            #   parent_ids = path_objects.collect(&:persistent_id)
+            #   ids_to_invalidate = modified_faces.collect(&:persistent_id) + parent_ids
             #   entities_to_invalidate = speckle_entities_to_invalidate(speckle_state, ids_to_invalidate)
             #   new_speckle_state = invalidate_speckle_entities(speckle_state, entities_to_invalidate)
             #   # This is the place we can send information to UI for diffing check
@@ -90,11 +77,9 @@ module SpeckleConnector3
           def self.get_near_faces(modified_entities)
             near_faces = []
             modified_entities.each do |modified_entity|
-              if modified_entity.is_a?(Sketchup::Face)
-                near_faces += SketchupModel::Utils::FaceUtils.near_faces(modified_entity.edges)
-              elsif modified_entity.is_a?(Sketchup::Edge)
-                near_faces += modified_entity.faces
-              end
+              next unless modified_entity.is_a?(Sketchup::Face)
+
+              near_faces += SketchupModel::Utils::FaceUtils.near_faces(modified_entity.edges)
             end
             near_faces
           end
@@ -110,6 +95,12 @@ module SpeckleConnector3
             definition_faces
           end
 
+          def self.parent_ids(sketchup_model)
+            path = sketchup_model.active_path
+            path_objects = path.nil? ? [] : path + path.collect(&:definition)
+            path_objects.collect(&:persistent_id)
+          end
+
           # @param speckle_state [States::SpeckleState] the current state of the Speckle
           def self.speckle_entities_to_invalidate(speckle_state, ids)
             speckle_state.speckle_entities.to_h.select { |id, _| ids.include?(id) }
@@ -130,7 +121,7 @@ module SpeckleConnector3
         class OnElementRemoved
           # @param state [States::State] the current state of the SpeckleConnector Application
           def self.update_state(state, event_data)
-            modified_entity_ids = event_data.collect { |data| data[1] }.to_a.collect(&:to_s)
+            modified_entity_ids = event_data.collect { |data| data[1] }.to_a
             new_speckle_state = state.speckle_state.with_changed_entity_ids(modified_entity_ids)
             state = state.with_speckle_state(new_speckle_state)
             Actions::SendCardExpirationCheck.update_state(state)
@@ -138,9 +129,9 @@ module SpeckleConnector3
         end
 
         # @param state [States::State] the current state of the SpeckleConnector Application
-        # @param changed_persistent_ids [Array<String>] list of changed persistent ids
-        def self.run_expiration_checks(state, changed_persistent_ids)
-          new_speckle_state = state.speckle_state.with_changed_entity_persistent_ids(changed_persistent_ids)
+        # @param changed_entity_ids [Array<Integer> | Array<String>] list of changed entity ids
+        def self.run_expiration_checks(state, changed_entity_ids)
+          new_speckle_state = state.speckle_state.with_changed_entity_persistent_ids(changed_entity_ids)
           state = state.with_speckle_state(new_speckle_state)
           Actions::SendCardExpirationCheck.update_state(state)
         end

speckle_connector/src/actions/events/entity_event_action.rb

@@ -2,12 +2,10 @@
 
 require_relative 'event_action'
 require_relative '../../constants/dict_constants'
-require_relative '../../sketchup_model/query/path'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
-      PATH = SketchupModel::Query::Path
       # Event actions related to entities.
       class EntityEventAction < EventAction
         # Event action when entity modified/changed.
@@ -26,13 +24,9 @@ module SpeckleConnector3
                 edges += d.edges if d.is_a?(Sketchup::Vertex) && d.edges
               end
             end
-
-            parent_ids = PATH.parents_with_definitions(state.sketchup_state.sketchup_model).collect(&:persistent_id).collect(&:to_s)
-            path_instance_ids = PATH.instances(state.sketchup_state.sketchup_model).collect(&:persistent_id).collect(&:to_s)
-
             edges.uniq!
-            edge_ids = edges.collect(&:persistent_id).collect(&:to_s)
-            new_speckle_state = state.speckle_state.with_changed_entity_persistent_ids(edge_ids + parent_ids + path_instance_ids)
+            edge_ids = edges.collect(&:persistent_id)
+            new_speckle_state = state.speckle_state.with_changed_entity_persistent_ids(edge_ids)
             state.with_speckle_state(new_speckle_state)
           end
         end

speckle_connector/src/actions/events/event_action.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # This module contains actions that are performed to handle events triggered by observers in Sketchup.
     module Events

speckle_connector/src/actions/events/model_event_action.rb

@@ -3,7 +3,7 @@
 require_relative 'event_action'
 require_relative '../load_sketchup_model'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
       # Handle events that are triggered by the {ModelObserver}.
@@ -26,8 +26,7 @@ module SpeckleConnector3
             unless path.nil?
               new_path_entities = path[-1].definition.entities
               new_path_entities.add_observer(observers[ENTITIES_OBSERVER])
-              # attach observers to only orphan edges since face edges can be detected via face changes.
-              edges = new_path_entities.grep(Sketchup::Edge).filter { |edge| edge.faces.none? }
+              edges = new_path_entities.grep(Sketchup::Edge)
               edges.each do |edge|
                 edge.add_observer(observers[ENTITY_OBSERVER])
                 edge.start.add_observer(observers[ENTITY_OBSERVER])

speckle_connector/src/actions/events/on_document_changed.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Triggers whenever document has changed.
     class OnDocumentChanged < Action

speckle_connector/src/actions/events/selection_event_action.rb

@@ -8,7 +8,7 @@ require_relative '../../sketchup_model/reader/speckle_entities_reader'
 require_relative '../../sketchup_model/reader/mapper_reader'
 require_relative '../../sketchup_model/query/entity'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
       # Update selected speckle objects when the selection changes for mapper tool.
@@ -20,8 +20,8 @@ module SpeckleConnector3
 
           # POC: Not happy with it. We log also entity.entityID property since
           # onElementRemoved observer only return them! :/ Reconsider this in BETA!
-          selected_object_ids = state.sketchup_state.sketchup_model.selection.collect(&:persistent_id).collect(&:to_s) +
-                                state.sketchup_state.sketchup_model.selection.collect(&:entityID).collect(&:to_s)
+          selected_object_ids = state.sketchup_state.sketchup_model.selection.collect(&:persistent_id) +
+                                state.sketchup_state.sketchup_model.selection.collect(&:entityID)
           summary = "Selected #{selected_object_ids.length / 2} objects." # POC: OFFF. I'll fix it
           selection_info = UiData::Sketchup::SelectionInfo.new(selected_object_ids, summary)
           js_script = "selectionBinding.emit('setSelection', #{selection_info.to_json})"

speckle_connector/src/actions/get_accounts.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../action'
-require_relative '../../accounts/accounts'
-require_relative '../load_saved_streams'
+require_relative 'action'
+require_relative '../accounts/accounts'
+require_relative 'load_saved_streams'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to initialize local accounts from database.
     class GetAccounts < Action
@@ -12,7 +12,7 @@ module SpeckleConnector3
       # @return [States::State] the new updated state object
       def self.update_state(state, resolve_id)
         puts 'Initialisation of Speckle accounts requested by plugin'
-        accounts_data = SpeckleConnector3::Accounts.load_accounts
+        accounts_data = state.speckle_state.accounts
         js_script = "accountsBinding.receiveResponse('#{resolve_id}', #{accounts_data.to_json})"
         state.with_add_queue_js_command('getAccounts', js_script)
       end

speckle_connector/src/actions/get_document_info.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Get document info.
     class GetDocumentInfo < Action

speckle_connector/src/actions/handle_error.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to return error message to UI.
-    # It is "TopLevelExceptionHandler" equivalent of C#.
     class HandleError < Action
-      # @return [StandardError] error
-      attr_reader :error
-
-      # @param error [StandardError] error
+      # @param error [String] error
       # @param view_name [String] name of the view (binding)
       # @param action [Action] action that error happened
       # @param parameters [Array<String>] arguments
@@ -23,14 +19,11 @@ module SpeckleConnector3
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def update_state(state)
-        # TODO: Log here when it is ready!!!
-        host_app_error = {
-          message: error.message,
-          error: error,
-          stackTrace: error.backtrace
+        error_message = "Error: #{@error}\nBinding: #{@view_name}\nAction:#{@action}\nArgs: #{@args}\n"
+        error = {
+          error: error_message
         }
-        
-        js_error_script = "#{@view_name}.receiveResponse('#{@args.first}', #{host_app_error.to_json})"
+        js_error_script = "#{@view_name}.receiveResponse('#{@args.first}', #{error.to_json})"
         state.with_add_queue_js_command("error_#{@view_name}", js_error_script)
       end
     end

speckle_connector/src/actions/hide_mappings_from_table.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Hide entities that selected from mapped elements table.
     class HideMappingsFromTable < Action
@@ -19,7 +19,7 @@ module SpeckleConnector3
 
         # Store speckle state to update with mapped entities.
         flat_entities.each do |entity|
-          next unless entity_ids.include?(entity.persistent_id.to_s)
+          next unless entity_ids.include?(entity.persistent_id)
 
           if entity.is_a?(Sketchup::ComponentDefinition)
             entity.instances.each do |instance|

speckle_connector/src/actions/init_local_accounts.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative '../accounts/accounts'
 require_relative 'load_saved_streams'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to initialize local accounts from database.
     class InitLocalAccounts < Action

speckle_connector/src/actions/initialize_materials.rb

@@ -4,9 +4,9 @@ require_relative 'action'
 require_relative 'add_material'
 require_relative '../constants/mat_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
-    # Action to initialize materials (legacy for diff colors)
+    # Action to initialize materials
     class InitializeMaterials < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object

speckle_connector/src/actions/initialize_speckle.rb

@@ -9,16 +9,16 @@ require_relative '../preferences/preferences'
 require_relative '../constants/observer_constants'
 require_relative '../ext/worker'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Initialization of the real state of the speckle.
     class InitializeSpeckle < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def self.update_state(state, observers, instant_message_sender)
-        worker = SpeckleConnector3::Worker.new([])
+        worker = SpeckleConnector::Worker.new([])
         attach_app_observer!(observers[APP_OBSERVER])
-        accounts = SpeckleConnector3::Accounts.load_accounts
+        accounts = SpeckleConnector::Accounts.load_accounts
         speckle_state = States::SpeckleState.new(accounts, observers, {}, {})
         # This should be the only point that `Sketchup_active_model` passed to application state.
         sketchup_state = States::SketchupState.new(Sketchup.active_model)

speckle_connector/src/actions/isolate_mappings_from_table.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Isolate entities that selected from mapped elements table.
     class IsolateMappingsFromTable < Action
@@ -38,13 +38,13 @@ module SpeckleConnector3
 
         faces_or_edges_ids = faces_or_edges.collect { |e| e['entityId'] }
 
-        face_edge_flat_entities.select { |e| faces_or_edges_ids.include?(e.persistent_id.to_s) }.each do |entity|
+        face_edge_flat_entities.select { |e| faces_or_edges_ids.include?(e.persistent_id) }.each do |entity|
           entity.hidden = false
         end
 
         comps_or_groups_ids = comps_or_groups.collect { |e| e['entityId'] }
 
-        comp_flat_entities.select { |e| comps_or_groups_ids.include?(e.persistent_id.to_s) }.each do |entity|
+        comp_flat_entities.select { |e| comps_or_groups_ids.include?(e.persistent_id) }.each do |entity|
           if entity.is_a?(Sketchup::ComponentDefinition)
             entity.instances.each do |instance|
               instance.hidden = false

speckle_connector/src/actions/load_saved_streams.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to load saved streams.
     class LoadSavedStreams < Action

speckle_connector/src/actions/load_sketchup_model.rb

@@ -9,7 +9,7 @@ require_relative '../states/state'
 require_relative '../states/sketchup_state'
 require_relative '../constants/observer_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Switch sketchup model wit a new one
     class LoadSketchupModel < Action
@@ -23,16 +23,18 @@ module SpeckleConnector3
         new_sketchup_state = States::SketchupState.new(sketchup_model)
         sketchup_model.rendering_options['DisplaySectionPlanes'] = true
         new_state = state.with(:@sketchup_state => new_sketchup_state)
+        # Init materials again
+        new_state = InitializeMaterials.update_state(new_state)
 
         # Read speckle entities
-        #new_speckle_entities = SketchupModel::Reader::SpeckleEntitiesReader.read(sketchup_model.entities)
-        #new_speckle_state = new_state.speckle_state.with_speckle_entities(Immutable::Hash.new(new_speckle_entities))
+        new_speckle_entities = SketchupModel::Reader::SpeckleEntitiesReader.read(sketchup_model.entities)
+        new_speckle_state = new_state.speckle_state.with_speckle_entities(Immutable::Hash.new(new_speckle_entities))
         # POC: Reconsider it when we will do caching between sessions!
-        # new_speckle_state = new_speckle_state.with_empty_object_references
+        new_speckle_state = new_speckle_state.with_empty_object_references
         # Read mapped entities
-        # new_mapped_entities = SketchupModel::Reader::MapperReader.read_mapped_entities(sketchup_model.entities)
-        # new_speckle_state = new_speckle_state.with_mapped_entities(Immutable::Hash.new(new_mapped_entities))
-        # new_state = new_state.with_speckle_state(new_speckle_state)
+        new_mapped_entities = SketchupModel::Reader::MapperReader.read_mapped_entities(sketchup_model.entities)
+        new_speckle_state = new_speckle_state.with_mapped_entities(Immutable::Hash.new(new_mapped_entities))
+        new_state = new_state.with_speckle_state(new_speckle_state)
 
         # Read preferences from database and model.
         preferences = Preferences.read_preferences(new_state.sketchup_state.sketchup_model)

speckle_connector/src/actions/mapped_entities_updated.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative '../sketchup_model/reader/mapper_reader'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Triggers when mapped entities updated.
     class MappedEntitiesUpdated < Action

speckle_connector/src/actions/mapper_initialized.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative '../mapper/category/revit_category'
 require_relative '../mapper/category/revit_family_category'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Collects mapper selection info.
     class MapperInitialized < Action

speckle_connector/src/actions/mapper_selection_changed.rb

@@ -7,7 +7,7 @@ require_relative '../sketchup_model/reader/mapper_reader'
 require_relative '../sketchup_model/reader/speckle_entities_reader'
 require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Collects mapper selection info.
     class MapperSelectionChanged < Action

speckle_connector/src/actions/mapper_source_updated.rb

@@ -5,7 +5,7 @@ require_relative '../constants/type_constants'
 require_relative '../mapper/mapper_source'
 require_relative '../speckle_objects/built_elements/revit/revit_element_type'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to update mapper source.
     class MapperSourceUpdated < Action

speckle_connector/src/actions/model_preference_updated.rb

@@ -6,7 +6,7 @@ require_relative '../accounts/accounts'
 require_relative '../constants/path_constants'
 require_relative '../sketchup_model/dictionary/speckle_model_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # When preference updated by UI.
     class ModelPreferencesUpdated < Action

speckle_connector/src/actions/on_events_action.rb

@@ -8,7 +8,7 @@ require_relative 'events/model_event_action'
 require_relative 'events/selection_event_action'
 require_relative '../constants/observer_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Handle events that were collected by observers
     class OnEventsAction < Action

speckle_connector/src/actions/one_click_send.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative '../accounts/accounts'
+require_relative '../actions/create_stream'
+require_relative '../actions/queue_send'
+require_relative '../convertors/to_speckle'
+
+module SpeckleConnector
+  module Actions
+    # Sends to speckle.
+    class OneClickSend < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state)
+        puts 'send to speckle'
+        default_account = Accounts.default_account
+        if default_account.nil?
+          puts 'No local account found. Please refer to speckle.guide for more information.'
+          return state
+        end
+        sketchup_model = state.sketchup_state.sketchup_model
+        to_convert = sketchup_model.selection.count > 0 ? sketchup_model.selection : sketchup_model.entities
+        first_saved_stream = first_saved_stream(sketchup_model)
+        action = if first_saved_stream.nil?
+                   Actions::CreateStream.new
+                 else
+                   Actions::QueueSend.new(first_saved_stream, convert_to_speckle(sketchup_model, to_convert))
+                 end
+
+        action.update_state(state)
+      end
+
+      def self.first_saved_stream(model)
+        (saved_streams = model.attribute_dictionary('speckle', true)['streams']) or []
+        saved_streams.nil? || saved_streams.empty? ? nil : saved_streams[0]
+      end
+
+      def self.convert_to_speckle(sketchup_model, to_convert)
+        converter = Converters::ToSpeckle.new(sketchup_model)
+        to_convert.map { |entity| converter.convert(entity) }
+      end
+    end
+  end
+end

speckle_connector/src/actions/queue_send.rb

@@ -5,7 +5,7 @@ require_relative '../states/state'
 require_relative '../states/speckle_state'
 require_relative '../actions/send_from_queue'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Send queue from state.
     class QueueSend < Action

speckle_connector/src/actions/receive_actions/after_receive.rb

@@ -2,7 +2,7 @@
 
 require_relative '../action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to let sketchup know receive from server is finished..
     class AfterReceive < Action

speckle_connector/src/actions/receive_actions/before_receive.rb

@@ -2,7 +2,7 @@
 
 require_relative '../action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to let sketchup know receive will be started.
     class BeforeReceive < Action

speckle_connector/src/actions/receive_actions/receive_single_object.rb

@@ -6,7 +6,7 @@ require_relative '../action'
 require_relative '../../convertors/units'
 require_relative '../../convertors/to_native'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear mappings for selected entities.
     class ReceiveSingleObject < Action

speckle_connector/src/actions/receive_bindings/after_get_objects.rb

@@ -2,9 +2,10 @@
 
 require_relative '../action'
 require_relative '../../convertors/to_native'
-require_relative '../../convertors/to_native_v2'
+require_relative '../../cards/receive_result'
+require_relative '../../ext/TT_Lib2/progressbar'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Receive from server.
     class AfterGetObjects < Action
@@ -13,20 +14,11 @@ module SpeckleConnector3
       def self.update_state(state, resolve_id, model_card_id, source_application, root_obj)
         model_card = state.speckle_state.receive_cards[model_card_id]
         state.sketchup_state.sketchup_model.start_operation('Receive Speckle Objects', true)
-        # TODO: CONVERTER_V2: Remove later if statement and make V2 default.
-        # FIXME: we will figure it out root commit structure later. It is hacky now.
-        converter = Converters::ToNativeV2.new(state,
-                                               root_obj['instanceDefinitionProxies'] || [],
-                                               root_obj['renderMaterialProxies'] || [],
-                                               root_obj['levelProxies'] || [],
-                                               source_application,
-                                               model_card)
+        converter = Converters::ToNative.new(state, model_card.model_id, model_card.project_name,
+                                             model_card.model_name, source_application, model_card_id)
         start_time = Time.now.to_f
         # Have side effects on the sketchup model. It effects directly on the entities by adding new objects.
         state = converter.receive_commit_object(root_obj)
-        if state.user_state.model_preferences[:merge_coplanar_faces]
-          Converters::CleanUp.merge_coplanar_faces(converter.converted_faces)
-        end
         elapsed_time = (Time.now.to_f - start_time).round(3)
         state.sketchup_state.sketchup_model.commit_operation
         puts "==== Converting to Native executed in #{elapsed_time} sec ===="
@@ -34,15 +26,11 @@ module SpeckleConnector3
 
         # Where we send info about received top level (for the sake of handling with less) objects.
         top_objects = converter.converted_entities.reject(&:deleted?).select { |e| e.parent.is_a?(Sketchup::Model) }
-        top_object_ids = top_objects.collect(&:persistent_id).collect(&:to_s)
+        top_object_ids = top_objects.collect(&:persistent_id)
         args = {
           modelCardId: model_card_id,
-          bakedObjectIds: top_object_ids,
-          conversionResults: converter.conversion_results
+          receiveResult: Cards::ReceiveResult.new(top_object_ids, true)
         }
-
-        # TODO: set here bakedObjectIds when we get rid of patching model as post receive action.
-
         receive_result_js_script = "receiveBinding.emit('setModelReceiveResult', #{args.to_json})"
         state = state.with_add_queue_js_command('setModelReceiveResult', receive_result_js_script)
 

speckle_connector/src/actions/receive_bindings/receive.rb

@@ -5,8 +5,9 @@ require_relative '../../accounts/accounts'
 require_relative '../../convertors/units'
 require_relative '../../convertors/to_speckle'
 require_relative '../../operations/send'
+require_relative '../../ext/TT_Lib2/progressbar'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Receive from server.
     class Receive < Action

speckle_connector/src/actions/receive_objects.rb

@@ -6,7 +6,7 @@ require_relative '../convertors/to_native'
 require_relative '../operations/receive'
 require_relative '../convertors/clean_up'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to receive objects from Speckle Server.
     class ReceiveObjects < Action

speckle_connector/src/actions/reload_accounts.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative '../accounts/accounts'
 require_relative 'load_saved_streams'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to reload accounts from database.
     class ReloadAccounts < Action

speckle_connector/src/actions/remove_stream.rb

@@ -5,7 +5,7 @@ require_relative '../accounts/accounts'
 require_relative '../convertors/units'
 require_relative '../convertors/converter'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to remove stream.
     # Currently it is not a state changer.

speckle_connector/src/actions/save_stream.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative '../accounts/accounts'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Save stream.
     # Currently it is not a state changer.

speckle_connector/src/actions/select_mappings_from_table.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Select entities that selected from mapped elements table.
     class SelectMappingsFromTable < Action
@@ -22,7 +22,7 @@ module SpeckleConnector3
 
         # Store speckle state to update with mapped entities.
         flat_entities.each do |entity|
-          next unless entity_ids.include?(entity.persistent_id.to_s)
+          next unless entity_ids.include?(entity.persistent_id)
 
           if entity.is_a?(Sketchup::ComponentDefinition)
             state.sketchup_state.sketchup_model.selection.add(entity.instances)

speckle_connector/src/actions/selection_actions/get_selection.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../../ui_data/sketchup/selection_info'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to get selection.
     class GetSelection < Action
@@ -12,8 +12,8 @@ module SpeckleConnector3
       def self.update_state(state, resolve_id)
         # POC: Not happy with it. We log also entity.entityID property since
         # onElementRemoved observer only return them! :/ Reconsider this in BETA!
-        selected_object_ids = state.sketchup_state.sketchup_model.selection.collect(&:persistent_id).collect(&:to_s) +
-                              state.sketchup_state.sketchup_model.selection.collect(&:entityID).collect(&:to_s) # That's bad
+        selected_object_ids = state.sketchup_state.sketchup_model.selection.collect(&:persistent_id) +
+                              state.sketchup_state.sketchup_model.selection.collect(&:entityID) # That's bad
         summary = "Selected #{selected_object_ids.length / 2} objects." # POC: OFFF. I'll fix it
         selection_info = UiData::Sketchup::SelectionInfo.new(selected_object_ids, summary)
         js_script = "selectionBinding.receiveResponse('#{resolve_id}', #{selection_info.to_json})"

speckle_connector/src/actions/send_actions/activate_send_filter.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to activate send filter.
     class ActivateSendFilter < Action

speckle_connector/src/actions/send_actions/activate_send_filter_tag.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to activate send filter tag.
     class ActivateSendFilterTag < Action

speckle_connector/src/actions/send_actions/send.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require_relative '../action'
+require_relative '../../accounts/accounts'
+require_relative '../../convertors/units'
+require_relative '../../convertors/to_speckle'
+require_relative '../../operations/send'
+require_relative '../../ext/TT_Lib2/progressbar'
+
+module SpeckleConnector
+  module Actions
+    # Send to server.
+    class Send < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state, resolve_id, model_card_id)
+        model_card = state.speckle_state.send_cards[model_card_id]
+        unless model_card.send_filter.selected_object_ids.any?
+          resolve_js_script = "sendBinding.receiveResponse('#{resolve_id}')"
+          state = state.with_add_queue_js_command('resolveSend', resolve_js_script)
+          args = {
+            modelCardId: model_card_id,
+            error: 'No objects were found. Please update your send filter!'
+          }
+          js_script = "sendBinding.emit('setModelError', #{args.to_json})"
+          return state.with_add_queue_js_command('setModelsError', js_script)
+        end
+
+        account = Accounts.get_account_by_id(model_card.account_id)
+        converter = Converters::ToSpeckle.new(state, model_card.project_id, model_card.send_filter, model_card_id)
+        new_speckle_state, base = converter.convert_entities_to_base(model_card.send_filter.selected_object_ids,
+                                                                     state.user_state.preferences)
+        id, total_children_count, batches, refs = converter.serialize(base, state.user_state.preferences)
+        new_speckle_state = new_speckle_state.with_object_references(model_card.project_id, refs)
+        new_speckle_state = new_speckle_state.with_empty_changed_entity_persistent_ids
+        new_speckle_state = new_speckle_state.with_empty_changed_entity_ids
+
+        puts("converted #{base.count} objects for stream #{model_card.project_id}")
+
+        state = state.with_speckle_state(new_speckle_state)
+
+        resolve_js_script = "sendBinding.receiveResponse('#{resolve_id}')"
+        state = state.with_add_queue_js_command('send', resolve_js_script)
+        args = {
+          modelCardId: model_card_id,
+          projectId: model_card.project_id,
+          modelId: model_card.model_id,
+          token: account['token'],
+          serverUrl: account['serverInfo']['url'],
+          accountId: model_card.account_id,
+          message: model_card.message,
+          sendObject: {
+            id: id,
+            totalChildrenCount: total_children_count,
+            batches: batches
+          }
+        }
+        js_script = "sendBinding.emit('sendViaBrowser', #{args.to_json})"
+        state.with_add_queue_js_command('sendViaBrowser', js_script)
+      end
+
+      def self.update_state_test(state, resolve_id, model_card_id)
+        dialog = UI::HtmlDialog.new(
+          {
+            :dialog_title => 'Dialog Example',
+            :preferences_key => 'com.sample.plugin',
+            :scrollable => true,
+            :resizable => true,
+            :width => 600,
+            :height => 400,
+            :left => 10,
+            :top => 10,
+            :min_width => 50,
+            :min_height => 50,
+            :max_width =>1000,
+            :max_height => 1000,
+            :style => UI::HtmlDialog::STYLE_DIALOG
+          })
+        html = '<div id="hi"><b>Hello world!</b></div>'
+        dialog.set_html(html)
+        dialog.show
+
+        action = Proc.new do |status|
+          js_command = "document.getElementById('hi').innerHTML = '<b>#{status}</b>'"
+          log_js_command = "console.log('test')"
+          dialog.execute_script(js_command)
+          dialog.execute_script(log_js_command)
+        end
+
+        selected_object_ids = state.sketchup_state.sketchup_model.selection.collect(&:persistent_id)
+        state.worker.add_jobs(1000.times.to_a.map { |i| Job.new(i, &action) })
+        state.worker.do_work(Time.now.to_f, &action)
+      end
+    end
+  end
+end

speckle_connector/src/actions/send_actions/send_card_expiration_check.rb

@@ -3,7 +3,7 @@
 require_relative '../action'
 require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to check send card expirations.
     class SendCardExpirationCheck < Action

speckle_connector/src/actions/send_from_queue.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative '../accounts/accounts'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Send already converted objects from queue if exist on stream.
     class SendFromQueue < Action