Fix activeAccount

speckle_connector/src/constants/pref_constants.rb

@@ -15,7 +15,7 @@ module SpeckleConnector
     Sketchup::ComponentInstance => INCLUDE_COMPONENT_ENTITY_ATTRIBUTES,
     Sketchup::Group => INCLUDE_GROUP_ENTITY_ATTRIBUTES,
     Sketchup::Face => INCLUDE_FACE_ENTITY_ATTRIBUTES,
-    Sketchup::Edge => INCLUDE_EDGE_ENTITY_ATTRIBUTES
+    Sketchup::Face => INCLUDE_EDGE_ENTITY_ATTRIBUTES
   }.freeze
 
   LEVEL_SHIFT_VALUE = SpeckleObjects::Geometry.length_to_native(1.5, 'm')

speckle_connector/src/speckle_objects/other/block_instance.rb

@@ -84,7 +84,7 @@ module SpeckleConnector
           speckle_state = new_speckle_state
 
           dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
-                         .attribute_dictionaries_to_speckle(component_instance, preferences[:model])
+                         .attribute_dictionaries_to_speckle(component_instance, preferences)
           att = dictionaries.any? ? { dictionaries: dictionaries } : {}
           speckle_schema = SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler
                            .speckle_schema_to_speckle(component_instance)

ui/src/components/MapperSource.vue

@@ -145,8 +145,7 @@ export default {
       prefetch: true,
       variables() {
         return {
-          id: this.sourceStreamId,
-          limit: 100
+          id: this.sourceStreamId
         }
       },
       skip() {

ui/src/components/StreamCard.vue

@@ -221,8 +221,7 @@ export default {
       query: streamQuery,
       variables() {
         return {
-          id: this.streamId,
-          limit: 100
+          id: this.streamId
         }
       }
     },

ui/src/components/dialogs/CreateStreamDialog.vue

@@ -205,7 +205,7 @@ export default {
     },
     async getStream(){
       try {
-        const streamWrapper = new StreamWrapper(this.createStreamByIdText, this.accountId, this.serverUrl)
+        const streamWrapper = new StreamWrapper(this.createStreamByIdText, this.accountId, this.serverUrl, localStorage.getItem('frontend2') === 'true')
         let res = await this.$apollo.query({
           query: gql`
             query Stream($id: String!){

ui/src/graphql/stream.gql

@@ -1,4 +1,4 @@
-query Stream($id: String!, $limit: Int!) {
+query Stream($id: String!) {
   stream(id: $id) {
     id
     name
@@ -27,7 +27,7 @@ query Stream($id: String!, $limit: Int!) {
         referencedObject
       }
     }
-    branches (limit: $limit) {
+    branches {
       totalCount
       items {
         id

ui/src/utils/streamWrapper.js

@@ -1,12 +1,12 @@
 require('url')
 
 export class StreamWrapper {
-    constructor(streamIdOrUrl, accountId, serverUrl) {
-        this.isFE2 = this.checkIsFE2(streamIdOrUrl)
+    constructor(streamIdOrUrl, accountId, serverUrl, isFE2) {
+        this.isFE2 = isFE2
         this.streamsKey = this.isFE2 ? 'projects/': 'streams/'
         this.branchesKey = this.isFE2 ? 'models/': 'branches/'
         this.commitsKey = this.isFE2 ? 'versions/': 'commits/'
-        this.originalOutput = streamIdOrUrl        
+        this.originalOutput = streamIdOrUrl
         try {
             this.streamWrapperFromUrl(streamIdOrUrl)
         }
@@ -17,12 +17,6 @@ export class StreamWrapper {
         }
     }
 
-    checkIsFE2(streamUrl){
-        const fe2UrlRegex = /\/projects\/(?<projectId>[\w\d]+)(?:\/models\/(?<model>[\w\d]+(?:@[\w\d]+)?)(?:,(?<additionalModels>[\w\d]+(?:@[\w\d]+)?))*)?/
-        const match = fe2UrlRegex.exec(streamUrl);
-        return match !== null;
-    }
-
     streamWrapperFromUrl(streamUrl){
         this.url = new URL(streamUrl)
         this.segments = this.url.pathname.split('/').map((segment) => segment + '/')