Improve refreshMixpanelIds function with better registration

There were issues with innosetup workflow which does not run one powershell.exe,
so workflows splitted into chunks according to shells

.circleci/config.yml

@@ -36,19 +36,41 @@ jobs:
       - attach_workspace:
           at: ./
       - run:
-          name: Patch
+          name: Create Innosetup signing cert
           shell: powershell.exe
-          command:
-            | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
-            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.0" } else { $env:CIRCLE_TAG }
-            $semver = if($tag.Contains('/')) {$tag.Split("/")[1] } else { $tag }
+          command: |
+            echo $env:PFX_B64 > "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt"
+            certutil -decode "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt" "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.pfx"
+      - 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 }
-            $channel = if($semver.Contains('-')) {$semver.Split("-")[1] } else { "latest" }
-            $version = "$($ver).$($env:CIRCLE_BUILD_NUM)"
-            New-Item -Force "speckle-sharp-ci-tools/Installers/sketchup/$channel.yml" -ItemType File -Value "version: $semver"
-            echo $version
+            $version = "$($ver).$($env:WORKFLOW_NUM)"
             python patch_version.py $semver
-            speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - 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
+
+      #- run:
+      #    name: Patch
+      #    shell: powershell.exe
+      #    command:
+      #      | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
+      #      $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.0" } else { $env:CIRCLE_TAG }
+      #      $semver = if($tag.Contains('/')) {$tag.Split("/")[1] } else { $tag }
+      #      $ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
+      #      $channel = if($semver.Contains('-')) {$semver.Split("-")[1] } else { "latest" }
+      #      $version = "$($ver).$($env:CIRCLE_BUILD_NUM)"
+      #      New-Item -Force "speckle-sharp-ci-tools/Installers/sketchup/$channel.yml" -ItemType File -Value "version: $semver"
+      #      echo $version
+      #      python patch_version.py $semver
+      #      speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss
       - persist_to_workspace:
           root: ./
           paths:
@@ -115,7 +137,6 @@ workflows:
               only: /.*/
 
       - build-connector:
-          context: innosetup
           slug: sketchup
           requires:
             - get-ci-tools
@@ -123,6 +144,7 @@ workflows:
           filters:
             tags:
               only: /.*/
+          context: innosetup
 
       - deploy-manager2:
           context: do-spaces-speckle-releases

speckle_connector/src/actions/collect_versions.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+
+module SpeckleConnector
+  module Actions
+    # Action to collect versions from sketchup and connector to track user's version by mixpanel.
+    class CollectVersions < 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, _data)
+        versions = {
+          sketchup: Sketchup.version.to_i,
+          speckle: SpeckleConnector::CONNECTOR_VERSION
+        }
+        state.with_add_queue('collectVersions', versions.to_json, [])
+      end
+    end
+  end
+end

speckle_connector/src/actions/load_saved_streams.rb

@@ -9,7 +9,8 @@ module SpeckleConnector
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def self.update_state(state, _data)
-        (saved_streams = state.sketchup_state.sketchup_model.attribute_dictionary('speckle', true)['streams']) or []
+        (saved_streams = state.sketchup_state.sketchup_model
+                              .attribute_dictionary('Speckle', true)['saved_streams']) or []
         state.with_add_queue('setSavedStreams', saved_streams, [])
       end
     end

speckle_connector/src/actions/remove_stream.rb

@@ -18,10 +18,10 @@ module SpeckleConnector
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def update_state(state)
-        speckle_dict = state.sketchup_state.sketchup_model.attribute_dictionary('speckle', true)
-        saved = speckle_dict['streams'] || []
+        speckle_dict = state.sketchup_state.sketchup_model.attribute_dictionary('Speckle', true)
+        saved = speckle_dict['saved_streams'] || []
         saved -= [@stream_id]
-        speckle_dict['streams'] = saved
+        speckle_dict['saved_streams'] = saved
         state
       end
     end

speckle_connector/src/actions/save_stream.rb

@@ -16,10 +16,10 @@ module SpeckleConnector
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def update_state(state)
-        speckle_dict = state.sketchup_state.sketchup_model.attribute_dictionary('speckle', true)
-        saved = speckle_dict['streams'] || []
+        speckle_dict = state.sketchup_state.sketchup_model.attribute_dictionary('Speckle', true)
+        saved = speckle_dict['saved_streams'] || []
         saved = saved.empty? ? [@stream_id] : saved.unshift(@stream_id)
