Merge branch 'dev'

# Conflicts:
#	README.md

src/powerbi-data-connector/Speckle.pq

@@ -247,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",
@@ -357,13 +357,6 @@ Speckle = [
                         ]
                 in
                     result
-        ],
-        Key = [
-            KeyLabel = "Personal Access Token",
-            Label = "Private Project"
-        ],
-        Implicit = [
-            Label = "Public Project"
         ]
     ],
     Label = "Speckle"

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

@@ -1,7 +1,7 @@
 (server as text, optional query as text, optional variables as record) as record =>
     let
         // Enhanced credential retrieval with OAuth2 support
-        apiKey = try Extension.CurrentCredential()[Key] otherwise try Extension.CurrentCredential()[access_token] otherwise null,
+        apiKey = try Extension.CurrentCredential()[access_token] otherwise null,
         
         defaultQuery = "query {
                 activeUser {

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/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/SendToServer.pqm

@@ -41,7 +41,8 @@
         tokenExchangeData = Json.FromValue([
             PowerfulToken = apiKey,
             Scopes = {"profile:read", "streams:read", "users:read"},
-            ProjectId = parsedUrl[projectId]
+            ProjectId = parsedUrl[projectId],
+            ServerUrl = parsedUrl[baseUrl]
         ]),
         
         tokenExchangeResponse = Web.Contents(

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

@@ -1,5 +1,5 @@
 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'
@@ -8,8 +8,6 @@ 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()

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

@@ -26,7 +26,7 @@ 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)
@@ -88,8 +88,14 @@ export const useVisualStore = defineStore('visualStore', () => {
 
   const setReceiveInfo = (newReceiveInfo: ReceiveInfo) => {
     receiveInfo.value = newReceiveInfo
-    // Only save receiveInfo to file in offline mode for persistence (contains token and metadata)
-    if (formattingSettings.value?.dataLoading.internalizeData.value) {
+    
+    // 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()
     }
   }
@@ -122,7 +128,7 @@ export const useVisualStore = defineStore('visualStore', () => {
     }
   }
 
-  const setObjectsFromStore = (newObjectsFromStore: object[]) => {
+  const setObjectsFromStore = (newObjectsFromStore: object[][]) => {
     objectsFromStore.value = newObjectsFromStore
   }
 
@@ -214,7 +220,7 @@ export const useVisualStore = defineStore('visualStore', () => {
           objectName: 'storedData',
           properties: {
             speckleObjects: compressedChunks,
-            receiveInfo: JSON.stringify(receiveInfo.value)
+            receiveInfo: JSON.stringify(receiveInfo.value) // Keep receiveInfo in sync when storing objects
           },
           selector: null
         }

src/powerbi-visual/src/visual.ts

@@ -95,7 +95,6 @@ export class Visual implements IVisual {
     )
 
     visualStore.setFormattingSettings(this.formattingSettings)
-    console.log('Selector colors', this.formattingSettings.colorSelector)
     console.log(
       'Data Loading - Internalize Data:',
       this.formattingSettings.dataLoading.internalizeData.value
@@ -314,69 +313,7 @@ export class Visual implements IVisual {
 
   public getFormattingModel(): powerbi.visuals.FormattingModel {
     console.log('🎨 getFormattingModel called')
-
-    // build the cards for the options
-    const model: powerbi.visuals.FormattingModel = {
-      cards: [
-        // Color card
-        {
-          displayName: 'Object Display',
-          name: 'color',
-          uid: 'color_card_uid',
-          groups: [
-            {
-              displayName: undefined,
-              uid: 'color_group_uid',
-              slices: [
-                {
-                  displayName: 'Enabled',
-                  uid: 'color_enabled_uid',
-                  control: {
-                    type: powerbi.visuals.FormattingComponent.ToggleSwitch,
-                    properties: {
-                      descriptor: {
-                        objectName: 'color',
-                        propertyName: 'enabled'
-                      },
-                      value: this.formattingSettings.color.enabled.value
-                    }
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        // Data Management card
-        {
-          displayName: 'Data Management',
-          name: 'dataLoading',
-          uid: 'dataLoading_card_uid',
-          groups: [
-            {
-              displayName: undefined,
-              uid: 'dataLoading_group_uid',
-              slices: [
-                {
-                  displayName: 'Internalize Data',
-                  uid: 'dataLoading_internalizeData_uid',
-                  control: {
-                    type: powerbi.visuals.FormattingComponent.ToggleSwitch,
-                    properties: {
-                      descriptor: {
-                        objectName: 'dataLoading',
-                        propertyName: 'internalizeData'
-                      },
-                      value: this.formattingSettings.dataLoading.internalizeData.value
-                    }
-                  }
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-
+    const model = this.formattingSettingsService.buildFormattingModel(this.formattingSettings)
     return model
   }