Merge pull request #198 from specklesystems/dogukan/remove-access-token-auth

feat (data): remove token and anonymous authentication

README.md

@@ -3,18 +3,26 @@
   Speckle | Power BI
 </h1>
 
-<p align="center"><a href="https://twitter.com/SpeckleSystems"><img src="https://img.shields.io/twitter/follow/SpeckleSystems?style=social" alt="Twitter Follow"></a> <a href="https://speckle.community"><img src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&amp;style=flat-square&amp;logo=discourse&amp;logoColor=white" alt="Community forum users"></a> <a href="https://speckle.systems"><img src="https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square" alt="website"></a> <a href="https://speckle.guide/dev/"><img src="https://img.shields.io/badge/docs-speckle.guide-orange?style=flat-square&amp;logo=read-the-docs&amp;logoColor=white" alt="docs"></a></p>
+<p align="center"><a href="https://twitter.com/SpeckleSystems"><img src="https://img.shields.io/twitter/follow/SpeckleSystems?style=social" alt="Twitter Follow"></a> <a href="https://speckle.community"><img src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&amp;style=flat-square&amp;logo=discourse&amp;logoColor=white" alt="Community forum users"></a> <a href="https://speckle.systems"><img src="https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square" alt="website"></a> <a href="https://docs.speckle.systems/"><img src="https://img.shields.io/badge/docs-speckle.systems-orange?style=flat-square&amp;logo=read-the-docs&amp;logoColor=white" alt="docs"></a></p>
 
 > Speckle is the first AEC data hub that connects with your favorite AEC tools. Speckle exists to overcome the challenges of working in a fragmented industry where communication, creative workflows, and the exchange of data are often hindered by siloed software and processes. It is here to make the industry better.
 
 <h3 align="center">
-    Speckle Connector and 3D Viewer Visual for Power BI
+    Speckle Connector and 3D Visual for Power BI
 </h3>
 
-# Features
+## Features
 
 Speckle Power BI Data Connector lets you easily get data from Speckle into Power BI reports and visualizations. You can access and analyze data from various AEC apps (like Revit, Archicad, Grasshopper, and more) and open-source files (IFC, STL, OBJ, etc.) into Power BI with ease. 
 
+<p align="center">
+  <div align="center">
+    <a href="https://app.speckle.systems/connectors/">
+      Download Power BI Connector
+    </a>
+  </div>
+</p>
+
 Speckle’s connection to Power BI consists of two parts:
 
 - **Data Connector** fetches the data you uploaded from AEC apps to Speckle.