-        speckle_dict['streams'] = saved
+        speckle_dict['saved_streams'] = saved
         state
       end
     end

speckle_connector/src/actions/send_from_queue.rb

@@ -16,11 +16,10 @@ module SpeckleConnector
       # @return [States::State] the new updated state object
       def update_state(state)
         to_send_stream_id = state.speckle_state.stream_queue[:stream_id]
-        return state if to_send_stream_id == @stream_id
+        return state if to_send_stream_id == @stream_id || to_send_stream_id.nil?
 
         to_send_converted = state.speckle_state.stream_queue[:converted].to_json
         new_state = state.with_add_queue('convertedFromSketchup', to_send_stream_id, [to_send_converted])
-        new_state = new_state.with_add_queue('oneClickSend', to_send_stream_id, [])
         new_state.with_empty_stream_queue
       end
     end

speckle_connector/src/preferences/preferences.rb

@@ -41,12 +41,41 @@ module SpeckleConnector
               dark_theme: dark_theme
             },
             model: {
-              combine_faces_by_material: DICT_HANDLER.get_attribute(sketchup_model,
-                                                                    :combine_faces_by_material, 'Speckle'),
-              include_entity_attributes: DICT_HANDLER.get_attribute(sketchup_model,
-                                                                    :include_entity_attributes, 'Speckle'),
-              merge_coplanar_faces: DICT_HANDLER.get_attribute(sketchup_model,
-                                                               :merge_coplanar_faces, 'Speckle')
+              combine_faces_by_material: DICT_HANDLER.get_attribute(
+                sketchup_model,
+                :combine_faces_by_material,
+                'Speckle'
+              ),
+              include_entity_attributes: DICT_HANDLER.get_attribute(
+                sketchup_model,
+                :include_entity_attributes,
+                'Speckle'
+              ),
+              include_face_entity_attributes: DICT_HANDLER.get_attribute(
+                sketchup_model,
+                :include_face_entity_attributes,
+                'Speckle'
+              ),
+              include_edge_entity_attributes: DICT_HANDLER.get_attribute(
+                sketchup_model,
+                :include_edge_entity_attributes,
+                'Speckle'
+              ),
+              include_group_entity_attributes: DICT_HANDLER.get_attribute(
+                sketchup_model,
+                :include_group_entity_attributes,
+                'Speckle'
+              ),
+              include_component_entity_attributes: DICT_HANDLER.get_attribute(
+                sketchup_model,
+                :include_component_entity_attributes,
+                'Speckle'
+              ),
+              merge_coplanar_faces: DICT_HANDLER.get_attribute(
+                sketchup_model,
+                :merge_coplanar_faces,
+                'Speckle'
+              )
             }
           }
         )
@@ -68,6 +97,10 @@ module SpeckleConnector
       {
         combine_faces_by_material: true,
         include_entity_attributes: true,
+        include_face_entity_attributes: true,
+        include_edge_entity_attributes: true,
+        include_group_entity_attributes: true,
+        include_component_entity_attributes: true,
         merge_coplanar_faces: true
       }
     end

speckle_connector/src/speckle_objects/geometry/line.rb

@@ -40,7 +40,7 @@ module SpeckleConnector
         # @param edge [Sketchup::Edge] edge to convert line.
         def self.from_edge(edge, units, model_preferences)
           dictionaries = {}
-          if model_preferences[:include_entity_attributes]
+          if model_preferences[:include_entity_attributes] && model_preferences[:include_edge_entity_attributes]
             dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(edge)
           end
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}

speckle_connector/src/speckle_objects/geometry/mesh.rb

@@ -89,9 +89,10 @@ module SpeckleConnector
 
         # @param face [Sketchup::Face] face to convert mesh
         # rubocop:disable Style/MultilineTernaryOperator
+        # rubocop:disable Metrics/CyclomaticComplexity
         def self.from_face(face, units, model_preferences)
           dictionaries = {}
-          if model_preferences[:include_entity_attributes]
+          if model_preferences[:include_entity_attributes] && model_preferences[:include_face_entity_attributes]
             dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(face)
           end
           has_any_soften_edge = face.edges.any?(&:soft?)
