Merge pull request #196 from specklesystems/dogukan/fix-conditional-formatting-card

fix (visual): bring back the conditional formatting

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/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
   }