@@ -22,19 +30,19 @@ Speckle’s connection to Power BI consists of two parts:
 
 ![Desktop - 1 (1)](https://github.com/specklesystems/speckle-powerbi/assets/51519350/6d2c5224-965f-4eae-b869-be26cb48c6b2)
 
-# Repo Structure
+## Repository Structure
 
-This repo is home to our Power BI connector. The Speckle Server provides all the web-facing functionality and can be found [here](https://github.com/specklesystems/Server).
+This repository is home to our Power BI connector. The Speckle Server provides all the web-facing functionality and can be found [here](https://github.com/specklesystems/Server).
 
 `src/powerbi-data-connector` contains all the code for the Data connector.
 
 `src/powerbi-visual` contains all the code for 3D Visual.
 
-# Installation
+## Installation
 
-Speckle connector can be installed directly from the [connectors portal](https://app.speckle.systems/connectors/). Full instructions for [installation](https://speckle.guide/user/powerbi/installation.html) and [configuration](https://speckle.guide/user/powerbi/configuration.html) can be found on our docs.
+Power BI connector installer can be downloaded from the [connectors portal](https://app.speckle.systems/connectors/). Full instructions for [installation](https://docs.speckle.systems/connectors/power-bi#setup) and [configuration](https://docs.speckle.systems/connectors/power-bi#why-dont-i-see-speckle-as-a-data-source-in-power-bi) can be found on our docs.
 
-# Using 3D Visual
+### 3D Visual
 
 3D Visual can be imported as any other Power BI custom visual.
 
@@ -43,34 +51,62 @@ Speckle connector can be installed directly from the [connectors portal](https:/
 3. Go to `Documents/Power BI Desktop/Custom Visuals` and import `Speckle 3D Visual.pbiviz` file.
 4. Speckle cube will appear in the Visualization pane.
 
-For more on how to use the visual, [check our docs](https://speckle.guide/user/powerbi-visual/introduction.html).
+For more on how to use the visual, [check our docs](https://docs.speckle.systems/connectors/power-bi).
 
-# Usage
+## Quick Start
 
-To get started with Power BI connectors, please take a look at the [documentation](https://speckle.guide/user/powerbi/introduction.html) and extensive [tutorials](https://www.youtube.com/playlist?list=PLlI5Dyt2HaEsZHG2WJ75WIM0Brx6VHT2S) published. 
+To get started with Power BI connector, please take a look at the [documentation](https://docs.speckle.systems/connectors/power-bi) and extensive [tutorials](https://www.youtube.com/@SpeckleSystems) published. 
 
-# **Developing & Debugging**
+## Development Setup
 
-We encourage everyone interested to debug/hack/contribute/give feedback to this project.
+### For local development of the 3D Visual
 
-## **Setup**
+1. **Clone the repository**:
+   ```bash
+   git clone https://github.com/specklesystems/speckle-powerbi.git
+   cd speckle-powerbi
+   ```
 
-### **Install PowerQuery SDK**
+2. **Navigate to the visual directory**:
+   ```bash
+   cd src/powerbi-visual
+   ```
 
-Follow the instructions from the [official docs](https://docs.microsoft.com/en-us/power-query/installingsdk)
+3. **Install dependencies**:
+   ```bash
+   npm install
+   # or
+   yarn install
+   ```
 
-### **Build with Visual Studio**
+4. **Start development server**:
+   ```bash
+   npm run dev
+   ```
 
-Every time you build the connector, VisualStudio will copy the latest `.mez` connector file to the appropriate location. Just restart PowerBI to see the latest changes.
+5. **Build the visual**:
+   ```bash
+   # Development build
+   npm run build:dev
+   
+   # Production build
+   npm run build
+   ```
 
-### **Debug**
+### For local development of the Data Connector
 
-You can start the PowerQuery connector in VisualStudio, this will open a standalone connector you can use for testing purposes.
+1. **Install PowerQuery SDK**:
+   Follow the instructions from the [official docs](https://docs.microsoft.com/en-us/power-query/installingsdk)
 
-We don't know of a way to debug the connector live in PowerBI, but we'd be happy to hear about it.
+2. **Open the project in Visual Studio Code**:
+   - Open `src/powerbi-data-connector/Speckle.proj`
+   - Build the project to generate the `.mez` file
 
+3. **Testing the connector**:
+   - Visual Studio will automatically copy the `.mez` file to the appropriate location
+   - Restart Power BI Desktop to see the latest changes
 
-# About Speckle
+## About Speckle
 
 What is Speckle? Check our ![YouTube Video Views](https://img.shields.io/youtube/views/B9humiSpHzM?label=Speckle%20in%201%20minute%20video&style=social)
 
@@ -91,12 +127,10 @@ What is Speckle? Check our ![YouTube Video Views](https://img.shields.io/youtube
 
 Give Speckle a try in no time by:
 
-- [![app.speckle.systems](https://img.shields.io/badge/https://-speckle.xyz-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](https://app.speckle.systems) ⇒ creating an account at our public server
+- [![app.speckle.systems](https://img.shields.io/badge/https://-app.speckle.systems-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](https://app.speckle.systems) ⇒ creating an account at our public server
 
 ### Resources
 
 - [![Community forum users](https://img.shields.io/badge/community-forum-green?style=for-the-badge&logo=discourse&logoColor=white)](https://speckle.community) for help, feature requests or just to hang with other speckle enthusiasts, check out our community forum!
 - [![website](https://img.shields.io/badge/tutorials-speckle.systems-royalblue?style=for-the-badge&logo=youtube)](https://speckle.systems) our tutorials portal is full of resources to get you started using Speckle
-- [![docs](https://img.shields.io/badge/docs-speckle.guide-orange?style=for-the-badge&logo=read-the-docs&logoColor=white)](https://speckle.guide/dev/) reference on almost any end-user and developer functionality
-
-![Untitled](https://user-images.githubusercontent.com/2679513/132021739-15140299-624d-4410-98dc-b6ae6d9027ab.png)
+- [![docs](https://img.shields.io/badge/docs-speckle.systems-orange?style=for-the-badge&logo=read-the-docs&logoColor=white)](https://docs.speckle.systems) reference on almost any end-user and developer functionality

src/powerbi-data-connector/Speckle.pq

@@ -4,6 +4,79 @@ section Speckle;
 AuthAppId = "spklpwerbi";
 AuthAppSecret = "spklpwerbi";
 
+// PKCE helper functions for enhanced OAuth2 security
+Base64UrlEncode = (binaryData as binary) =>
+    let
+        // Convert binary to base64
+        base64 = Binary.ToText(binaryData, BinaryEncoding.Base64),
+        // Convert to base64url by replacing characters and removing padding
+        base64url = Text.Replace(Text.Replace(Text.Replace(base64, "+", "-"), "/", "_"), "=", "")
+    in
+        base64url;
+
+GeneratePKCEVerifier = () =>
+    let
+        // Generate cryptographically secure random string using allowed characters
+        // RFC 7636: [A-Z] / [a-z] / [0-9] / "-" / "." / "_" / "~"
+        allowedChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
+        
+        // Generate multiple GUIDs to create entropy
+        guid1 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "{", ""),
+        guid2 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "}", ""),
+        guid3 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "{", ""),
+        guid4 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "}", ""),
+        
+        // Combine and convert to allowed characters
+        combined = guid1 & guid2 & guid3 & guid4,
+        
+        // Map hex characters to allowed PKCE characters
+        mapped = Text.Replace(
+            Text.Replace(
+                Text.Replace(
+                    Text.Replace(
+                        Text.Replace(
+                            Text.Replace(combined, "0", "A"),
+                            "1", "B"),
+                        "2", "C"),
+                    "3", "D"),
+                "4", "E"),
+            "5", "F"),
+        
+        // Continue mapping remaining hex chars to allowed chars
+        verifier = Text.Replace(
+            Text.Replace(
+                Text.Replace(
+                    Text.Replace(
+                        Text.Replace(
+                            Text.Replace(
+                                Text.Replace(
+                                    Text.Replace(
+                                        Text.Replace(
+                                            Text.Replace(mapped, "6", "G"),
+                                            "7", "H"),
+                                        "8", "I"),
+                                    "9", "J"),
+                                "a", "K"),
+                            "b", "L"),
+                        "c", "M"),
+                    "d", "N"),
+                "e", "O"),
+            "f", "P"),
+        
+        // Ensure length is between 43-128 characters as per RFC 7636
+        finalVerifier = Text.Start(verifier, 43)
+    in
+        finalVerifier;
+
+GeneratePKCEChallenge = (verifier as text) =>
+    let
+        // Create SHA256 hash of the verifier as required by RFC 7636
+        hash = Crypto.CreateHash(CryptoAlgorithm.SHA256, Text.ToBinary(verifier, TextEncoding.Ascii)),
+        // Convert to base64url encoding
+        challenge = Base64UrlEncode(hash)
+    in
+        challenge;
+
 // function to load `pqm` files - this is essential and must be kept
 shared Speckle.LoadFunction = (fileName as text) =>
     let
@@ -77,7 +150,7 @@ shared Speckle.GetWorkspace = Value.ReplaceType(
 
 shared Speckle.Objects.Properties = Value.ReplaceType(
     Speckle.LoadFunction("Objects.Properties.pqm"),
-    type function (inputRecord as record, optional filterKeys as list) as record
+    type function (inputRecord as any, optional filterKeys as list, optional parentPath as text, optional existingFields as list) as record
 );
 
 
@@ -106,6 +179,16 @@ shared Speckle.Objects.MaterialQuantities = Value.ReplaceType(
     type function (objectRecord as record, optional outputAsList as logical) as any
 );
 
+shared Speckle.Models.Federate = Value.ReplaceType(
+    Speckle.LoadFunction("Models.Federate.pqm"),
+    type function (tables as list, optional excludeData as logical) as table
+);
+
+shared Speckle.Models.MaterialQuantities = Value.ReplaceType(
+    Speckle.LoadFunction("Models.MaterialQuantities.pqm"),
+    type function (inputTable as table, optional addPrefix as logical) as table
+);
+
 [DataSource.Kind = "Speckle", Publish="GetByUrl.Publish"]
 shared Speckle.GetByUrl = Value.ReplaceType(
     Speckle.LoadFunction("GetByUrl.pqm"),
@@ -164,7 +247,7 @@ GetByUrl.Icons = [
 Speckle = [
     // This is used when running the connector on an on-premises data gateway
     TestConnection = (path) => {"Speckle.GetUser", path},
-    // Authentication strategy
+    // Authentication strategy - OAuth only
     Authentication = [
         OAuth = [
             Label = "Speckle Account",
@@ -172,14 +255,21 @@ Speckle = [
                 let
                     server = Text.Combine(
                         {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
-                    )
+                    ),
+                    // Generate PKCE parameters for enhanced security
+                    codeVerifier = GeneratePKCEVerifier(),
+                    codeChallenge = GeneratePKCEChallenge(codeVerifier),
+                    // Build authorization URL with PKCE parameters
+                    authUrl = Text.Combine({server, "authn", "verify", AuthAppId, state}, "/") &
+                        "?code_challenge=" & codeChallenge &
+                        "&code_challenge_method=S256"
                 in
                     [
-                        LoginUri = Text.Combine({server, "authn", "verify", AuthAppId, state}, "/"),
+                        LoginUri = authUrl,
                         CallbackUri = "https://oauth.powerbi.com/views/oauthredirect.html",
                         WindowHeight = 800,
                         WindowWidth = 600,
-                        Context = null
+                        Context = [code_verifier = codeVerifier]
                     ],
             FinishLogin = (clientApplication, dataSourcePath, context, callbackUri, state) =>
                 let
@@ -187,20 +277,22 @@ Speckle = [
                         {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
                     ),
                     Parts = Uri.Parts(callbackUri)[Query],
+                    // Extract code verifier from context for PKCE
+                    codeVerifier = if context <> null then context[code_verifier] else null,
+                    // Build token request with PKCE parameters
+                    tokenRequest = [
+                        accessCode = Parts[access_code],
+                        appId = AuthAppId,
+                        appSecret = AuthAppSecret,
+                        challenge = state
+                    ] & (if codeVerifier <> null then [code_verifier = codeVerifier] else []),
                     Source = Web.Contents(
                         Text.Combine({server, "auth", "token"}, "/"),
                         [
                             Headers = [
                                 #"Content-Type" = "application/json"
                             ],
-                            Content = Json.FromValue(
-                                [
-                                    accessCode = Parts[access_code],
-                                    appId = AuthAppId,
-                                    appSecret = AuthAppSecret,
-                                    challenge = state
-                                ]
-                            )
+                            Content = Json.FromValue(tokenRequest)
                         ]
                     ),
                     json = Json.Document(Source)
@@ -216,7 +308,8 @@ Speckle = [
                     server = Text.Combine(
                         {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
                     ),
-                    Source = Web.Contents(
+                    // Enhanced refresh with error handling for gateway compatibility
+                    Source = try Web.Contents(
                         Text.Combine({server, "auth", "token"}, "/"),
                         [
                             Headers = [
@@ -228,24 +321,42 @@ Speckle = [
                                     appId = AuthAppId,
                                     appSecret = AuthAppSecret
                                 ]
-                            )
+                            ),
+                            ManualStatusHandling = {400, 401, 403, 500, 502, 503, 504}
+                        ]
+                    ) otherwise null,
+                    
+                    // Check if request was successful
+                    IsSuccess = Source <> null,
+                    
+                    // If successful, parse the response
+                    json = if IsSuccess then
+                        try Json.Document(Source) otherwise null
+                    else
+                        null,
+                    
+                    // Validate the response contains expected fields
+                    IsValidResponse = json <> null and Record.HasFields(json, {"token"}),
+                    
+                    // Return result with enhanced error handling
+                    result = if IsValidResponse then
+                        [
+                            access_token = json[token],
+                            scope = null,
+                            token_type = "bearer",
+                            refresh_token = json[refreshToken]
+                        ]
+                    else
+                        error [
+                            Reason = "TokenRefreshFailed",
+                            Message = "Failed to refresh OAuth token - please re-authenticate",
+                            Detail = [
+                                Server = server,
+                                RefreshToken = if refreshToken = null then "null" else "present"
+                            ]
                         ]
-                    ),
-                    json = Json.Document(Source)
                 in
-                    [
-                        access_token = json[token],
-                        scope = null,
-                        token_type = "bearer",
-                        refresh_token = json[refreshToken]
-                    ]
-        ],
-        Key = [
-            KeyLabel = "Personal Access Token",
-            Label = "Private Project"
-        ],
-        Implicit = [
-            Label = "Public Project"
+                    result
         ]
     ],
     Label = "Speckle"

src/powerbi-data-connector/speckle/api/Api.Fetch.pqm

@@ -1,6 +1,8 @@
 (server as text, optional query as text, optional variables as record) as record =>
     let
-        apiKey = try Extension.CurrentCredential()[Key] otherwise null,
+        // Enhanced credential retrieval with OAuth2 support
+        apiKey = try Extension.CurrentCredential()[access_token] otherwise null,
+        
         defaultQuery = "query {
                 activeUser {
                     email 
@@ -12,7 +14,9 @@
                     version
                 }
             }",
-        Source = Web.Contents(
+        
+        // Enhanced API call with comprehensive error handling
+        Source = try Web.Contents(
             Text.Combine({server, "graphql"}, "/"),
             [
                 Headers = [
@@ -20,14 +24,56 @@
                     #"Content-Type" = "application/json",
                     #"Authorization" = if apiKey = null then "" else Text.Format("Bearer #{0}", {apiKey})
                 ],
-                ManualStatusHandling = {400},
+                ManualStatusHandling = {400, 401, 403, 404, 500, 502, 503, 504},
                 Content = Json.FromValue([query = Text.From(query ?? defaultQuery), variables = variables])
             ]
-        ),
-        #"JSON" = Json.Document(Source)
-    in
-        // Check if response contains errors, if so, return first error.
-        if Record.HasFields(#"JSON", {"errors"}) then
-            error #"JSON"[errors]{0}[message]
+        ) otherwise null,
+        
+        // Check if the HTTP request was successful
+        IsHttpSuccess = Source <> null,
+        
+        // Get HTTP status code for detailed error handling
+        StatusCode = if IsHttpSuccess then Value.Metadata(Source)[Response.Status] else null,
+        
+        // Parse JSON response if HTTP request was successful
+        #"JSON" = if IsHttpSuccess then
+            try Json.Document(Source) otherwise null
         else
-            #"JSON"[data]
+            null,
+        
+        // Comprehensive error handling
+        // Comprehensive error handling
+        result = if not IsHttpSuccess then
+            error [
+                Reason = "HttpRequestFailed",
+                Message = "Failed to connect to Speckle server",
+                Detail = [Server = server, StatusCode = StatusCode]
+            ]
+        else if StatusCode = 401 then
+            error [
+                Reason = "AuthenticationFailed",
+                Message = "Invalid or expired authentication token",
+                Detail = [Server = server, HasToken = apiKey <> null]
+            ]
+        else if StatusCode = 403 then
+            error [
+                Reason = "AuthorizationFailed", 
+                Message = "Insufficient permissions for this operation",
+                Detail = [Server = server]
+            ]
+        else if #"JSON" = null then
+            error [
+                Reason = "InvalidJsonResponse",
+                Message = "Server returned invalid JSON response",
+                Detail = [Server = server, StatusCode = StatusCode]
+            ]
+        else if Record.HasFields(#"JSON", {"errors"}) then
+            error [
+                Reason = "GraphQLError",
+                Message = #"JSON"[errors]{0}[message],
+                Detail = [Server = server, Errors = #"JSON"[errors]]
+            ]
+        else
+            #"JSON"[data]
+    in
+        result

src/powerbi-data-connector/speckle/api/GetModel.pqm

@@ -29,7 +29,7 @@
         versionId = parsedUrl[versionId],
         
         // get API key if available
-        apiKey = try Extension.CurrentCredential()[Key] otherwise null,
+        apiKey = try Extension.CurrentCredential()[access_token] otherwise null,
         
         // graphql query to get model info including root object id
         // includes specific version if provided

src/powerbi-data-connector/speckle/api/GetStructuredData.pqm

@@ -39,8 +39,9 @@
         ),
         // fields to remove from data record
         FieldsToRemove = {"__closure", "totalChildrenCount", "renderMaterialProxies"},
-        // create the final table with cleaned data records
-        FinalTable = Table.FromRecords(
+        
+        // create basic table with cleaned data records (no properties column yet)
+        BasicTable = Table.FromRecords(
             List.Transform(
                 TableFromList[Column1],
                 each let
@@ -48,13 +49,14 @@
                     fieldsToRemoveForThisRecord = List.Select(
                         FieldsToRemove,
                         each Record.HasFields(record, {_})
-                    )
+                    ),
+                    cleanedRecord = Record.RemoveFields(record, fieldsToRemoveForThisRecord)
                 in
                     [
                         #"Object IDs" = record[id], // Object IDs
                         #"Speckle Type" = record[speckle_type], // Speckle Type
                         #"Version Object ID" = rootId,
-                        data = Record.RemoveFields(record, fieldsToRemoveForThisRecord) // Data
+                        data = cleanedRecord // Data
                     ]
             )
         ),
@@ -70,14 +72,38 @@
         // Filtering logic here 
         // If model data contains any DataObject -> fetch only data objects (excluding unwanted types)
         // If there are no data objects in the data -> fetch everything but exclude DataChunks and RawEncoding
+        // Check if model contains any DataObject
         HasDataObjects = Table.RowCount(
             Table.SelectRows(
-                FinalTable, 
+                BasicTable, 
                 each Text.Contains(Record.FieldOrDefault([data], "speckle_type", ""), "DataObject") 
                      and not ShouldExcludeRow(_)
             )
         ) > 0,
 
+        // load the Objects.Properties function only if we have DataObjects
+        ObjectsProperties = if HasDataObjects then Extension.LoadFunction("Objects.Properties.pqm") else null,
+        
+        // Add properties column only if model has DataObjects
+        FinalTable = if HasDataObjects then
+            Table.AddColumn(
+                BasicTable,
+                "properties",
+                each let
+                    dataRecord = [data],
+                    isDataObject = Text.Contains(Record.FieldOrDefault(dataRecord, "speckle_type", ""), "DataObject"),
+                    hasProperties = Record.HasFields(dataRecord, {"properties"}),
+                    extractedProperties = if hasProperties and isDataObject then 
+                        try ObjectsProperties(dataRecord) otherwise []
+                    else 
+                        []
+                in
+                    if Record.FieldCount(extractedProperties) > 0 then extractedProperties else null
+            )
+        else
+            BasicTable,
+
+        // Apply the same filtering logic as before
         FilteredTable = if HasDataObjects then
             Table.SelectRows(
                 FinalTable, 

src/powerbi-data-connector/speckle/api/GetUser.pqm

@@ -26,7 +26,7 @@ in
             parsedUrl = Parser(url),
             server = parsedUrl[baseUrl],
             
-            apiKey = try Extension.CurrentCredential()[Key] otherwise try Extension.CurrentCredential()[access_token] otherwise "",
+            apiKey = try Extension.CurrentCredential()[access_token] otherwise "",
             
             query = "query {
                     activeUser {

src/powerbi-data-connector/speckle/api/Models.Federate.pqm

@@ -0,0 +1,30 @@
+// function for federating multiple tables by combining them and creating a concatenated Version Object ID
+(tables as list, optional excludeData as logical) as table =>
+let
+    ViewerOnly = if excludeData = null then false else excludeData,
+    
+    // filter columns from each table if excludeData is true
+    ProcessedTables = List.Transform(
+        tables,
+        each
+            if ViewerOnly then 
+                Table.SelectColumns(_, {"Version Object ID", "Object IDs"}, MissingField.Ignore)
+            else 
+                _
+    ),
+    
+    CombinedTable = Table.Combine(ProcessedTables),
+    
+    DistinctVersionObjectIDs = List.Distinct(CombinedTable[Version Object ID]),
+    ConcatenatedVersionObjectIDs = Text.Combine(DistinctVersionObjectIDs, ","),
+    
+    // Replace all Version Object ID values with the concatenated string
+    FederatedTable = Table.ReplaceValue(
+        CombinedTable, 
+        each [Version Object ID], 
+        ConcatenatedVersionObjectIDs, 
+        Replacer.ReplaceText, 
+        {"Version Object ID"}
+    )
+in
+    FederatedTable

src/powerbi-data-connector/speckle/api/Models.MaterialQuantities.pqm

@@ -0,0 +1,22 @@
+// function for transforming a table to extract and expand Material Quantities data
+(inputTable as table, optional addPrefix as logical) as table =>
+let
+    // Default addPrefix to false if not provided
+    UsePrefix = if addPrefix = null then false else addPrefix,
+    
+    // Add mq column using existing MaterialQuantities function with list output
+    AddedMQ = Table.AddColumn(inputTable, "mq", each Speckle.Objects.MaterialQuantities([data], true)),
+    
+    // Expand the mq list column
+    ExpandMQ = Table.ExpandListColumn(AddedMQ, "mq"),
+    
+    // Add MQProperties column using Properties function with error handling
+    AddedMQProperties = Table.AddColumn(ExpandMQ, "MQ", each try Speckle.Objects.Properties([mq]) otherwise null),
+    
+    // Expand the MQProperties record using Utils.ExpandRecord
+    ExpandMQProperties = Speckle.Utils.ExpandRecord(AddedMQProperties, "MQ", null, UsePrefix),
+    
+    // Remove the temporary mq and MQProperties columns
+    FinalTable = Table.RemoveColumns(ExpandMQProperties, {"mq", "MQ"}, MissingField.Ignore)
+in
+    FinalTable

src/powerbi-data-connector/speckle/api/Objects.Properties.pqm

@@ -1,196 +1,257 @@
 // function for extracting and flattening properties from Speckle objects
-(inputRecord as record, optional filterKeys as list) as record =>
+(inputRecord as any, optional filterKeys as list, optional parentPath as text, optional existingFields as list) as record =>
 let
-    // auto-extract properties if the input has a "properties" field
-    ActualInput = if Record.HasFields(inputRecord, {"properties"}) then 
-        inputRecord[properties] 
-    else 
-        inputRecord,
-    
-    // helper function to check if a key should be included
-    ShouldIncludeKey = (keyName as text) as logical =>
-        if filterKeys = null then 
-            true 
-        else 
-            List.Contains(filterKeys, keyName),
-    
-    // define excluded paths
+    // Define excluded paths
     ExcludedPaths = {
         "Composite Structure",
         "Material Quantities", 
         "Parameters.Type Parameters.Structure"
     },
     
-    IsExcludedPath = (path as text) as logical =>
-        List.AnyTrue(
-            List.Transform(
-                ExcludedPaths,
-                (excludedPath) => Text.StartsWith(path, excludedPath)
-            )
-        ),
+    // Helper function to check if a path should be excluded
+    IsPathExcluded = (currentPath as text) as logical =>
+        List.AnyTrue(List.Transform(ExcludedPaths, each Text.Contains(currentPath, _))),
     
-    // helper function to handle duplicate keys by adding suffixes
-    AddUniqueKey = (existingRecord as record, newKey as text, newValue as any) as record =>
+    // Helper function to resolve naming conflicts
+    ResolveFieldName = (fieldName as text, parentPathParam as nullable text, existingFieldsParam as nullable list) as text =>
         let
-            originalKey = newKey,
-            counter = 1,
+            // Ensure we have valid inputs
+            parentPath = if parentPathParam = null then "" else parentPathParam,
+            existingFields = if existingFieldsParam = null then {} else existingFieldsParam,
             
-            // find a unique key by adding suffix if needed
-            FindUniqueKey = (testKey as text, testCounter as number) as text =>
-                if Record.HasFields(existingRecord, {testKey}) then
-                    @FindUniqueKey(originalKey & "_" & Text.From(testCounter), testCounter + 1)
-                else
-                    testKey,
+            // Try original field name first
+            candidateName = fieldName,
             
-            uniqueKey = FindUniqueKey(newKey, counter),
-            result = Record.AddField(existingRecord, uniqueKey, newValue)
+            // If no conflict, return original name
+            finalName = if not List.Contains(existingFields, candidateName) then
+                candidateName
+            else if parentPath = "" then 
+                fieldName  // No parent path available, keep original
+            else
+                let
+                    // Split parent path and try adding parents one by one
+                    pathParts = Text.Split(parentPath, "."),
+                    reversedParts = List.Reverse(pathParts),  // Start with immediate parent
+                    
+                    // Use iteration instead of recursion
+                    ResolveWithIteration = () =>
+                        let
+                            // Generate all possible candidates
+                            candidates = List.Generate(
+                                () => [depth = 1, candidate = fieldName & "." & List.First(reversedParts)],
+                                each [depth] <= List.Count(reversedParts),
+                                each [
+                                    depth = [depth] + 1,
+                                    candidate = fieldName & "." & Text.Combine(List.FirstN(reversedParts, [depth]), ".")
+                                ],
+                                each [candidate]
+                            ),
+                            
+                            // Find first non-conflicting candidate
+                            firstNonConflicting = List.First(
+                                List.Select(candidates, each not List.Contains(existingFields, _)),
+                                // If all conflict, use full path
+                                fieldName & "." & Text.Combine(reversedParts, ".")
+                            )
+                        in
+                            firstNonConflicting,
+                    
+                    resolvedName = ResolveWithIteration()
+                in
+                    resolvedName
+        in
+            finalName,
+    
+    // Create the main flattening function with self-reference capability
+    FlattenRecordImpl = (
+        flattenFn as function,
+        inputRecord as any, 
+        filterKeys as nullable list, 
+        parentPathParam as nullable text, 
+        existingFieldsParam as nullable list
+    ) as record =>
+        let
+            // Ensure non-null values for internal use
+            currentParentPath = if parentPathParam = null then "" else parentPathParam,
+            currentExistingFields = if existingFieldsParam = null then {} else existingFieldsParam,
+            currentfilterKeys = filterKeys,
+            
+            // Check if record has "properties" field and use it instead of the root record
+            recordToProcess = if inputRecord = null then 
+                null
+            else if Value.Is(inputRecord, type record) and Record.HasFields(inputRecord, {"properties"}) then
+                Record.Field(inputRecord, "properties")
+            else
+                inputRecord,
+            
+            // Helper function to check if a field should be included
+            ShouldIncludeField = (fieldName as text) as logical =>
+                if currentfilterKeys = null then true
+                else List.Contains(currentfilterKeys, fieldName),
+            
+            // Handle different input types
+            result = if recordToProcess = null then
+                []
+            else if Value.Is(recordToProcess, type record) then
+                let
+                    fieldNames = Record.FieldNames(recordToProcess),
+                    
+                    // Process each field
+                    processedFields = List.Accumulate(
+                        fieldNames,
+                        [FlattenedRecord = [], ExistingFieldsList = currentExistingFields],
+                        (state, fieldName) =>
+                            let
+                                fieldValue = Record.Field(recordToProcess, fieldName),
+                                newPath = if currentParentPath = "" then fieldName else currentParentPath & "." & fieldName,
+                                
+                                // Skip if path is excluded
+                                shouldProcess = not IsPathExcluded(newPath),
+                                
+                                processResult = if not shouldProcess then
+                                    state
+                                else
+                                    let
+                                        // Check if this is a name/value record
+                                        hasNameValue = Value.Is(fieldValue, type record) and 
+                                                     Record.HasFields(fieldValue, {"name", "value"}),
+                                        
+                                        finalResult = if hasNameValue then
+                                            let
+                                                nameField = Record.Field(fieldValue, "name"),
+                                                valueField = Record.Field(fieldValue, "value"),
+                                                // Check if this name field should be included
+                                                shouldInclude = if nameField = null then false else ShouldIncludeField(nameField),
+                                                result = if shouldInclude and nameField <> null then
+                                                    let
+                                                        resolvedName = ResolveFieldName(nameField, currentParentPath, state[ExistingFieldsList]),
+                                                        newRecord = Record.AddField(state[FlattenedRecord], resolvedName, valueField),
+                                                        newFieldsList = state[ExistingFieldsList] & {resolvedName}
+                                                    in
+                                                        [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                else
+                                                    state
+                                            in
+                                                result
+                                        else if fieldValue = null then
+                                            let
+                                                shouldInclude = ShouldIncludeField(fieldName),
+                                                result = if shouldInclude then
+                                                    let
+                                                        resolvedName = ResolveFieldName(fieldName, currentParentPath, state[ExistingFieldsList]),
+                                                        newRecord = Record.AddField(state[FlattenedRecord], resolvedName, null),
+                                                        newFieldsList = state[ExistingFieldsList] & {resolvedName}
+                                                    in
+                                                        [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                else
+                                                    state
+                                            in
+                                                result
+                                        else if Value.Is(fieldValue, type record) then
+                                            let
+                                                // Skip empty records
+                                                fieldCount = Record.FieldCount(fieldValue),
+                                                recursiveResult = if fieldCount = 0 then
+                                                    state
+                                                else
+                                                    let
+                                                        // Call the function through the passed reference
+                                                        // IMPORTANT: Pass the current state's existing fields list
+                                                        flattened = flattenFn(flattenFn, fieldValue, currentfilterKeys, newPath, state[ExistingFieldsList]),
+                                                        // Get all field names from the flattened result
+                                                        flattenedFieldNames = Record.FieldNames(flattened),
+                                                        // Merge the flattened record with the current state
+                                                        combinedRecord = flattened & state[FlattenedRecord],
+                                                        // Update the existing fields list with ALL fields from both records
+                                                        allFieldNames = List.Distinct(state[ExistingFieldsList] & flattenedFieldNames)
+                                                    in
+                                                        [FlattenedRecord = combinedRecord, ExistingFieldsList = allFieldNames]
+                                            in
+                                                recursiveResult
+                                        else if Value.Is(fieldValue, type list) then
+                                            let
+                                                listLength = List.Count(fieldValue),
+                                                // Skip empty lists
+                                                listResult = if listLength = 0 then
+                                                    state
+                                                else
+                                                    List.Accumulate(
+                                                        List.Positions(fieldValue),
+                                                        state,
+                                                        (listState, index) =>
+                                                            let
+                                                                listItem = fieldValue{index},
+                                                                indexSuffix = Text.From(index + 1), // 1-based indexing
+                                                                listFieldName = fieldName & "." & indexSuffix,
+                                                                listPath = if currentParentPath = "" then listFieldName else currentParentPath & "." & listFieldName,
+                                                                
+                                                                itemResult = if Value.Is(listItem, type record) then
+                                                                    let
+                                                                        itemFieldCount = Record.FieldCount(listItem),
+                                                                        itemFlattened = if itemFieldCount = 0 then
+                                                                            listState
+                                                                        else
+                                                                            let
+                                                                                // Call the function through the passed reference
+                                                                                flattened = flattenFn(flattenFn, listItem, currentfilterKeys, listPath, listState[ExistingFieldsList]),
+                                                                                // Get all field names from the flattened result
+                                                                                flattenedFieldNames = Record.FieldNames(flattened),
+                                                                                // Merge the flattened record with the current state
+                                                                                combinedRecord = flattened & listState[FlattenedRecord],
+                                                                                // Update the existing fields list with ALL fields
+                                                                                allFieldNames = List.Distinct(listState[ExistingFieldsList] & flattenedFieldNames)
+                                                                            in
+                                                                                [FlattenedRecord = combinedRecord, ExistingFieldsList = allFieldNames]
+                                                                    in
+                                                                        itemFlattened
+                                                                else
+                                                                    let
+                                                                        shouldInclude = ShouldIncludeField(listFieldName),
+                                                                        result = if shouldInclude then
+                                                                            let
+                                                                                resolvedName = ResolveFieldName(listFieldName, currentParentPath, listState[ExistingFieldsList]),
+                                                                                newRecord = Record.AddField(listState[FlattenedRecord], resolvedName, listItem),
+                                                                                newFieldsList = listState[ExistingFieldsList] & {resolvedName}
+                                                                            in
+                                                                                [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                                        else
+                                                                            listState
+                                                                    in
+                                                                        result
+                                                            in
+                                                                itemResult
+                                                    )
+                                            in
+                                                listResult
+                                        else
+                                            // Handle primitive values
+                                            let
+                                                shouldInclude = ShouldIncludeField(fieldName),
+                                                result = if shouldInclude then
+                                                    let
+                                                        resolvedName = ResolveFieldName(fieldName, currentParentPath, state[ExistingFieldsList]),
+                                                        newRecord = Record.AddField(state[FlattenedRecord], resolvedName, fieldValue),
+                                                        newFieldsList = state[ExistingFieldsList] & {resolvedName}
+                                                    in
+                                                        [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                else
+                                                    state
+                                            in
+                                                result
+                                    in
+                                        finalResult
+                            in
+                                processResult
+                    )
+                in
+                    processedFields[FlattenedRecord]
+            else
+                // If input is not a record, return it as is in a record wrapper
+                [Value = recordToProcess]
         in
             result,
     
-    // enhanced combine function that handles duplicates and filtering
-    SafeRecordCombine = (records as list) as record =>
-        List.Accumulate(
-            records,
-            [],
-            (state, current) => 
-                List.Accumulate(
-                    Record.FieldNames(current),
-                    state,
-                    (innerState, fieldName) => 
-                        if ShouldIncludeKey(fieldName) then
-                            AddUniqueKey(innerState, fieldName, Record.Field(current, fieldName))
-                        else
-                            innerState
-                )
-        ),
-    
-    // helper function to process name-value objects
-    ProcessNameValueObject = (obj as record) as record =>
-        let
-            // Assert that the object has required fields
-            _ = if not (Record.HasFields(obj, {"name"}) and Record.HasFields(obj, {"value"})) then
-                error [
-                    Reason = "Invalid Name-Value Object",
-                    Message = "Object must have both 'name' and 'value' fields"
-                ]
-            else
-                null,
-                
-            BaseName = obj[name],
-            BaseValue = obj[value],
-            
-            // only extract name and value if it should be included
-            Result = if ShouldIncludeKey(BaseName) then
-                Record.FromList({BaseValue}, {BaseName})
-            else
-                []
-        in
-            Result,
-    
-    // helper function to process direct key-value objects
-    ProcessDirectKeyValueObject = (obj as record) as record =>
-        let
-            // assert that input is a record
-            _ = if not Value.Is(obj, type record) then
-                error [
-                    Reason = "Invalid Input Type",
-                    Message = "Expected record for direct key-value processing"
-                ]
-            else
-                null,
-                
-            // extract all primitive key-value pairs
-            PrimitiveFields = List.Transform(
-                Record.FieldNames(obj),
-                (fieldName) => 
-                    let
-                        fieldValue = Record.Field(obj, fieldName)
-                    in
-                        if not Type.Is(Value.Type(fieldValue), type record) and ShouldIncludeKey(fieldName) then
-                            Record.FromList({fieldValue}, {fieldName})
-                        else
-                            []
-            ),
-            
-            // filter out empty records and combine using safe combine
-            FilteredFields = List.Select(PrimitiveFields, (rec) => Record.FieldCount(rec) > 0),
-            Result = SafeRecordCombine(FilteredFields)
-        in
-            Result,
-    
-    // helper functions for type checking
-    HasDirectKeyValuePattern = (obj as record) as logical =>
-        List.AllTrue(
-            List.Transform(
-                Record.FieldValues(obj),
-                (value) => not Type.Is(Value.Type(value), type record)
-            )
-        ),
-    
-    IsNestedContainer = (obj as record) as logical =>
-        List.AnyTrue(
-            List.Transform(
-                Record.FieldValues(obj),
-                (value) => Type.Is(Value.Type(value), type record)
-            )
-        ),
-    
-    // main processing function with path tracking
-    ProcessField = (fieldName as text, fieldValue as any, currentPath as text) as record =>
-        let
-            fieldPath = if currentPath = "" then fieldName else currentPath & "." & fieldName
-        in
-            if IsExcludedPath(fieldPath) then
-                []
-            else if Type.Is(Value.Type(fieldValue), type record) then
-                if Record.HasFields(fieldValue, {"name", "value"}) then
-                    ProcessNameValueObject(fieldValue)
-                else if HasDirectKeyValuePattern(fieldValue) then
-                    ProcessDirectKeyValueObject(fieldValue)
-                else if IsNestedContainer(fieldValue) then
-                    // recursive call for nested containers
-                    @ProcessRecord(fieldValue, fieldPath)
-                else
-                    // unknown record type, skip
-                    []
-            else
-                // primitive value - check if should be included
-                if ShouldIncludeKey(fieldName) then
-                    Record.FromList({fieldValue}, {fieldName})
-                else
-                    [],
-    
-    // process entire record recursively
-    ProcessRecord = (record as record, currentPath as text) as record =>
-        let
-            // assert that input is a record
-            _ = if not Value.Is(record, type record) then
-                error [
-                    Reason = "Invalid Record Type",
-                    Message = "Expected record for processing, but received: " & Text.From(Value.Type(record))
-                ]
-            else
-                null,
-                
-            ProcessedFields = List.Transform(
-                Record.FieldNames(record),
-                (fieldName) => ProcessField(fieldName, Record.Field(record, fieldName), currentPath)
-            ),
-            FilteredFields = List.Select(ProcessedFields, (rec) => Record.FieldCount(rec) > 0),
-            CombinedRecord = SafeRecordCombine(FilteredFields)
-        in
-            CombinedRecord,
-    
-    // assert that input is a record before processing
-    _ = if not Value.Is(ActualInput, type record) then
-        error [
-            Reason = "Invalid Input Type",
-            Message = "Input must be a record, but received: " & Text.From(Value.Type(ActualInput))
-        ]
-    else
-        null,
-    
-    // start processing from root
-    Result = ProcessRecord(ActualInput, "")
+    // Call the implementation with self-reference
+    result = FlattenRecordImpl(FlattenRecordImpl, inputRecord, filterKeys, parentPath, existingFields)
 in
-    Result 
+    result

src/powerbi-data-connector/speckle/api/SendToServer.pqm

@@ -37,16 +37,40 @@
 
         workspaceInfo = GetWorkspace(url),
 
-        // Prepare request data
+        // exchange powerful token for weak token via ds 
+        tokenExchangeData = Json.FromValue([
+            PowerfulToken = apiKey,
+            Scopes = {"profile:read", "streams:read", "users:read"},
+            ProjectId = parsedUrl[projectId],
+            ServerUrl = parsedUrl[baseUrl]
+        ]),
+        
+        tokenExchangeResponse = Web.Contents(
+            "http://127.0.0.1:29364/auth/exchange-token",
+            [
+                Headers = [
+                    #"Content-Type" = "application/json",
+                    #"Method" = "POST"
+                ],
+                Content = tokenExchangeData,
+                ManualStatusHandling = {400, 401, 403, 404, 500}
+            ]
+        ),
+        
+        tokenExchangeJson = Json.Document(tokenExchangeResponse),
+        weakToken = tokenExchangeJson[token],
+
+        // prepare request data with weak token
         requestData = Json.FromValue([
             Url = url,
             Server = parsedUrl[baseUrl],
             Email = userEmail,
             ProjectId = parsedUrl[projectId],
-            ObjectId = modelInfo[rootObjectId],
+            RootObjectId = modelInfo[rootObjectId],
             SourceApplication = modelInfo[sourceApplication],
-            Token = apiKey,
+            Token = weakToken,
             Version = connectorVersion,
+            VersionId = parsedUrl[versionId],
             WorkspaceId = workspaceInfo[workspaceId],
             WorkspaceName = workspaceInfo[workspaceName],
             WorkspaceLogo = workspaceInfo[workspaceLogo],

src/powerbi-visual/capabilities.json

@@ -105,6 +105,9 @@
         },
         "isGhost": {
           "type": { "bool": true }
+        },
+        "zoomOnFilter": {
+          "type": { "bool": true }
         }
       }
     },
@@ -130,6 +133,15 @@
         }
       }
     },
+    "dataLoading": {
+      "properties": {
+        "internalizeData": {
+          "type": {
+            "bool": true
+          }
+        }
+      }
+    },
     "color": {
       "properties": {
         "enabled": {

src/powerbi-visual/package-lock.json

@@ -13,7 +13,8 @@
         "@babel/runtime-corejs3": "^7.21.5",
         "@headlessui/vue": "^1.7.13",
         "@heroicons/vue": "^2.0.12",
-        "@speckle/objectloader": "^2.23.8",
+        "@speckle/objectloader": "^2.25.9",
+        "@speckle/objectloader2": "^2.25.9",
         "@speckle/tailwind-theme": "2.23.2",
         "@speckle/ui-components": "2.23.2",
         "@speckle/viewer": "2.23.23",
@@ -2826,6 +2827,13 @@
       "deprecated": "Use @eslint/object-schema instead",
       "dev": true
     },
+    "node_modules/@ioredis/commands": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.3.0.tgz",
+      "integrity": "sha512-M/T6Zewn7sDaBQEqIZ8Rb+i9y8qfGmq+5SDFSf9sA2lUZTmdDLVdOiQaeDp+Q4wElZ9HG1GAX5KhDaidp6LQsQ==",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -2979,6 +2987,90 @@
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
       "dev": true
     },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true
+    },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -3052,12 +3144,13 @@
       "peer": true
     },
     "node_modules/@speckle/objectloader": {
-      "version": "2.23.23",
-      "resolved": "https://registry.npmjs.org/@speckle/objectloader/-/objectloader-2.23.23.tgz",
-      "integrity": "sha512-k0qxk5M0Q57h+fth6GQq8N7SjeJnWHxjDlMDYC56lOZkH8vI0Y2RHG33+DiBvC7iHnTIRuZc0SyTRrJ64Cuhrg==",
+      "version": "2.25.9",
+      "resolved": "https://registry.npmjs.org/@speckle/objectloader/-/objectloader-2.25.9.tgz",
+      "integrity": "sha512-ZSMinqrHm4Hx3x6dth2kfnJO2O1zI0i4E0eE3PS9hg1HAtCx9opIT/eKIzj5fYY/cUyfXxP00k7qXmZ3KAUl7w==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.17.9",
-        "@speckle/shared": "^2.23.23",
+        "@speckle/shared": "^2.25.9",
         "core-js": "^3.21.1",
         "lodash": "^4.17.21",
         "lodash-es": "^4.17.21",
@@ -3067,11 +3160,25 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@speckle/shared": {
-      "version": "2.23.23",
-      "resolved": "https://registry.npmjs.org/@speckle/shared/-/shared-2.23.23.tgz",
-      "integrity": "sha512-5laonEcP7FsG5CPn/EXq0tpkA135Bxq3TndZ+OJGzuaY9L6ZHLtSURltZ6YpjMo6CHmAiFEVG62laP6UHwIL4w==",
+    "node_modules/@speckle/objectloader2": {
+      "version": "2.25.9",
+      "resolved": "https://registry.npmjs.org/@speckle/objectloader2/-/objectloader2-2.25.9.tgz",
+      "integrity": "sha512-fZYkVGBCNUcVMMZnIljmtqiyXpSlyWiuW+qbpfls5lX6P9ZLP6DC88AUjyJQ6cM9jZ6RGNk3/Sa+MeReTeZIvg==",
+      "license": "Apache-2.0",
       "dependencies": {
+        "@speckle/shared": "^2.25.9"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@speckle/shared": {
+      "version": "2.25.9",
+      "resolved": "https://registry.npmjs.org/@speckle/shared/-/shared-2.25.9.tgz",
+      "integrity": "sha512-7hK6v55tSu8OTxza9UakettBpzlbyIWq17jtzjf3ZSnqqjiasayhG3O0/uuRI2GoeingoOqUMLvybatjDu4ang==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "dayjs": "^1.11.13",
         "lodash": "^4.17.21",
         "lodash-es": "^4.17.21",
         "nanoid": "^5.1.5",
@@ -3083,6 +3190,7 @@
       },
       "peerDependencies": {
         "@tiptap/core": "^2.0.0-beta.176",
+        "bull": "*",
         "knex": "*",
         "mixpanel": "^0.17.0",
         "pino": "^8.7.0",
@@ -5271,6 +5379,38 @@
       "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
       "dev": true
     },
+    "node_modules/bull": {
+      "version": "4.16.5",
+      "resolved": "https://registry.npmjs.org/bull/-/bull-4.16.5.tgz",
+      "integrity": "sha512-lDsx2BzkKe7gkCYiT5Acj02DpTwDznl/VNN7Psn7M3USPG7Vs/BaClZJJTAG+ufAR9++N1/NiUTdaFBWDIl5TQ==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "cron-parser": "^4.9.0",
+        "get-port": "^5.1.1",
+        "ioredis": "^5.3.2",
+        "lodash": "^4.17.21",
+        "msgpackr": "^1.11.2",
+        "semver": "^7.5.2",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/bull/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/bundle-name": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
@@ -5526,6 +5666,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/cluster-key-slot": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
+      "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",
+      "license": "Apache-2.0",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -5845,6 +5995,19 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/cron-parser": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",
+      "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "luxon": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -6076,6 +6239,12 @@
         "node": "*"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+      "license": "MIT"
+    },
     "node_modules/de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -6198,6 +6367,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/denque": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
+      "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+      "license": "Apache-2.0",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -6235,6 +6414,17 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
@@ -7741,6 +7931,19 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-port": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
+      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -8485,6 +8688,31 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/ioredis": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.7.0.tgz",
+      "integrity": "sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@ioredis/commands": "^1.3.0",
+        "cluster-key-slot": "^1.1.0",
+        "debug": "^4.3.4",
+        "denque": "^2.1.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.isarguments": "^3.1.0",
+        "redis-errors": "^1.2.0",
+        "redis-parser": "^3.0.0",
+        "standard-as-callback": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/ioredis"
+      }
+    },
     "node_modules/ipaddr.js": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
@@ -9262,8 +9490,14 @@
     "node_modules/lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
@@ -9327,6 +9561,16 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/luxon": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/lz-string": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
@@ -9653,6 +9897,39 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
+    "node_modules/msgpackr": {
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.5.tgz",
+      "integrity": "sha512-UjkUHN0yqp9RWKy0Lplhh+wlpdt9oQBYgULZOiFhV3VclSF1JnSQWZ5r9gORQlNYaUKQoR8itv7g7z1xDDuACA==",
+      "license": "MIT",
+      "peer": true,
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.2"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+      }
+    },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
@@ -9773,6 +10050,22 @@
         "node": ">= 6.13.0"
       }
     },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
     "node_modules/node-releases": {
       "version": "2.0.19",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
@@ -12547,6 +12840,29 @@
         "node": ">=8"
       }
     },
+    "node_modules/redis-errors": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
+      "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/redis-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
+      "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "redis-errors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -13383,6 +13699,13 @@
         "node": ">= 10.x"
       }
     },
+    "node_modules/standard-as-callback": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
+      "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/statuses": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -14486,7 +14809,6 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }

src/powerbi-visual/package.json

@@ -17,7 +17,8 @@
     "@babel/runtime-corejs3": "^7.21.5",
     "@headlessui/vue": "^1.7.13",
     "@heroicons/vue": "^2.0.12",
-    "@speckle/objectloader": "^2.23.8",
+    "@speckle/objectloader": "^2.25.9",
+    "@speckle/objectloader2": "^2.25.9",
     "@speckle/tailwind-theme": "2.23.2",
     "@speckle/ui-components": "2.23.2",
     "@speckle/viewer": "2.23.23",

src/powerbi-visual/src/components/ViewerControls.vue

@@ -5,6 +5,19 @@
       <ViewerControlsButtonToggle flat tooltip="Zoom extends" @click="onZoomExtentsClicked">
         <ArrowsPointingOutIcon class="h-4 w-4 md:h-5 md:w-5" />
       </ViewerControlsButtonToggle>
+      <!-- Zoom on Filter -->
+      <ViewerControlsButtonToggle
+        :tooltip="
+          visualStore.isZoomOnFilterActive
+            ? 'Move camera on filter'
+            : 'Keep camera position on filter'
+        "
+        flat
+        @click="toggleZoomOnFilter"
+      >
+        <ZoomToFit v-if="visualStore.isZoomOnFilterActive" class="h-5 w-5" />
+        <ZoomToFit v-else class="h-5 w-5 opacity-30" />
+      </ViewerControlsButtonToggle>
       <!-- Ghost / Hidden -->
       <ViewerControlsButtonToggle
         :tooltip="
@@ -65,6 +78,7 @@ import Perspective from '../components/global/icon/Perspective.vue'
 import PerspectiveMore from '../components/global/icon/PerspectiveMore.vue'
 
 import Ghost from '../components/global/icon/Ghost.vue'
+import ZoomToFit from '../components/global/icon/ZoomToFit.vue'
 
 const visualStore = useVisualStore()
 
@@ -111,6 +125,11 @@ const toggleGhostHidden = () => {
   visualStore.writeIsGhostToFile()
 }
 
+const toggleZoomOnFilter = () => {
+  visualStore.setIsZoomOnFilterActive(!visualStore.isZoomOnFilterActive)
+  visualStore.writeZoomOnFilterToFile()
+}
+
 const viewModesOpen = computed({
   get: () => activeControl.value === 'viewModes',
   set: (value) => {

src/powerbi-visual/src/components/ViewerWrapper.vue

@@ -162,6 +162,10 @@ onMounted(async () => {
   console.log('Viewer Wrapper mounted')
   viewerHandler = new ViewerHandler()
   await viewerHandler.init(container.value)
+  
+  // Set up event listener for object clicks from the FilteredSelectionExtension
+  viewerHandler.emitter.on('objectClicked', handleObjectClicked)
+  
   visualStore.setViewerEmitter(viewerHandler.emit)
 })
 
@@ -169,43 +173,59 @@ onBeforeUnmount(async () => {
   await viewerHandler.dispose()
 })
 
-function isMultiSelect(e: MouseEvent) {
-  if (!e) return false
-  if (currentOS === OS.MacOS) return e.metaKey || e.shiftKey
-  else return e.ctrlKey || e.shiftKey
-}
-
-async function onCanvasClick(ev: MouseEvent) {
+async function handleObjectClicked(hit: any, isMultiSelect: boolean, mouseEvent?: PointerEvent) {
+  // Skip if dragging occurred
   if (dragged.value) return
-
-  const intersectResult = await viewerHandler.intersect({ x: ev.clientX, y: ev.clientY })
-
-  const multi = isMultiSelect(ev)
-  const hit = intersectResult?.hit
+  
+  console.log('🎯 Object clicked in ViewerWrapper:', hit, isMultiSelect)
+  
   if (hit) {
     visualStore.setPostClickSkipNeeded(true)
     const id = hit.object.id as string
-    if (multi || !selectionHandler.isSelected(id)) {
-      await selectionHandler.select(id, multi)
+    if (isMultiSelect || !selectionHandler.isSelected(id)) {
+      await selectionHandler.select(id, isMultiSelect)
     }
-    tooltipHandler.show(hit, { x: ev.clientX, y: ev.clientY })
+    
+    // Show tooltip if we have mouse coordinates
+    if (mouseEvent) {
+      tooltipHandler.show(hit, { x: mouseEvent.clientX, y: mouseEvent.clientY })
+    }
+    
     const selection = selectionHandler.getCurrentSelection()
     const ids = selection.map((s) => s.id)
     await viewerHandler.selectObjects(ids)
   } else {
     visualStore.setPostClickSkipNeeded(false)
     tooltipHandler.hide()
-    if (!multi) {
+    if (!isMultiSelect) {
       selectionHandler.clear()
       await viewerHandler.selectObjects(null)
     }
   }
 }
 
+function onCanvasClick(ev: MouseEvent) {
+  // This click handler allows the viewer's built-in input system to handle clicks
+  // The viewer will emit ViewerEvent.ObjectClicked events which the SelectionExtension handles
+  console.log('🖱️ Canvas click detected:', ev.clientX, ev.clientY)
+  
+  // Let the event propagate to the viewer's input system
+  // The viewer should handle the click and emit ViewerEvent.ObjectClicked
+}
+
 async function onCanvasAuxClick(ev: MouseEvent) {
-  if (ev.button != 2 || dragged.value) return
-  const intersectResult = await viewerHandler.intersect({ x: ev.clientX, y: ev.clientY })
-  await selectionHandler.showContextMenu(ev, intersectResult?.hit)
+  if (ev.button !== 2 || dragged.value) return
+  
+  // For right-clicks, we need to get the object at the click position
+  // Since FilteredSelectionExtension doesn't handle right-clicks, we'll ask it for current selection
+  const selectedObjects = viewerHandler.selection.getSelectedObjects()
+  const hit = selectedObjects.length > 0 ? {
+    guid: selectedObjects[0].id,
+    object: selectedObjects[0],
+    point: { x: 0, y: 0, z: 0 } // We don't have exact point for context menu
+  } : null
+  
+  await selectionHandler.showContextMenu(ev, hit)
 }
 </script>
 

src/powerbi-visual/src/components/global/icon/ZoomToFit.vue

@@ -0,0 +1,24 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M3.75 3.75V8.25M3.75 3.75H8.25M3.75 3.75L9 9M20.25 3.75H15.75M20.25 3.75V8.25M20.25 3.75L15 9"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M15.75 15.4028L18.8093 12.3435C18.8772 12.2756 18.9638 12.2294 19.0581 12.2107C19.1523 12.1919 19.25 12.2016 19.3387 12.2383C19.4275 12.2751 19.5034 12.3373 19.5568 12.4172C19.6102 12.4971 19.6388 12.591 19.6389 12.687V20.063C19.6388 20.159 19.6102 20.2529 19.5568 20.3328C19.5034 20.4127 19.4275 20.4749 19.3387 20.5117C19.25 20.5484 19.1523 20.5581 19.0581 20.5393C18.9638 20.5206 18.8772 20.4744 18.8093 20.4065L15.75 17.3472M8.45833 20.75H14.2917C14.6784 20.75 15.0494 20.5964 15.3229 20.3229C15.5964 20.0494 15.75 19.6784 15.75 19.2917V13.4583C15.75 13.0716 15.5964 12.7006 15.3229 12.4271C15.0494 12.1536 14.6784 12 14.2917 12H8.45833C8.07156 12 7.70063 12.1536 7.42714 12.4271C7.15365 12.7006 7 13.0716 7 13.4583V19.2917C7 19.6784 7.15365 20.0494 7.42714 20.3229C7.70063 20.5964 8.07156 20.75 8.45833 20.75Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template> 

src/powerbi-visual/src/extensions/FilteredSelectionExtension.ts

@@ -0,0 +1,155 @@
+import {
+  CameraController,
+  FilteringExtension,
+  NodeRenderView,
+  SelectionEvent,
+  SelectionExtension,
+  TreeNode,
+  ObjectLayers,
+  IViewer,
+  ExtendedIntersection
+} from '@speckle/viewer'
+import { Vector2, Vector3 } from 'three'
+
+export enum FilteredSelectionEvent {
+  FilteredObjectClicked = 'filtered-object-clicked'
+}
+
+export interface FilteredSelectionEventPayload {
+  [FilteredSelectionEvent.FilteredObjectClicked]: SelectionEvent | null
+}
+
+export class FilteredSelectionExtension extends SelectionExtension {
+  // We're adding the Filtering Extension
+  public get inject(): Array<new (viewer: IViewer, ...args: any[]) => any> {
+    return [...super.inject, FilteringExtension]
+  }
+
+  public constructor(
+    viewer: IViewer,
+    protected cameraProvider: CameraController,
+    protected filtering: FilteringExtension
+  ) {
+    super(viewer, cameraProvider)
+  }
+
+  public on<T extends FilteredSelectionEvent>(
+    eventType: T,
+    listener: (arg: FilteredSelectionEventPayload[T]) => void
+  ): void {
+    super.on(eventType, listener)
+  }
+
+  protected isVisibleForSelection(id: string): boolean
+  protected isVisibleForSelection(rv: NodeRenderView): boolean
+  protected isVisibleForSelection(input: string | NodeRenderView): boolean {
+    if (input instanceof NodeRenderView) return this.isVisibleForSelectionRv(input)
+    else if (typeof input === 'string') return this.isVisibleForSelectionId(input)
+    return false
+  }
+
+  protected isVisibleForSelectionId(id: string): boolean {
+    // The current filtering state
+    const filteringState = this.filtering.filteringState
+
+    // If there are no isolated objects, all objects are visible for selection
+    if (!filteringState.isolatedObjects || filteringState.isolatedObjects.length === 0) {
+      return true
+    }
+
+    // If there are isolated objects, only those objects are visible for selection
+    return filteringState.isolatedObjects.includes(id)
+  }
+
+  protected isVisibleForSelectionRv(rv: NodeRenderView): boolean {
+    // The current filtering state
+    const filteringState = this.filtering.filteringState
+
+    // If there are no isolated objects, all objects are visible for selection
+    if (!filteringState.isolatedObjects || filteringState.isolatedObjects.length === 0) {
+      return true
+    }
+
+    // Check if this render view belongs to any of the isolated objects
+    for (let k = 0; k < filteringState.isolatedObjects.length; k++) {
+      const rvs = this.viewer
+        .getWorldTree()
+        .getRenderTree()
+        .getRenderViewsForNodeId(filteringState.isolatedObjects[k])
+      if (rvs.includes(rv)) return true
+    }
+    return false
+  }
+
+  protected onObjectClicked(selection: SelectionEvent | null) {
+    console.log('🎯 FilteredSelectionExtension.onObjectClicked called with:', selection)
+    
+    if (!selection) {
+      console.log('🎯 No selection, calling super with null')
+      super.onObjectClicked(selection)
+      return
+    }
+
+    const filteredHits = []
+    const filteredSelection = selection
+      ? {
+          event: selection.event,
+          hits: filteredHits,
+          multiple: selection.multiple
+        }
+      : null
+
+    if (filteredSelection) {
+      for (const hit of selection.hits) {
+        console.log('🎯 Checking hit:', hit.node.model.id, 'isVisible:', this.isVisibleForSelection(hit.node.model.id))
+        if (this.isVisibleForSelection(hit.node.model.id)) {
+          filteredHits.push(hit)
+        }
+      }
+    }
+
+    console.log('🎯 Filtered hits:', filteredHits.length)
+
+    // Call base class with the filtered selection
+    if (filteredSelection && filteredSelection.hits.length) {
+      super.onObjectClicked(filteredSelection)
+      this.emit(FilteredSelectionEvent.FilteredObjectClicked, filteredSelection)
+    } else {
+      // If no valid hits, treat as empty selection
+      super.onObjectClicked(null)
+    }
+  }
+
+  protected onPointerMove(e: Vector2 & { event: Event }) {
+    if (!this._enabled) return
+    const camera = this.viewer.getRenderer().renderingCamera
+    if (!camera) return
+
+    if (!this.options.hoverMaterialData) return
+    const result =
+      (this.viewer
+        .getRenderer()
+        .intersections.intersect(
+          this.viewer.getRenderer().scene,
+          camera,
+          e,
+          [
+            ObjectLayers.STREAM_CONTENT_MESH,
+            ObjectLayers.STREAM_CONTENT_POINT,
+            ObjectLayers.STREAM_CONTENT_LINE,
+            ObjectLayers.STREAM_CONTENT_TEXT
+          ],
+          true,
+          this.viewer.getRenderer().clippingVolume
+        ) as ExtendedIntersection[]) || []
+
+    let rv = null
+    for (let k = 0; k < result.length; k++) {
+      rv = this.viewer.getRenderer().renderViewFromIntersection(result[k])
+      if (this.isVisibleForSelection(rv)) break
+      else rv = null
+    }
+
+    this.applyHover(rv)
+  }
+}

src/powerbi-visual/src/loader/SpeckleApiLoader.ts

@@ -0,0 +1,103 @@
+import { useVisualStore } from '@src/store/visualStore'
+import ObjectLoader from '@speckle/objectloader' // Default import for v1
+
+interface SpeckleObject {
+  id: string
+  speckle_type?: string
+  [key: string]: any
+}
+
+export class SpeckleApiLoader {
+  private serverUrl: string
+  private token: string
+  private projectId: string
+  private headers: Record<string, string>
+
+  constructor(serverUrl: string, projectId: string, token: string) {
+    this.serverUrl = serverUrl.replace(/\/$/, '')
+    this.projectId = projectId
+    this.token = token
+    this.headers = {
+      'Authorization': `Bearer ${token}`,
+      'Content-Type': 'application/json'
+    }
+  }
+
+  async downloadObjectsWithChildren(objectId: string, onProgress?: (loaded: number, total: number) => void): Promise<SpeckleObject[]> {
+    const visualStore = useVisualStore()
+
+    visualStore.setLoadingProgress('Initializing object loader', 0)
+    console.log('Creating ObjectLoader v1 for Power BI environment')
+
+    // Create ObjectLoader v1 instance - use 'token' not 'authToken'
+    const loader = new ObjectLoader({
+      serverUrl: this.serverUrl,
+      streamId: this.projectId,
+      objectId: objectId,
+      token: this.token,
+      options: {
+        enableCaching: false, // Disable caching for Power BI environment
+      }
+    })
+
+    try {
+      // Get total count for progress tracking
+      const totalCount = await loader.getTotalObjectCount()
+      console.log(`Loading ${totalCount} objects using ObjectLoader v1`)
+
+      const objects: SpeckleObject[] = []
+      let loadedCount = 0
+
+      // Stream all objects using the async iterator
+      for await (const obj of loader.getObjectIterator()) {
+        objects.push(obj as SpeckleObject) // Type assertion since ObjectLoader v1 has different type
+        loadedCount++
+
+        // Update progress
+        if (onProgress) {
+          onProgress(loadedCount, totalCount)
+        }
+
+        const progress = totalCount > 0 ? loadedCount / totalCount : 0
+        visualStore.setLoadingProgress('🌍 Loading from Speckle', progress)
+
+        // Log progress every 100 objects
+        if (loadedCount % 100 === 0) {
+          console.log(`Loaded ${loadedCount}/${totalCount} objects`)
+        }
+      }
+
+      console.log(`Downloaded ${objects.length} objects using ObjectLoader v1`)
+      visualStore.setLoadingProgress('Download complete', 1)
+
+      return objects
+
+    } catch (error) {
+      console.error('Error loading objects:', error)
+      throw error
+    } finally {
+      // ObjectLoader v1 cleanup
+      if (loader.dispose) {
+        loader.dispose()
+      }
+    }
+  }
+
+  async downloadFromVersionId(versionId: string): Promise<SpeckleObject[]> {
+    // For version IDs, we can't avoid GraphQL entirely as we need to resolve the referenced object
+    // However, this method might not be used if we're getting object IDs directly from the data connector
+    throw new Error('Version ID downloads not supported with weak tokens. Use object IDs directly.')
+  }
+
+  async downloadMultipleModels(objectIds: string[]): Promise<SpeckleObject[][]> {
+    const allObjects: SpeckleObject[][] = []
+    
+    for (const objectId of objectIds) {
+      const objects = await this.downloadObjectsWithChildren(objectId)
+      allObjects.push(objects)
+    }
+    
+    return allObjects
+  }
+
+}

src/powerbi-visual/src/plugins/viewer.ts

@@ -1,7 +1,6 @@
 import {
   DefaultViewerParams,
   FilteringState,
-  IntersectionQuery,
   CameraController,
   CanonicalView,
   ViewModes,
@@ -13,8 +12,10 @@ import {
   SelectionExtension,
   FilteringExtension,
   UpdateFlags,
-  ViewerEvent
+  ViewerEvent,
+  SelectionEvent
 } from '@speckle/viewer'
+import { FilteredSelectionExtension, FilteredSelectionEvent } from '@src/extensions/FilteredSelectionExtension'
 import { SpeckleObjectsOfflineLoader } from '@src/laoder/SpeckleObjectsOfflineLoader'
 import { useVisualStore } from '@src/store/visualStore'
 import { Tracker } from '@src/utils/mixpanel'
@@ -37,8 +38,8 @@ export interface Hit {
 export interface IViewerEvents {
   ping: (message: string) => void
   setSelection: (objectIds: string[]) => void
-  resetFilter: (objectIds: string[], ghost: boolean) => void
-  filterSelection: (objectIds: string[], ghost: boolean) => void
+  resetFilter: (objectIds: string[], ghost: boolean, zoom: boolean) => void
+  filterSelection: (objectIds: string[], ghost: boolean, zoom: boolean) => void
   setViewMode: (viewMode: ViewMode) => void
   colorObjectsByGroup: (
     colorById: {
@@ -53,6 +54,7 @@ export interface IViewerEvents {
   toggleGhostHidden: (ghost: boolean) => void
   loadObjects: (objects: object[]) => void
   objectsLoaded: () => void
+  objectClicked: (hit: Hit | null, isMultiSelect: boolean, mouseEvent?: PointerEvent) => void
 }
 
 export type ColorBy = {
@@ -65,7 +67,7 @@ export class ViewerHandler {
   public viewer: Viewer
   public cameraControls: CameraController
   public filtering: FilteringExtension
-  public selection: SelectionExtension
+  public selection: FilteredSelectionExtension
   private filteringState: FilteringState
 
   constructor() {
@@ -91,7 +93,7 @@ export class ViewerHandler {
     this.viewer = await createViewer(parent)
     this.cameraControls = this.viewer.getExtension(CameraController)
     this.filtering = this.viewer.getExtension(FilteringExtension)
-    this.selection = this.viewer.getExtension(SelectionExtension)
+    this.selection = this.viewer.getExtension(FilteredSelectionExtension)
 
     const store = useVisualStore()
     if (store.isOrthoProjection) {
@@ -101,6 +103,14 @@ export class ViewerHandler {
     this.viewer.on(ViewerEvent.LoadComplete, (arg: string) => {
       store.clearLoadingProgress()
     })
+
+    // Set up event listener for viewer's built-in object clicked events
+    this.viewer.on(ViewerEvent.ObjectClicked, (selection: SelectionEvent | null) => {
+      console.log('🎯 Viewer ObjectClicked event received:', selection)
+    })
+
+    // Set up event listener for filtered selection events
+    this.selection.on(FilteredSelectionEvent.FilteredObjectClicked, this.handleFilteredSelection)
   }
 
   emit<E extends keyof IViewerEvents>(event: E, ...payload: Parameters<IViewerEvents[E]>): void {
@@ -149,20 +159,24 @@ export class ViewerHandler {
     }
   }
 
-  public filterSelection = (objectIds: string[], ghost: boolean) => {
+  public filterSelection = (objectIds: string[], ghost: boolean, zoom: boolean = true) => {
     console.log('🔗 Handling filterSelection inside ViewerHandler')
     if (objectIds) {
       this.unIsolateObjects()
       this.filteringState = this.filtering.isolateObjects(objectIds, 'powerbi', true, ghost)
-      this.zoomObjects(objectIds, true)
+      if (zoom) {
+        this.zoomObjects(objectIds, true)
+      }
     }
   }
 
-  public resetFilter = (objectIds: string[], ghost: boolean) => {
+  public resetFilter = (objectIds: string[], ghost: boolean, zoom: boolean = true) => {
     console.log('🔗 Handling filterSelection inside ViewerHandler')
     if (objectIds) {
       this.isolateObjects(objectIds, ghost)
-      this.zoomObjects(objectIds, true)
+      if (zoom) {
+        this.zoomObjects(objectIds, true)
+      }
     }
   }
 
@@ -194,25 +208,7 @@ export class ViewerHandler {
     }
   }
 
-  public intersect = (coords: { x: number; y: number }) => {
-    const point = this.viewer.Utils.screenToNDC(coords.x, coords.y)
 
-    const intQuery: IntersectionQuery = {
-      operation: 'Pick',
-      point
-    }
-
-    const res = this.viewer.query(intQuery)
-
-    if (!res) {
-      this.selection.clearSelection()
-      return
-    }
-    return {
-      hit: this.pickViewableHit(res.objects),
-      objects: res.objects
-    }
-  }
 
   public loadObjects = async (modelObjects: object[][]) => {
     await this.viewer.unloadAll()
@@ -260,7 +256,7 @@ export class ViewerHandler {
       )
       this.cameraControls.setCameraView({ position, target }, true)
     }
-    
+
     // Emit objects loaded event to trigger update
     this.emit('objectsLoaded')
   }
@@ -276,32 +272,35 @@ export class ViewerHandler {
     store.handleObjectsLoadedComplete()
   }
 
-  private pickViewableHit(hits: Hit[]): Hit | null {
-    // The current filtering state
-    const filteringState = this.filtering.filteringState
-    // Are there any objects isolated?
-    const hasIsolatedObjects =
-      !!filteringState.isolatedObjects && filteringState.isolatedObjects.length !== 0
-    // Are there any objects hidden?
-    const hasHiddenObjects =
-      !!filteringState.hiddenObjects && filteringState.hiddenObjects.length !== 0
-    // No isolated or hidden objects? Return the first hit
-    if (hasIsolatedObjects && !hasHiddenObjects) {
-      return hits.find((h) => filteringState.isolatedObjects.includes(h.guid))
-    }
-
-    for (let k = 0; k < hits.length; k++) {
-      /** Return the first one that's not hidden or isolated. */
-      if (
-        hasIsolatedObjects &&
-        filteringState.isolatedObjects?.includes(hits[k].guid) &&
-        hasHiddenObjects &&
-        filteringState.hiddenObjects?.includes(hits[k].guid)
-      )
-        return hits[k]
+  private handleFilteredSelection = (selection: SelectionEvent | null) => {
+    console.log('🎯 Filtered selection event received:', selection)
+    
+    let hit: Hit | null = null
+    let isMultiSelect = false
+    let mouseEvent: PointerEvent | undefined = undefined
+    
+    if (selection && selection.hits.length > 0) {
+      // Convert the first hit to the Hit format expected by ViewerWrapper
+      const firstHit = selection.hits[0]
+      hit = {
+        guid: firstHit.node.model.id,
+        object: firstHit.node.model.raw,
+        point: {
+          x: firstHit.point.x,
+          y: firstHit.point.y,
+          z: firstHit.point.z
+        }
+      }
+      isMultiSelect = selection.multiple
+      mouseEvent = selection.event
     }
+    
+    // Emit the objectClicked event for ViewerWrapper to handle
+    this.emit('objectClicked', hit, isMultiSelect, mouseEvent)
   }
 
+
+
   public dispose() {
     this.viewer.getExtension(CameraController).dispose()
     this.viewer.dispose()
@@ -317,11 +316,11 @@ const createViewer = async (parent: HTMLElement): Promise<Viewer> => {
   await viewer.init()
 
   viewer.createExtension(HybridCameraController) // camera controller
-  viewer.createExtension(SelectionExtension) // selection helper
+  viewer.createExtension(FilteringExtension) // filtering - must be created before FilteredSelectionExtension
+  viewer.createExtension(FilteredSelectionExtension) // filtered selection helper - depends on FilteringExtension
   // viewer.createExtension(SectionTool) // section tool, possibly not needed for now?
   // viewer.createExtension(SectionOutlines) // section tool, possibly not needed for now?
   // viewer.createExtension(MeasurementsExtension) // measurements, possibly not needed for now?
-  viewer.createExtension(FilteringExtension) // filtering
   viewer.createExtension(ViewModes) // view modes
 
   console.log('🎥 Viewer is created!')

src/powerbi-visual/src/settings/dataLoadingSettings.ts

@@ -0,0 +1,15 @@
+import { formattingSettings as fs } from 'powerbi-visuals-utils-formattingmodel'
+
+export class DataLoadingSettings extends fs.SimpleCard {
+  name = 'dataLoading'
+  displayName = 'Data Management'
+
+  public internalizeData = new fs.ToggleSwitch({
+    name: 'internalizeData',
+    displayName: 'Internalize Data',
+    description: 'When enabled, objects are downloaded and stored in the Power BI file for offline access. When disabled, objects are loaded directly from Speckle servers (online mode).',
+    value: false
+  })
+
+  slices: fs.Slice[] = [this.internalizeData]
+}

src/powerbi-visual/src/settings/visualSettingsModel.ts

@@ -1,17 +1,18 @@
 import { formattingSettings as fs } from 'powerbi-visuals-utils-formattingmodel'
-import { ColorSelectorSettings, ColorSettings } from 'src/settings/colorSettings'
+import { ColorSettings } from 'src/settings/colorSettings'
 import { CameraSettings } from 'src/settings/cameraSettings'
 import { LightingSettings } from 'src/settings/lightingSettings'
+import { DataLoadingSettings } from 'src/settings/dataLoadingSettings'
 
 export class SpeckleVisualSettingsModel extends fs.Model {
   // Building my visual formatting settings card
   public color: ColorSettings = new ColorSettings()
 
-  public colorSelector: ColorSelectorSettings = new ColorSelectorSettings()
+  public dataLoading: DataLoadingSettings = new DataLoadingSettings()
 
   // public camera: CameraSettings = new CameraSettings()
 
   // public lighting: LightingSettings = new LightingSettings()
 
-  cards = [this.color]
+  cards = [this.color, this.dataLoading]
 }

src/powerbi-visual/src/store/visualStore.ts

@@ -3,8 +3,8 @@ import { Version } from '@src/composables/useUpdateConnector'
 import { ColorBy, IViewerEvents } from '@src/plugins/viewer'
 import { SpeckleVisualSettingsModel } from '@src/settings/visualSettingsModel'
 import { SpeckleDataInput } from '@src/types'
-import { zipModelObjects } from '@src/utils/compression'
 import { ReceiveInfo } from '@src/utils/matrixViewUtils'
+import { zipModelObjects } from '@src/utils/compression'
 import { defineStore } from 'pinia'
 import { Vector3 } from 'three'
 import { computed, ref, shallowRef } from 'vue'
@@ -26,7 +26,10 @@ export const useVisualStore = defineStore('visualStore', () => {
   const host = shallowRef<powerbi.extensibility.visual.IVisualHost>()
   const formattingSettings = ref<SpeckleVisualSettingsModel>()
   const loadingProgress = ref<LoadingProgress>(undefined)
-  const objectsFromStore = ref<object[]>(undefined)
+  const objectsFromStore = ref<object[][]>(undefined)
+
+  // State tracking for toggle reset prevention
+  const previousToggleState = ref<boolean | undefined>(undefined)
 
   const postFileSaveSkipNeeded = ref<boolean>(false)
   const postClickSkipNeeded = ref<boolean>(false)
@@ -36,6 +39,7 @@ export const useVisualStore = defineStore('visualStore', () => {
   const isOrthoProjection = ref<boolean>(false)
   const isGhostActive = ref<boolean>(true)
   const isNavbarHidden = ref<boolean>(false)
+  const isZoomOnFilterActive = ref<boolean>(true)
 
   const commonError = ref<string>(undefined)
 
@@ -82,7 +86,19 @@ export const useVisualStore = defineStore('visualStore', () => {
     host.value = hostToSet
   }
 
-  const setReceiveInfo = (newReceiveInfo: ReceiveInfo) => (receiveInfo.value = newReceiveInfo)
+  const setReceiveInfo = (newReceiveInfo: ReceiveInfo) => {
+    receiveInfo.value = newReceiveInfo
+    
+    // Always save receiveInfo to file for credentials persistence (contains token and metadata)
+    // This ensures weak tokens are available even when desktop service is unavailable
+    if (formattingSettings.value?.dataLoading.internalizeData.value && objectsFromStore.value) {
+      // If internalize is ON and we have objects, save both objects and receiveInfo together
+      writeObjectsToFile(objectsFromStore.value)
+    } else {
+      // Otherwise just save receiveInfo alone (credentials only)
+      writeReceiveInfoToFile()
+    }
+  }
 
   const setLatestAvailableVersion = (version: Version | null) => {
     latestAvailableVersion.value = version
@@ -112,7 +128,7 @@ export const useVisualStore = defineStore('visualStore', () => {
     }
   }
 
-  const setObjectsFromStore = (newObjectsFromStore: object[]) => {
+  const setObjectsFromStore = (newObjectsFromStore: object[][]) => {
     objectsFromStore.value = newObjectsFromStore
   }
 
@@ -133,17 +149,24 @@ export const useVisualStore = defineStore('visualStore', () => {
   }
 
   const loadObjectsFromFile = async (objects: object[][]) => {
+    console.log('📁 loadObjectsFromFile called with:', objects.length, 'models')
     const savedVersionObjectId = objects.map((o) => (o[0] as SpeckleObject).id).join(',')
     lastLoadedRootObjectId.value = savedVersionObjectId
     viewerReloadNeeded.value = false
     console.log(`📦 Loading viewer from cached data with ${lastLoadedRootObjectId.value} id.`)
+    console.log('📁 About to call viewerEmit loadObjects...')
     await viewerEmit.value('loadObjects', objects)
+    console.log('📁 viewerEmit loadObjects completed')
     objectsFromStore.value = objects
     isViewerObjectsLoaded.value = true
     viewerReloadNeeded.value = false
     setIsLoadingFromFile(false)
+    console.log('📁 loadObjectsFromFile completed successfully')
   }
 
+  const setIsLoadingFromFile = (newValue: boolean) => (isLoadingFromFile.value = newValue)
+
+
   /**
    * Sets upcoming data input into store to be able to pass it through viewer by evaluating the data.
    * @param newValue new data input that user dragged and dropped to the fields in visual
@@ -158,20 +181,26 @@ export const useVisualStore = defineStore('visualStore', () => {
       await viewerEmit.value('loadObjects', dataInput.value.modelObjects)
       viewerReloadNeeded.value = false
       isViewerObjectsLoaded.value = true
-      setLoadingProgress('Storing objects into file', null)
-      writeObjectsToFile(dataInput.value.modelObjects)
+      
+      // Store the model objects for potential internalization
+      if (dataInput.value.modelObjects && dataInput.value.modelObjects.length > 0) {
+        console.log('📦 Storing modelObjects in visualStore for internalization:', dataInput.value.modelObjects.length, 'models')
+        objectsFromStore.value = dataInput.value.modelObjects
+      }
+      
+      // Note: Object internalization is now handled by toggle in visual.ts
       loadingProgress.value = undefined
     }
 
     if (dataInput.value.selectedIds.length > 0) {
       isFilterActive.value = true
-      viewerEmit.value('filterSelection', dataInput.value.selectedIds, isGhostActive.value)
+      viewerEmit.value('filterSelection', dataInput.value.selectedIds, isGhostActive.value, isZoomOnFilterActive.value)
     } else {
       isFilterActive.value = false
       latestColorBy.value = dataInput.value.colorByIds
       // Only apply filtering if object IDs are available, otherwise show all objects normally
       if (fieldInputState.value.objectIds && dataInput.value.objectIds && dataInput.value.objectIds.length > 0) {
-        viewerEmit.value('resetFilter', dataInput.value.objectIds, isGhostActive.value)
+        viewerEmit.value('resetFilter', dataInput.value.objectIds, isGhostActive.value, isZoomOnFilterActive.value)
       } else {
         // No object IDs provided - show all objects without any filtering
         viewerEmit.value('unIsolateObjects')
@@ -191,6 +220,23 @@ export const useVisualStore = defineStore('visualStore', () => {
           objectName: 'storedData',
           properties: {
             speckleObjects: compressedChunks,
+            receiveInfo: JSON.stringify(receiveInfo.value) // Keep receiveInfo in sync when storing objects
+          },
+          selector: null
+        }
+      ]
+    })
+  }
+
+  const writeReceiveInfoToFile = () => {
+    // NOTE: need skipping the update function, it resets the viewer state unneccessarily.
+    postFileSaveSkipNeeded.value = true
+
+    host.value.persistProperties({
+      merge: [
+        {
+          objectName: 'storedData',
+          properties: {
             receiveInfo: JSON.stringify(receiveInfo.value)
           },
           selector: null
@@ -247,6 +293,22 @@ export const useVisualStore = defineStore('visualStore', () => {
     })
   }
 
+  const writeZoomOnFilterToFile = () => {
+    // NOTE: need skipping the update function, it resets the viewer state unneccessarily.
+    postFileSaveSkipNeeded.value = true
+    host.value.persistProperties({
+      merge: [
+        {
+          objectName: 'camera',
+          properties: {
+            zoomOnFilter: isZoomOnFilterActive.value
+          },
+          selector: null
+        }
+      ]
+    })
+  }
+
   const writeViewModeToFile = (viewMode: ViewMode) => {
     // NOTE: need skipping the update function, it resets the viewer state unneccessarily.
     postFileSaveSkipNeeded.value = true
@@ -295,6 +357,22 @@ export const useVisualStore = defineStore('visualStore', () => {
     })
   }
 
+  const writeDataLoadingModeToFile = (internalizeData: boolean) => {
+    // NOTE: need skipping the update function, it resets the viewer state unneccessarily.
+    postFileSaveSkipNeeded.value = true
+    host.value.persistProperties({
+      merge: [
+        {
+          objectName: 'dataLoading',
+          properties: {
+            internalizeData: internalizeData
+          },
+          selector: null
+        }
+      ]
+    })
+  }
+
   const writeCameraPositionToFile = (position: Vector3, target: Vector3) => {
     // NOTE: need skipping the update function, it resets the viewer state unneccessarily.
     postFileSaveSkipNeeded.value = true
@@ -321,7 +399,6 @@ export const useVisualStore = defineStore('visualStore', () => {
 
   const clearDataInput = () => (dataInput.value = null)
 
-  const setIsLoadingFromFile = (newValue: boolean) => (isLoadingFromFile.value = newValue)
 
   const setViewerReadyToLoad = (newValue: boolean) => (isViewerReadyToLoad.value = newValue)
 
@@ -353,6 +430,10 @@ export const useVisualStore = defineStore('visualStore', () => {
     isGhostActive.value = val
   }
 
+  const setIsZoomOnFilterActive = (val: boolean) => {
+    isZoomOnFilterActive.value = val
+  }
+
   const setPostFileSaveSkipNeeded = (newValue: boolean) => (postFileSaveSkipNeeded.value = newValue)
   const setPostClickSkipNeeded = (newValue: boolean) => (postClickSkipNeeded.value = newValue)
 
@@ -366,7 +447,7 @@ export const useVisualStore = defineStore('visualStore', () => {
   const resetFilters = () => {
     // Only apply filtering if object IDs are available, otherwise show all objects normally
     if (fieldInputState.value.objectIds && dataInput.value && dataInput.value.objectIds && dataInput.value.objectIds.length > 0) {
-      viewerEmit.value('resetFilter', dataInput.value.objectIds, isGhostActive.value)
+      viewerEmit.value('resetFilter', dataInput.value.objectIds, isGhostActive.value, isZoomOnFilterActive.value)
     } else {
       // No object IDs provided - show all objects without any filtering
       viewerEmit.value('unIsolateObjects')
@@ -395,13 +476,13 @@ export const useVisualStore = defineStore('visualStore', () => {
       // Restore selection filters if they exist
       if (dataInput.value.selectedIds.length > 0) {
         isFilterActive.value = true
-        viewerEmit.value('filterSelection', dataInput.value.selectedIds, isGhostActive.value)
+        viewerEmit.value('filterSelection', dataInput.value.selectedIds, isGhostActive.value, isZoomOnFilterActive.value)
       } else {
         isFilterActive.value = false
         latestColorBy.value = dataInput.value.colorByIds
         // Only apply filtering if object IDs are available, otherwise show all objects normally
         if (fieldInputState.value.objectIds && dataInput.value.objectIds && dataInput.value.objectIds.length > 0) {
-          viewerEmit.value('resetFilter', dataInput.value.objectIds, isGhostActive.value)
+          viewerEmit.value('resetFilter', dataInput.value.objectIds, isGhostActive.value, isZoomOnFilterActive.value)
         } else {
           // No object IDs provided - show all objects without any filtering
           viewerEmit.value('unIsolateObjects')
@@ -416,6 +497,11 @@ export const useVisualStore = defineStore('visualStore', () => {
     host.value.refreshHostData()
   }
 
+  // Toggle state tracking functions
+  const setPreviousToggleState = (state: boolean) => {
+    previousToggleState.value = state
+  }
+
   return {
     host,
     receiveInfo,
@@ -443,13 +529,16 @@ export const useVisualStore = defineStore('visualStore', () => {
     isOrthoProjection,
     isGhostActive,
     isNavbarHidden,
+    isZoomOnFilterActive,
     latestAvailableVersion,
     isConnectorUpToDate,
     commonError,
+    previousToggleState,
     setCommonError,
     setLatestAvailableVersion,
     setIsOrthoProjection,
     setIsGhost,
+    setIsZoomOnFilterActive,
     setFormattingSettings,
     setBrandingHidden,
     setNavbarHidden,
@@ -466,11 +555,13 @@ export const useVisualStore = defineStore('visualStore', () => {
     writeObjectsToFile,
     writeCameraViewToFile,
     writeIsGhostToFile,
+    writeZoomOnFilterToFile,
     writeIsOrthoToFile,
     writeViewModeToFile,
     writeCameraPositionToFile,
     writeHideBrandingToFile,
     writeNavbarVisibilityToFile,
+    writeDataLoadingModeToFile,
     toggleBranding,
     toggleNavbar,
     setViewerEmitter,
@@ -483,6 +574,7 @@ export const useVisualStore = defineStore('visualStore', () => {
     setIsLoadingFromFile,
     resetFilters,
     downloadLatestVersion,
-    handleObjectsLoadedComplete
+    handleObjectsLoadedComplete,
+    setPreviousToggleState
   }
 })

src/powerbi-visual/src/utils/matrixViewUtils.ts

@@ -11,6 +11,8 @@ import { FieldInputState, useVisualStore } from '@src/store/visualStore'
 import { delay } from 'lodash'
 import { getSlugFromHostAppNameAndVersion } from './hostAppSlug'
 import { useUpdateConnector } from '@src/composables/useUpdateConnector'
+import { SpeckleApiLoader } from '@src/loader/SpeckleApiLoader'
+import { unzipModelObjects } from './compression'
 
 export class AsyncPause {
   private lastPauseTime = 0
@@ -158,40 +160,8 @@ export type ReceiveInfo = {
   workspaceName?: string
   canHideBranding: boolean
   version?: string
-}
-
-export type PreGetObjects = {
-  modelExists: boolean
-  objectCount?: number
-}
-
-async function getPreGetObjects(commaSeparatedModelIds: string): Promise<PreGetObjects[]> {
-  const modelIds = (commaSeparatedModelIds as string).split(',')
-  const preGetObjects = []
-
-  for await (const id of modelIds) {
-    const res = await getPreGetObjectsForModel(id)
-    preGetObjects.push(res)
-  }
-  return preGetObjects
-}
-
-async function getPreGetObjectsForModel(id: string): Promise<PreGetObjects> {
-  try {
-    const preGetObjectsRes = await fetch(`http://localhost:29364/pre-get-objects/${id}`)
-
-    if (!preGetObjectsRes.body) {
-      console.log('No response body for pre get objects')
-      return {
-        modelExists: false,
-        objectCount: null
-      } as PreGetObjects
-    }
-
-    return (await preGetObjectsRes.json()) as PreGetObjects
-  } catch (error) {
-    console.log(error)
-  }
+  token: string
+  projectId?: string
 }
 
 async function getReceiveInfo(id) {
@@ -206,120 +176,33 @@ async function getReceiveInfo(id) {
     return await response.json()
   } catch (error) {
     console.log(error)
-    console.log("User infp couldn't retrieved from local server.")
+    console.log("User info couldn't retrieved from local server.")
   }
 }
 
-async function fetchStreamedData(commaSeparatedModelIds: string, totalObjectCount: number) {
-  const modelIds = (commaSeparatedModelIds as string).split(',')
+async function fetchFromSpeckleApi(
+  objectIds: string,
+  serverUrl: string,
+  projectId: string,
+  token: string
+): Promise<object[][]> {
+  const ids = objectIds.split(',')
   const modelObjects = []
 
-  let loadedObjectCount = 0
-
-  for await (const id of modelIds) {
-    const objects = await fetchStreamedDataForModel(id, totalObjectCount, loadedObjectCount)
-    modelObjects.push(objects)
-    loadedObjectCount += objects.length
-  }
-  return modelObjects
-}
-
-async function fetchStreamedDataForModel(
-  id: string,
-  totalObjectCount: number,
-  loadedObjectCount: number
-) {
-  console.log(loadedObjectCount, totalObjectCount)
-
-  try {
-    const visualStore = useVisualStore()
-    const response = await fetch(`http://localhost:29364/get-objects/${id}`)
-
-    if (!response.body) {
-      console.error('No response body')
-      return
-    }
-
-    const reader = response.body.getReader()
-    const decoder = new TextDecoder()
-    const objects = []
-    let buffer = ''
-
-    const start = performance.now()
-    console.log('Streaming started...')
-    for await (const chunk of readStream(reader)) {
-      // chucks.push(chuck)
-      buffer += decoder.decode(chunk, { stream: true })
-
-      let boundary
-      while ((boundary = buffer.indexOf('\n')) !== -1) {
-        const jsonString = buffer.slice(0, boundary)
-        buffer = buffer.slice(boundary + 1)
-
-        try {
-          const obj = JSON.parse(jsonString)
-          objects.push(obj)
-          visualStore.setLoadingProgress(
-            'Loading objects from storage',
-            (objects.length + loadedObjectCount) / totalObjectCount
-          )
-          // console.log('Loading', (objects.length + loadedObjectCount) / totalObjectCount)
-
-          // console.log('Received object:', jsonObject)
-        } catch (e) {
-          console.error('Invalid JSON chunk:', jsonString)
-        }
-      }
-    }
+  for (const objectId of ids) {
     try {
-      const obj = JSON.parse(buffer)
-      objects.push(obj)
-      // console.log('Received object:', jsonObject)
-    } catch (e) {
-      console.error('Invalid JSON chunk:', buffer)
-    }
-
-    const end = performance.now()
-    console.log(`Objects streamed in: ${(end - start) / 1000} s`)
-
-    const startObjectCleanup = performance.now()
-    // Skips first element
-    for (let i = 1; i < objects.length; i++) {
-      const obj = objects[i]
-      if (obj.speckle_type) {
-        if (obj.speckle_type.includes('Objects.Data.DataObject')) {
-          delete obj.properties
-        }
-      }
-      delete obj.__closure
-    }
-    const endObjectCleanup = performance.now()
-    console.log(`Objects cleaned up in: ${(endObjectCleanup - startObjectCleanup) / 1000} s`)
-
-    try {
-      const sizeInBytes = new TextEncoder().encode(JSON.stringify(objects)).length
-      const sizeInMB = sizeInBytes / (1024 * 1024)
-      console.log(`Size of objects: ${sizeInMB} MB`)
+      console.log(`Downloading from Speckle API: ${objectId}`)
+      const loader = new SpeckleApiLoader(serverUrl, projectId, token)
+      const objects = await loader.downloadObjectsWithChildren(objectId)
+      modelObjects.push(objects)
+      console.log(`Downloaded ${objects.length} objects from Speckle`)
     } catch (error) {
-      console.log("Can't calculate the size of the model")
-      console.log(error)
+      console.error(`Failed to download objects from Speckle:`, error)
+      throw error
     }
-
-    return objects
-  } catch (error) {
-    console.log(error)
-    console.log("Objects couldn't retrieved from local server.")
-  } finally {
-    console.log('Streaming finished!')
   }
-}
 
-async function* readStream(reader) {
-  while (true) {
-    const { done, value } = await reader.read()
-    if (done) break
-    yield value
-  }
+  return modelObjects
 }
 
 export async function processMatrixView(
@@ -327,7 +210,8 @@ export async function processMatrixView(
   host: powerbi.extensibility.visual.IVisualHost,
   hasColorFilter: boolean,
   settings: SpeckleVisualSettingsModel,
-  onSelectionPair: (objId: string, selectionId: powerbi.extensibility.ISelectionId) => void
+  onSelectionPair: (objId: string, selectionId: powerbi.extensibility.ISelectionId) => void,
+  internalizedData?: string
 ): Promise<SpeckleDataInput> {
   const visualStore = useVisualStore()
   const objectIds = [],
@@ -340,10 +224,86 @@ export async function processMatrixView(
   const localMatrixView = matrixView.rows.root.children
   let id = null
 
-  if (hasColorFilter) {
-    id = localMatrixView[0].children[0].values[0].value as unknown as string
-  } else {
-    id = localMatrixView[0].values[0].value as unknown as string
+  // Safety check for matrix data structure
+  if (!localMatrixView || localMatrixView.length === 0) {
+    throw new Error('Matrix view has no data rows')
+  }
+
+  try {
+    if (hasColorFilter) {
+      if (!localMatrixView[0].children || localMatrixView[0].children.length === 0 || !localMatrixView[0].children[0].values) {
+        throw new Error('Matrix view structure is incomplete for color filter mode')
+      }
+      id = localMatrixView[0].children[0].values[0].value as unknown as string
+    } else {
+      if (!localMatrixView[0].values || !localMatrixView[0].values[0]) {
+        throw new Error('Matrix view structure is incomplete for normal mode')
+      }
+      id = localMatrixView[0].values[0].value as unknown as string
+    }
+  } catch (error) {
+    console.error('Error accessing matrix data:', error)
+    throw new Error(`Failed to extract root object ID from matrix: ${error.message}`)
+  }
+
+  // Check for internalized data but ONLY if it matches current matrix data
+  let internalizedModelObjects: object[][] | undefined = undefined
+  if (settings.dataLoading.internalizeData.value && internalizedData) {
+    console.log('📁 Checking internalized data in processMatrixView')
+
+    try {
+      internalizedModelObjects = unzipModelObjects(internalizedData)
+
+      if (internalizedModelObjects && internalizedModelObjects.length > 0) {
+        // CRITICAL: Validate that internalized data matches current matrix data
+        const internalizedRootId = (internalizedModelObjects[0][0] as any).id
+        if (internalizedRootId !== id) {
+          console.log(`📁 Internalized data mismatch: stored=${internalizedRootId}, current=${id}. Using fresh data.`)
+          internalizedModelObjects = undefined // Clear internalized data - use fresh data instead
+        } else {
+          console.log(
+            '📁 Successfully validated internalized data matches current matrix:',
+            internalizedModelObjects.length,
+            'models'
+          )
+        }
+      }
+
+      if (internalizedModelObjects && internalizedModelObjects.length > 0) {
+
+        // Set dummy receiveInfo to prevent UI errors
+        if (!visualStore.receiveInfo) {
+          visualStore.setReceiveInfo({
+            userEmail: 'offline@speckle.systems',
+            serverUrl: 'offline',
+            sourceApplication: 'PowerBI Offline',
+            workspaceId: 'offline',
+            workspaceName: 'Offline Workspace',
+            workspaceLogo: '',
+            version: '1.0.0',
+            canHideBranding: false,
+            token: 'offline',
+            projectId: 'offline'
+          })
+        }
+
+        // Only reload if switching models or not already loaded
+        const needsReload = !visualStore.isViewerObjectsLoaded || visualStore.lastLoadedRootObjectId !== id
+        if (needsReload) {
+          console.log('🔄 Forcing viewer reload for internalized data (model switch or first load)')
+          visualStore.setViewerReloadNeeded()
+          visualStore.setViewerReadyToLoad(true)
+          visualStore.setLoadingProgress('📁 Loading from file', null)
+        } else {
+          console.log('📁 Internalized data already loaded, skipping reload')
+        }
+        visualStore.lastLoadedRootObjectId = id // Set to current ID to skip API calls
+      } else {
+        console.error('📁 Failed to unzip internalized data')
+      }
+    } catch (error) {
+      console.error('📁 Error processing internalized data:', error)
+    }
   }
 
   // const id = localMatrixView[0].values[0].value as unknown as string
@@ -352,48 +312,85 @@ export async function processMatrixView(
 
   let modelObjects: object[][] = undefined
 
-  if (visualStore.isLoadingFromFile) {
-    console.log('The data is loading from file, skipping the streaming it.')
-  }
-
-  if (visualStore.lastLoadedRootObjectId !== id && !visualStore.isLoadingFromFile) {
+  if (
+    visualStore.lastLoadedRootObjectId !== id &&
+    !visualStore.isLoadingFromFile &&
+    !internalizedModelObjects
+  ) {
     const start = performance.now()
 
-    const getPreGetObjectsRes: PreGetObjects[] = await getPreGetObjects(id)
-
-    if (getPreGetObjectsRes.some((preGetObjects) => preGetObjects.modelExists === false)) {
-      visualStore.setCommonError(
-        'Version Object ID is not found in storage. Please make sure you placed correct field or consider refreshing your data via data connector.'
-      )
-      visualStore.setViewerReadyToLoad(false)
-      return
-    }
-
+    // Get receive info from desktop service to populate visual store
     const receiveInfo = await getReceiveInfo(id)
     if (receiveInfo) {
       visualStore.setReceiveInfo({
-        userEmail: receiveInfo.email,
-        serverUrl: receiveInfo.server,
-        sourceApplication: getSlugFromHostAppNameAndVersion(receiveInfo.sourceApplication),
-        workspaceId: receiveInfo.workspaceId,
-        workspaceName: receiveInfo.workspaceName,
-        workspaceLogo: receiveInfo.workspaceLogo,
-        version: receiveInfo.version,
-        canHideBranding: receiveInfo.canHideBranding
+        userEmail: receiveInfo.email || receiveInfo.Email,
+        serverUrl: receiveInfo.server || receiveInfo.Server,
+        sourceApplication: getSlugFromHostAppNameAndVersion(
+          receiveInfo.sourceApplication || receiveInfo.SourceApplication
+        ),
+        workspaceId: receiveInfo.workspaceId || receiveInfo.WorkspaceId,
+        workspaceName: receiveInfo.workspaceName || receiveInfo.WorkspaceName,
+        workspaceLogo: receiveInfo.workspaceLogo || receiveInfo.WorkspaceLogo,
+        version: receiveInfo.version || receiveInfo.Version,
+        canHideBranding: receiveInfo.canHideBranding ?? receiveInfo.CanHideBranding,
+        token: receiveInfo.weakToken || receiveInfo.WeakToken,
+        projectId: receiveInfo.projectId || receiveInfo.ProjectId
       })
-      console.log(`Receive info retrieved from desktop service`, receiveInfo)
+      console.log(`Receive info retrieved from desktop service - credentials loaded`)
     }
 
-    const totalObjectCount = getPreGetObjectsRes.reduce((sum, obj) => {
-      return sum + (obj.objectCount ?? 0)
-    }, 0)
+    // Now get the data from visual store for Speckle API download
+    const token = visualStore.receiveInfo?.token
+    const serverUrl = visualStore.receiveInfo?.serverUrl
+    const projectId = visualStore.receiveInfo?.projectId
+
+    if (!token || !serverUrl || !projectId) {
+      visualStore.setCommonError(
+        'Missing Speckle credentials. Please refresh the data from the data connector.'
+      )
+      visualStore.setViewerReadyToLoad(false)
+      return {
+        modelObjects: [],
+        objectIds: [],
+        selectedIds: [],
+        colorByIds: null,
+        objectTooltipData: new Map(),
+        isFromStore: false
+      }
+    }
 
     visualStore.setViewerReadyToLoad(true)
-    // stream data
-    modelObjects = await fetchStreamedData(id, totalObjectCount)
+
+    console.log('Downloading objects directly from Speckle API...')
+    console.log(`Server: ${serverUrl}, Project: ${projectId}, Object: ${id}`)
+    try {
+      modelObjects = await fetchFromSpeckleApi(id, serverUrl, projectId, token)
+      console.log('Successfully downloaded from Speckle API')
+
+      // Debug: Check what we're passing to the viewer
+      if (modelObjects && modelObjects.length > 0 && modelObjects[0].length > 0) {
+        console.log('ModelObjects structure:', {
+          totalModels: modelObjects.length,
+          firstModelObjectCount: modelObjects[0].length,
+          firstObject: modelObjects[0][0]
+        })
+      }
+    } catch (error) {
+      console.error('Failed to download from Speckle API:', error)
+      visualStore.setCommonError(`Failed to download objects from Speckle: ${error.message}`)
+      visualStore.setViewerReadyToLoad(false)
+      return {
+        modelObjects: [],
+        objectIds: [],
+        selectedIds: [],
+        colorByIds: null,
+        objectTooltipData: new Map(),
+        isFromStore: false
+      }
+    }
 
     visualStore.setViewerReloadNeeded() // they should be marked as deferred action bc of update function complexity.
-    visualStore.setLoadingProgress('Loading objects into viewer', null)
+    visualStore.setLoadingProgress('🌍 Loading objects into viewer', null)
     console.log(`🚀 Upload is completed in ${(performance.now() - start) / 1000} s!`)
   }
 
@@ -538,11 +535,11 @@ export async function processMatrixView(
   previousPalette = host.colorPalette['colorPalette']
 
   return {
-    modelObjects,
+    modelObjects: internalizedModelObjects || modelObjects, // Use internalized data if available
     objectIds,
     selectedIds,
     colorByIds: colorByIds.length > 0 ? colorByIds : null,
     objectTooltipData,
-    isFromStore: false
+    isFromStore: !!internalizedModelObjects // true if loaded from internalized data
   }
 }

src/powerbi-visual/src/utils/viewerUtils.ts

@@ -1,4 +1,3 @@
-import { FilteringState } from '@speckle/viewer'
 import { OrthographicCamera, PerspectiveCamera } from 'three'
 
 export function projectToScreen(cam: OrthographicCamera | PerspectiveCamera, loc) {
@@ -16,17 +15,7 @@ export interface Hit {
   object?: Record<string, unknown>
   point: { x: number; y: number; z: number }
 }
-export function pickViewableHit(hits: Hit[], state: FilteringState): Hit | null {
-  let hit = null
-  if (state.isolatedObjects) {
-    // Find the first hit contained in the isolated objects
-    hit = hits.find((hit) => {
-      const hitId = hit.object.id as string
-      return state.isolatedObjects.includes(hitId)
-    })
-  }
-  return hit
-}
+
 
 export const createViewerContainerDiv = (parent: HTMLElement) => {
   const container = parent.appendChild(document.createElement('div'))

src/powerbi-visual/src/visual.ts

@@ -10,6 +10,7 @@ import { selectionHandlerKey, tooltipHandlerKey } from 'src/injectionKeys'
 import { SpeckleDataInput } from './types'
 import { processMatrixView, ReceiveInfo, validateMatrixView } from './utils/matrixViewUtils'
 import { SpeckleVisualSettingsModel } from './settings/visualSettingsModel'
+import { unzipModelObjects } from './utils/compression'
 
 import TooltipHandler from './handlers/tooltipHandler'
 import SelectionHandler from './handlers/selectionHandler'
@@ -21,7 +22,6 @@ import ITooltipService = powerbi.extensibility.ITooltipService
 
 import { pinia } from './plugins/pinia'
 import { useVisualStore } from './store/visualStore'
-import { unzipModelObjects } from './utils/compression'
 
 // noinspection JSUnusedGlobalSymbols
 export class Visual implements IVisual {
@@ -88,13 +88,43 @@ export class Visual implements IVisual {
 
     // @ts-ignore
     console.log('⤴️ Update type 👉', powerbi.VisualUpdateType[options.type])
+
     this.formattingSettings = this.formattingSettingsService.populateFormattingSettingsModel(
       SpeckleVisualSettingsModel,
       options.dataViews[0]
     )
 
     visualStore.setFormattingSettings(this.formattingSettings)
-    console.log('Selector colors', this.formattingSettings.colorSelector)
+    console.log(
+      'Data Loading - Internalize Data:',
+      this.formattingSettings.dataLoading.internalizeData.value
+    )
+
+    // Handle toggle state changes
+    const currentToggleState = this.formattingSettings.dataLoading.internalizeData.value
+    const previousToggleState = visualStore.previousToggleState
+
+    // Detect user toggle changes
+    if (previousToggleState !== undefined && currentToggleState !== previousToggleState) {
+      console.log('🔄 User changed toggle from', previousToggleState, 'to', currentToggleState)
+
+      if (currentToggleState) {
+        // Toggle switched ON - internalize via streaming
+        if (visualStore.isViewerObjectsLoaded && visualStore.lastLoadedRootObjectId) {
+          console.log('📁 Toggle ON - starting internalization')
+          await this.internalizeCurrentViewerData()
+        } else {
+          console.log('📁 Toggle ON - no active session to internalize')
+        }
+      } else {
+        // Toggle switched OFF - remove internalized data
+        console.log('🗑️ Toggle OFF - removing internalized data')
+        this.removeInternalizedData()
+      }
+    }
+
+    // CRITICAL: Always update the previous state for next comparison
+    visualStore.setPreviousToggleState(currentToggleState)
 
     try {
       const matrixView = options.dataViews[0].matrix
@@ -114,16 +144,10 @@ export class Visual implements IVisual {
           return
         case powerbi.VisualUpdateType.Data:
           try {
-            // read saved data from file if any
-            if (
-              !visualStore.isViewerObjectsLoaded &&
-              this.isFirstViewerLoad &&
-              options.dataViews[0].metadata.objects
-            ) {
-              const chunks = options.dataViews[0].metadata.objects.storedData
-                ?.speckleObjects as string
-              const objectsFromFile = unzipModelObjects(chunks)
+            // read saved settings from file if any
+            console.log('🔍 Checking for other saved settings:')
 
+            if (!visualStore.isViewerObjectsLoaded && options.dataViews[0].metadata.objects) {
               if (options.dataViews[0].metadata.objects.viewMode?.defaultViewMode as string) {
                 console.log(
                   `Default View Mode: ${
@@ -196,31 +220,71 @@ export class Visual implements IVisual {
                 )
               }
 
-              // get receive info from file for mixpanel
+              if (camera && 'zoomOnFilter' in camera) {
+                console.log(
+                  `Zoom on filter?: ${
+                    options.dataViews[0].metadata.objects.camera?.zoomOnFilter as boolean
+                  }`
+                )
+
+                visualStore.setIsZoomOnFilterActive(
+                  options.dataViews[0].metadata.objects.camera?.zoomOnFilter as boolean
+                )
+              }
+
+              // Log persisted data loading setting but don't force sync
+              if (
+                options.dataViews[0].metadata.objects.dataLoading?.internalizeData !== undefined
+              ) {
+                console.log(
+                  `Stored Data Loading - Internalize Data: ${
+                    options.dataViews[0].metadata.objects.dataLoading?.internalizeData as boolean
+                  }`
+                )
+              }
+
+              // get receive info from file for persistence
               try {
                 const receiveInfoFromFile = JSON.parse(
                   options.dataViews[0].metadata.objects.storedData?.receiveInfo as string
                 ) as ReceiveInfo
-                visualStore.setReceiveInfo(receiveInfoFromFile)
+                // Don't call setReceiveInfo here as it would trigger another save
+                visualStore.receiveInfo = receiveInfoFromFile
               } catch (error) {
                 console.warn(error)
-                console.log('missing mixpanel info')
-              }
-
-              const savedVersionObjectId = objectsFromFile.map((o) => o[0].id).join(',')
-              if (visualStore.lastLoadedRootObjectId !== savedVersionObjectId) {
-                this.tryReadFromFile(objectsFromFile, visualStore)
+                console.log('missing stored receive info')
               }
             }
 
+            // Check for internalized data
+            const internalizedData = options.dataViews[0].metadata.objects?.storedData
+              ?.speckleObjects as string
+
             const input = await processMatrixView(
               matrixView,
               this.host,
               validationResult.colorBy,
               this.formattingSettings,
-              (obj, id) => this.selectionHandler.set(obj, id)
+              (obj, id) => this.selectionHandler.set(obj, id),
+              internalizedData
             )
             this.updateViewer(input)
+
+            // Auto-internalize new API data if toggle is ON and this is fresh data (not from store)
+            // Imagine that user has a visual and select internalizing data and changes the data source
+            // This will automatically internalize the new data
+            if (
+              this.formattingSettings.dataLoading.internalizeData.value &&
+              input.modelObjects &&
+              input.modelObjects.length > 0 &&
+              !input.isFromStore
+            ) {
+              console.log('📦 Auto-internalizing new API data since toggle is ON')
+              // Trigger internalization after objects are loaded
+              setTimeout(() => {
+                this.internalizeCurrentViewerData()
+              }, 2000) // avoid a race condition (i know)
+            }
           } catch (error) {
             console.error('Data update error', error ?? 'Unknown')
           }
@@ -248,9 +312,8 @@ export class Visual implements IVisual {
   }
 
   public getFormattingModel(): powerbi.visuals.FormattingModel {
-    console.log('Showing Formatting settings', this.formattingSettings)
+    console.log('🎨 getFormattingModel called')
     const model = this.formattingSettingsService.buildFormattingModel(this.formattingSettings)
-    console.log('Formatting model was created', model)
     return model
   }
 
@@ -266,14 +329,13 @@ export class Visual implements IVisual {
       // we should give some time to Vue to render ViewerWrapper component to be able to have proper emitter setup. Happiness level 6/10
       setTimeout(() => {
         visualStore.setDataInput(input)
-        // visualStore.writeObjectsToFile(input.objects)
       }, 250)
     }
   }
 
   private tryReadFromFile(objectsFromFile: object[][], visualStore) {
     visualStore.setViewerReadyToLoad(true)
-    visualStore.setIsLoadingFromFile(true) // to block unnecessary streaming data if bg service is running
+    visualStore.setIsLoadingFromFile(true)
     setTimeout(() => {
       visualStore.loadObjectsFromFile(objectsFromFile)
       this.isFirstViewerLoad = false
@@ -281,6 +343,137 @@ export class Visual implements IVisual {
     console.log(`${objectsFromFile.length} objects retrieved from persistent properties!`)
   }
 
+  private async internalizeCurrentViewerData() {
+    const visualStore = useVisualStore()
+
+    // Get the current root object ID from the last loaded data
+    if (!visualStore.lastLoadedRootObjectId) {
+      console.log('📁 No root object ID to internalize')
+      return
+    }
+
+    try {
+      console.log('📁 Starting internalization via desktop service streaming...')
+
+      visualStore.setLoadingProgress('📦 Internalizing data...', null)
+
+      // Use desktop service for internalization
+      // TBD: getting objects from viewer caused two issue:
+      // - Data format -> we need to make an extra operation to match with the offline loader
+      // - Memory -> need to save data two times so sometimes causes memory issues
+      const rootObjectIds = visualStore.lastLoadedRootObjectId
+      const projectId = visualStore.receiveInfo?.projectId
+      
+      // Handle federated models by processing each object ID separately
+      const objectIds = rootObjectIds.split(',')
+      let allStreamedObjects = []
+      
+      for (const objectId of objectIds) {
+        console.log(`📁 Fetching objects for ID: ${objectId}`)
+        
+        // For federated models, pass project ID explicitly to avoid "project id is not set" error
+        const url = projectId 
+          ? `http://localhost:29364/get-objects/${objectId}?projectId=${projectId}`
+          : `http://localhost:29364/get-objects/${objectId}`
+        
+        const response = await fetch(url)
+        
+        if (!response.body) {
+          console.error(`📁 No response body from desktop service for ${objectId}`)
+          continue
+        }
+
+        const reader = response.body.getReader()
+        const decoder = new TextDecoder()
+        let allObjectsData = ''
+
+        console.log(`📁 Streaming objects from desktop service for ${objectId}...`)
+
+        while (true) {
+          const { done, value } = await reader.read()
+          if (done) break
+
+          allObjectsData += decoder.decode(value, { stream: true })
+        }
+
+        // Parse NDJSON (newline-delimited JSON) format
+        const lines = allObjectsData.trim().split('\n')
+        const objectsForThisId = lines.map((line) => JSON.parse(line))
+        
+        console.log(`📁 Streamed ${objectsForThisId.length} objects for ID ${objectId}`)
+        allStreamedObjects.push(...objectsForThisId)
+      }
+      
+      const streamedObjects = allStreamedObjects
+      
+      if (streamedObjects.length === 0) {
+        console.error('📁 No objects retrieved from desktop service')
+        visualStore.clearLoadingProgress()
+        return
+      }
+      
+      console.log(`📁 Retrieved ${streamedObjects.length} total objects from desktop service`)
+
+      // Clean up objects to reduce file size (same as desktop service does)
+      const cleanedObjects = streamedObjects.map((obj: any, index: number) => {
+        // Skip first object (root), clean others
+        if (index === 0) return obj
+
+        const cleanedObj = { ...obj }
+
+        // Remove unnecessary properties
+        if (cleanedObj.speckle_type?.includes('Objects.Data.DataObject')) {
+          delete cleanedObj.properties
+        }
+        delete cleanedObj.__closure
+
+        return cleanedObj
+      })
+
+      console.log(`📁 Cleaned objects: ${cleanedObjects.length} total`)
+
+      // Wrap in array format expected by viewer (object[][])
+      const modelObjectsArray = [cleanedObjects]
+
+      // Use existing writeObjectsToFile method from visualStore
+      visualStore.writeObjectsToFile(modelObjectsArray)
+
+      // Clear loading message immediately when done
+      visualStore.clearLoadingProgress()
+
+      console.log('📁 Successfully internalized data via desktop service!')
+    } catch (error) {
+      console.error('📁 Failed to internalize via desktop service:', error)
+
+      // Clear loading message immediately on error
+      visualStore.clearLoadingProgress()
+    }
+  }
+
+  private removeInternalizedData() {
+    const visualStore = useVisualStore()
+
+    try {
+      // Clear stored data from PowerBI file
+      this.host.persistProperties({
+        merge: [
+          {
+            objectName: 'storedData',
+            properties: {
+              speckleObjects: null,
+              receiveInfo: null
+            },
+            selector: null
+          }
+        ]
+      })
+
+      console.log('🗑️ Successfully removed internalized data from file!')
+    } catch (error) {
+      console.error('🗑️ Failed to remove internalized data:', error)
+    }
+  }
+
   public async destroy() {
     await this.clear()
   }