@@ -112,6 +113,7 @@ module SpeckleConnector
           speckle_mesh
         end
         # rubocop:enable Style/MultilineTernaryOperator
+        # rubocop:enable Metrics/CyclomaticComplexity
 
         def face_to_mesh(face)
           mesh = face.loops.count > 1 ? face.mesh : nil

speckle_connector/src/speckle_objects/other/block_definition.rb

@@ -47,13 +47,21 @@ module SpeckleConnector
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/AbcSize
         def self.from_definition(definition, units, definitions, preferences, &convert)
           guid = definition.guid
           return definitions[guid] if definitions.key?(guid)
 
           dictionaries = {}
           if preferences[:model][:include_entity_attributes]
-            dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(definition)
+            if definition.group?
+              if preferences[:model][:include_group_entity_attributes]
+                dictionaries = SketchupModel::Dictionary::DictionaryHandler
+                               .attribute_dictionaries_to_speckle(definition)
+              end
+            elsif preferences[:model][:include_component_entity_attributes]
+              dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(definition)
+            end
           end
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
 
@@ -80,6 +88,7 @@ module SpeckleConnector
         # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/AbcSize
 
         # Finds or creates a component definition from the geometry and the given name
         # @param sketchup_model [Sketchup::Model] sketchup model to check block definitions.
@@ -164,7 +173,7 @@ module SpeckleConnector
         # Mesh group id helps to determine how to group faces into meshes.
         # @param face [Sketchup::Face] face to get mesh group id.
         def self.get_mesh_group_id(face, model_preferences)
-          if model_preferences[:include_entity_attributes]
+          if model_preferences[:include_entity_attributes] && model_preferences[:include_face_entity_attributes]
             has_attribute_dictionary = !(face.attribute_dictionaries.nil? || face.attribute_dictionaries.first.nil?)
             return face.persistent_id.to_s if has_attribute_dictionary
           end

speckle_connector/src/speckle_objects/other/block_instance.rb

@@ -45,7 +45,7 @@ module SpeckleConnector
         # @param group [Sketchup::Group] group to convert Speckle BlockInstance
         def self.from_group(group, units, component_defs, preferences, &convert)
           dictionaries = {}
-          if preferences[:model][:include_entity_attributes]
+          if preferences[:model][:include_entity_attributes] && preferences[:model][:include_group_entity_attributes]
             dictionaries = SketchupModel::Dictionary::DictionaryHandler.attribute_dictionaries_to_speckle(group)
           end
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
@@ -66,7 +66,8 @@ module SpeckleConnector
         # rubocop:disable Metrics/MethodLength
         def self.from_component_instance(component_instance, units, component_defs, preferences, &convert)
           dictionaries = {}
-          if preferences[:model][:include_entity_attributes]
+          if preferences[:model][:include_entity_attributes] &&
+             preferences[:model][:include_component_entity_attributes]
             dictionaries = SketchupModel::Dictionary::DictionaryHandler
                            .attribute_dictionaries_to_speckle(component_instance)
           end

speckle_connector/src/ui/vue_view.rb

@@ -18,6 +18,7 @@ require_relative '../actions/reload_accounts'
 require_relative '../actions/load_saved_streams'
 require_relative '../actions/init_local_accounts'
 require_relative '../actions/collect_preferences'
+require_relative '../actions/collect_versions'
 
 module SpeckleConnector
   module Ui
@@ -65,6 +66,7 @@ module SpeckleConnector
           remove_stream: Commands::RemoveStream.new(@app),
           notify_connected: Commands::NotifyConnected.new(@app),
           collect_preferences: Commands::ActionCommand.new(@app, Actions::CollectPreferences),
+          collect_versions: Commands::ActionCommand.new(@app, Actions::CollectVersions),
           user_preferences_updated: Commands::UserPreferencesUpdated.new(@app),
           model_preferences_updated: Commands::ModelPreferencesUpdated.new(@app)
         }.freeze

ui/src/App.vue

@@ -80,7 +80,11 @@
         </v-menu>
       </v-app-bar>
 
-      <create-stream-dialog v-if="accounts().length !== 0"/>
+      <create-stream-dialog
+          v-if="accounts().length !== 0"
+          :account-id="activeAccount().userInfo.id"
+          :server-url="activeAccount().serverInfo.url"
+      />
 
       <v-container v-if="accounts().length !== 0" fluid>
         <router-view :stream-search-query="streamSearchQuery" />
@@ -104,13 +108,19 @@ global.collectPreferences = function (preferences) {
   bus.$emit('update-preferences', preferences)
 }
 
+global.collectVersions = function (versions) {
+  let vers = JSON.parse(versions)
+  localStorage.setItem('hostAppVersion', vers.sketchup)
+  localStorage.setItem('speckleVersion', vers.speckle)
+}
+
 global.loadAccounts = function (accounts) {
   console.log('>>> SpeckleSketchup: Loading accounts', accounts)
   localStorage.setItem('localAccounts', JSON.stringify(accounts))
   let uuid = localStorage.getItem('uuid')
   if (accounts.length !== 0){
     if (uuid) {
-      global.setSelectedAccount(accounts.find((acct) => acct['userInfo']['id'] == uuid))
+      global.setSelectedAccount(accounts.find((acct) => acct['userInfo']['id'] === uuid))
     } else {
       global.setSelectedAccount(accounts.find((acct) => acct['isDefault']))
     }
@@ -176,15 +186,22 @@ export default {
       this.$vuetify.theme.dark = this.preferences.user.dark_theme
     })
 
+    // Collect versions to inform mixpanel
+    sketchup.exec({name: "collect_versions", data: {}})
+
+    // Collect preferences to render UI according to it
     sketchup.exec({name: "collect_preferences", data: {}})
-    // this.$vuetify.theme.dark = localStorage.getItem('theme') == 'dark'
+
+    // Collect accounts from 'Accounts.db' by ruby sqlite3
     sketchup.exec({name: "init_local_accounts", data: {}})
   },
   methods: {
-
     accounts() {
       return JSON.parse(localStorage.getItem('localAccounts'))
     },
+    activeAccount(){
+      return this.accounts().find((account) => account['isDefault'])
+    },
     switchAccount(account) {
       this.$mixpanel.track('Connector Action', { name: 'Account Select' })
       global.setSelectedAccount(account)

ui/src/components/GlobalToast.vue

@@ -1,6 +1,8 @@
 <template>
-  <v-snackbar v-model="snack" app bottom color="primary">
-    {{ text }}
+  <v-snackbar v-if="text" v-model="snack" app bottom :color="color">
+    <div v-for="(line, index) in text.split('\n')" :key="index">
+      {{ line }}
+    </div>
     <template #action="{}">
       <v-btn v-if="actionName" small outlined @click="openUrl(url)" @click:append="snack = false">
         {{ actionName }}
@@ -16,6 +18,7 @@ export default {
   data() {
     return {
       snack: false,
+      color: "primary",
       text: null,
       actionName: null,
       url: null
@@ -33,6 +36,14 @@ export default {
   mounted() {
     this.$eventHub.$on('notification', (args) => {
       this.snack = true
+      this.color = "primary"
+      this.text = args.text
+      this.actionName = args.action ? args.action.name : null
+      this.url = args.action ? args.action.url : null
+    })
+    this.$eventHub.$on('error', (args) => {
+      this.snack = true
+      this.color = "#CC3300"
       this.text = args.text
       this.actionName = args.action ? args.action.name : null
       this.url = args.action ? args.action.url : null

ui/src/components/StreamCard.vue

@@ -55,7 +55,7 @@
       <timeago class="mr-1" :datetime="stream.updatedAt" />
       |
       <v-icon class="ml-1" small>mdi-account-key-outline</v-icon>
-      {{ stream.role.split(':')[1] }}
+      {{ stream.role === null ? "" : stream.role.split(':')[1] }}
     </v-card-text>
     <v-card-text class="d-flex align-center pb-5 mb-5 -mt-2" style="height: 50px">
       <v-menu offset-y>
@@ -401,7 +401,7 @@ export default {
         this.loadingSend = false
         this.loadingStage = null
         this.$eventHub.$emit('notification', {
-          text: 'No objects selected. Nothing was sent.'
+          text: 'No objects selected. Nothing was sent.\n'
         })
         return
       }
@@ -455,7 +455,7 @@ export default {
         })
         console.log('>>> SpeckleSketchUp: Sent to stream: ' + this.streamId, commit)
         this.$eventHub.$emit('notification', {
-          text: 'Model selection sent!',
+          text: 'Model selection sent!\n',
           action: {
             name: 'View in Web',
             url: `${localStorage.getItem('serverUrl')}/streams/${this.streamId}/commits/${

ui/src/components/dialogs/CreateBranchDialog.vue

@@ -89,10 +89,7 @@ export default {
   computed: {
     loggedIn() {
       return localStorage.getItem('SpeckleSketchup.AuthToken') !== null
-    },
-    accounts() {
-      return JSON.parse(localStorage.getItem('localAccounts'))
-    },
+    }
   },
   methods: {
     async createBranch(){

ui/src/components/dialogs/CreateStreamDialog.vue

@@ -92,7 +92,6 @@
         </v-dialog>
 
         <!-- DIALOG: Add a Stream by ID or URL -->
-        <!--
         <v-dialog v-model="showCreateStreamById">
           <template #activator="{ on, attrs }">
             <v-btn
@@ -141,14 +140,13 @@
                   :disabled="createStreamByIdText === ''"
                   color="blue darken-1"
                   text
-                  @click="showCreateStreamById = false"
+                  @click="getStream"
               >
                 Add
               </v-btn>
             </v-card-actions>
           </v-card>
         </v-dialog>
-        -->
       </v-col>
     </v-row>
   </v-container>
@@ -159,9 +157,20 @@
 import gql from "graphql-tag";
 import {bus} from "@/main";
 import userQuery from "@/graphql/user.gql";
+import {StreamWrapper} from "@/utils/streamWrapper";
 
 export default {
   name: "CreateStreamDialog",
+  props: {
+    accountId: {
+      type: String,
+      default: null
+    },
+    serverUrl: {
+      type: String,
+      default: null
+    }
+  },
   data() {
     return {
       showCreateNewStream: false,
@@ -177,10 +186,7 @@ export default {
   computed: {
     loggedIn() {
       return localStorage.getItem('SpeckleSketchup.AuthToken') !== null
-    },
-    accounts() {
-      return JSON.parse(localStorage.getItem('localAccounts'))
-    },
+    }
   },
   apollo: {
     user: {
@@ -188,16 +194,70 @@ export default {
     }
   },
   methods: {
-    activeAccount(){
-      return JSON.parse(localStorage.getItem('selectedAccount'))
-    },
-    switchAccountToCreateStream(account) {
-      this.accountToCreateStream = account
-    },
     refresh() {
       this.$apollo.queries.user.refetch()
       bus.$emit('refresh-streams')
     },
+    async getStream(){
+      try {
+        const streamWrapper = new StreamWrapper(this.createStreamByIdText, this.accountId, this.serverUrl)
+        let res = await this.$apollo.query({
+          query: gql`
+            query Stream($id: String!){
+              stream(id: $id){
+                id
+                name
+                description
+                isPublic
+                role
+                createdAt
+                updatedAt
+                commentCount
+                favoritedDate
+                favoritesCount
+                collaborators {
+                  id
+                  name
+                  role
+                  avatar
+                },
+                branches (limit: ${10}){
+                  totalCount,
+                  cursor,
+                  items {
+                    id,
+                    name,
+                    description,
+                    commits {
+                      totalCount
+                    }
+                  }
+                }
+              }
+            }
+          `,
+          variables: {
+            id: streamWrapper.streamId
+          }
+        })
+        let stream = res.data.stream
+
+        this.$eventHub.$emit('notification', {
+          text: 'Stream Added by URL!\n',
+        })
+        bus.$emit('stream-added-by-id-or-url', stream.id)
+      }
+      catch (e){
+        this.$eventHub.$emit('error', {
+          text: 'The stream you are trying to add might;\n' +
+              '- lies on different server, \n' +
+              '- be private, \n' +
+              '- not be existed anymore.',
+        })
+      }
+
+      this.showCreateStreamById = false
+    },
     async createStream(){
       let res = await this.$apollo.mutate({
         mutation: gql`

ui/src/components/dialogs/SettingsDialog.vue

@@ -35,6 +35,35 @@
             class="pt-1 my-n5"
             :label="'Include entity attributes'"
         />
+        <v-icon class="ml-3" style="line-height: 0;">mdi-arrow-right-bottom</v-icon>
+        <v-switch
+            v-model="includeEdgeAttributes"
+            class="pt-1 my-n5 ml-10"
+            :label="'Edge'"
+            :disabled="!includeAttributes"
+        />
+        <v-icon class="ml-3" style="line-height: 0;">mdi-arrow-right-bottom</v-icon>
+        <v-switch
+            v-model="includeFaceAttributes"
+            class="pt-1 my-n5 ml-10"
+            :label="'Face'"
+            :disabled="!includeAttributes"
+        />
+        <v-icon class="ml-3" style="line-height: 0;">mdi-arrow-right-bottom</v-icon>
+        <v-switch
+            v-model="includeGroupAttributes"
+            class="pt-1 my-n5 ml-10"
+            :label="'Group'"
+            :disabled="!includeAttributes"
+        />
+        <v-icon class="ml-3" style="line-height: 0;">mdi-arrow-right-bottom</v-icon>
+        <v-switch
+            v-model="includeComponentAttributes"
+            class="pt-1 my-n5 ml-10"
+            :label="'Component'"
+            :disabled="!includeAttributes"
+        />
+
         <div class="sm1 mt-3">Receive Strategy</div>
         <v-divider class="mb-2"/>
         <v-switch
@@ -78,6 +107,10 @@ export default {
       description: "",
       combineFacesByMaterial: this.preferences.model.combine_faces_by_material,
       includeAttributes: this.preferences.model.include_entity_attributes,
+      includeFaceAttributes: this.preferences.model.include_face_entity_attributes,
+      includeEdgeAttributes: this.preferences.model.include_edge_entity_attributes,
+      includeGroupAttributes: this.preferences.model.include_group_entity_attributes,
+      includeComponentAttributes: this.preferences.model.include_component_entity_attributes,
       mergeCoplanarFaces: this.preferences.model.merge_coplanar_faces,
     }
   },
@@ -110,6 +143,46 @@ export default {
       },
       deep: true
     },
+    'includeFaceAttributes': {
+      handler(newValue) {
+        sketchup.exec({
+          name: "model_preferences_updated",
+          data: {preference: "include_face_entity_attributes", value: newValue}
+        })
+        this.$mixpanel.track('Connector Action', { name: 'Include Face Entity Attributes Option' })
+      },
+      deep: true
+    },
+    'includeEdgeAttributes': {
+      handler(newValue) {
+        sketchup.exec({
+          name: "model_preferences_updated",
+          data: {preference: "include_edge_entity_attributes", value: newValue}
+        })
+        this.$mixpanel.track('Connector Action', { name: 'Include Edge Entity Attributes Option' })
+      },
+      deep: true
+    },
+    'includeGroupAttributes': {
+      handler(newValue) {
+        sketchup.exec({
+          name: "model_preferences_updated",
+          data: {preference: "include_group_entity_attributes", value: newValue}
+        })
+        this.$mixpanel.track('Connector Action', { name: 'Include Group Entity Attributes Option' })
+      },
+      deep: true
+    },
+    'includeComponentAttributes': {
+      handler(newValue) {
+        sketchup.exec({
+          name: "model_preferences_updated",
+          data: {preference: "include_component_entity_attributes", value: newValue}
+        })
+        this.$mixpanel.track('Connector Action', { name: 'Include Component Entity Attributes Option' })
+      },
+      deep: true
+    },
     'mergeCoplanarFaces': {
       handler(newValue) {
         sketchup.exec({

ui/src/plugins/speckle-metrics.js

@@ -10,9 +10,12 @@ const SpeckleMetrics = {
 
     Vue.prototype.$mixpanel = mixpanel
     Vue.prototype.$mixpanel.init(token, config)
-    Vue.prototype.$mixpanel.register({ hostApp: 'sketchup', type: 'action' })
 
     Vue.prototype.$refreshMixpanelIds = function () {
+      // 1. It logs out the user and removes out the registered props.
+      Vue.prototype.$mixpanel.reset()
+
+      // 2. create hashes for user distinction
       let distinctId =
         '@' +
         crypto
@@ -29,12 +32,20 @@ const SpeckleMetrics = {
         .digest('hex')
         .toUpperCase()
 
+      // 3. Setting super properties that will be sent with every event
       Vue.prototype.$mixpanel.register({
-        // eslint-disable-next-line camelcase
-        distinct_id: distinctId,
-        // eslint-disable-next-line camelcase
+        hostApp: 'sketchup',
+        type: 'action',
+        hostAppVersion: localStorage.getItem('hostAppVersion'),
+        core_version: localStorage.getItem('speckleVersion'),
         server_id: serverId
       })
+
+      // 4. Logging into user
+      Vue.prototype.$mixpanel.identify(distinctId)
+
+      // 5. If it is a registered user we can consider it is identified
+      Vue.prototype.$mixpanel.people.set("Identified", true)
     }
   }
 }

ui/src/utils/streamWrapper.js

@@ -0,0 +1,77 @@
+require('url')
+
+export class StreamWrapper {
+    constructor(streamIdOrUrl, accountId, serverUrl) {
+        this.originalOutput = streamIdOrUrl
+        try {
+            this.streamWrapperFromUrl(streamIdOrUrl)
+        }
+        catch (e){
+            this.serverUrl = serverUrl
+            this.userId = accountId
+            this.streamId = streamIdOrUrl
+        }
+    }
+
+    streamWrapperFromUrl(streamUrl){
+        this.url = new URL(streamUrl)
+        this.segments = this.url.pathname.split('/').map((segment) => segment + '/')
+        this.serverUrl = this.url.origin
+
+        if (this.segments.length >= 4 && this.segments[3]?.toLowerCase() === "branches/"){
+            this.streamId = this.segments[2].replace("/", "")
+            if (this.segments.length > 5)
+            {
+                let branchSegments = this.segments.slice(4, this.segments.length - 1);
+                this.branchName = branchSegments.join("")
+            }
+            else
+            {
+                this.branchName = this.segments[4]
+            }
+        } else {
+            switch (this.segments.length){
+                case 3: // ie http://speckle.server/streams/8fecc9aa6d
+                    if (this.segments[1].toLowerCase() === "streams/")
+                        this.streamId = this.segments[2].replace("/", "");
+                    else
+                        throw new Error(`Cannot parse ${this.originalOutput} into a stream wrapper class`);
+                    break;
+                case 4: // ie https://speckle.server/streams/0c6ad366c4/globals/
+                    if (this.segments[3].toLowerCase().startsWith("globals"))
+                    {
+                        this.streamId = this.segments[2].replace("/", "");
+                        this.branchName = this.segments[3].replace("/", "");
+                    }
+                    else
+                        throw new Error(`Cannot parse ${this.originalOutput} into a stream wrapper class`);
+                    break;
+                case 5: // ie http://speckle.server/streams/8fecc9aa6d/commits/76a23d7179
+                    switch (this.segments[3].toLowerCase()){
+                        case "commits/":
+                            this.streamId = this.segments[2].replace("/", "");
+                            this.commitId = this.segments[4].replace("/", "");
+                            break;
+                        case "globals/":
+                            this.streamId = this.segments[2].replace("/", "");
+                            this.branchName = this.segments[3].replace("/", "");
+                            this.commitId = this.segments[4].replace("/", "");
+                            break;
+                        case "branches/":
+                            this.streamId = this.segments[2].replace("/", "");
+                            this.branchName = this.segments[4].replace("/", "");
+                            break;
+                        case "objects/":
+                            this.streamId = this.segments[2].replace("/", "");
+                            this.objectId = this.segments[4].replace("/", "");
+                            break;
+                        default:
+                            throw new Error(`Cannot parse ${this.originalOutput} into a stream wrapper class`);
+                    }
+                    break;
+                default:
+                    throw new Error(`Cannot parse ${this.originalOutput} into a stream wrapper class`);
+            }
+        }
+    }
+}

ui/src/views/Streams.vue

@@ -77,10 +77,20 @@ export default {
       this.$apollo.queries.streams.refetch()
       // TODO: We should set previously selected branches and commits after refetch
     })
-
     bus.$on('set-saved-streams', (streamIds) => {
       this.savedStreams = streamIds
     })
+    bus.$on('stream-added-by-id-or-url', (streamId) => {
+      if (!this.savedStreams){
+        this.savedStreams = []
+        this.savedStreams.push(streamId)
+      } else {
+        if (!this.savedStreams.includes(streamId)){
+          this.savedStreams.push(streamId)
+        }
+      }
+      sketchup.exec({name: "save_stream", data: {stream_id: streamId}})
+    })
     sketchup.exec({name: "load_saved_streams", data: {}})
     console.log('LAUNCHED')
     this.$mixpanel.track('Connector Action', { name: 'Launched' })