Merge branch 'master' into 188129114-bar-graph-select

cypress/e2e/functional/tile_tests/bar_graph_tile_spec.js

@@ -488,7 +488,6 @@ context('Bar Graph Tile', function () {
       barGraph.getBarHighlight(workspace).should('have.length', 0);
       tableTile.getSelectedRow(workspace).should('have.length', 0); // All "XX / Y" cases
     }
-
   });
 
 });

src/plugins/bar-graph/bar-graph-content.ts

@@ -173,6 +173,39 @@ export const BarGraphContentModel = TileContentModel
       }
     },
 
+    updateAfterSharedModelChanges(sharedModel?: SharedModelType) {
+      // When new dataset is attached, store its ID and pick a primary attribute to display.
+      const dataSetId = self.sharedModel?.dataSet?.id;
+      if (self.dataSetId !== dataSetId) {
+        self.dataSetId = dataSetId;
+        self.setPrimaryAttribute(undefined);
+        self.setSecondaryAttribute(undefined);
+        if (dataSetId) {
+          const atts = self.sharedModel.dataSet.attributes;
+          if (atts.length > 0) {
+            self.setPrimaryAttribute(atts[0].id);
+          }
+        }
+      }
+      // Check if primary or secondary attribute has been deleted
+      if (self.primaryAttribute && !self.sharedModel?.dataSet.attrFromID(self.primaryAttribute)) {
+        self.setPrimaryAttribute(undefined); // this will also unset secondaryAttribute
+      }
+      if (self.secondaryAttribute && !self.sharedModel?.dataSet.attrFromID(self.secondaryAttribute)) {
+        self.setSecondaryAttribute(undefined);
+      }
+    }
+  }))
+  .actions(self => ({
+    unlinkDataSet() {
+      const smm = getSharedModelManager(self);
+      if (!smm || !smm.isReady) return;
+      const sharedDataSets = smm.getTileSharedModelsByType(self, SharedDataSet);
+      for (const sharedDataSet of sharedDataSets) {
+        smm.removeTileSharedModel(self, sharedDataSet);
+      }
+    },
+
     updateAfterSharedModelChanges(sharedModel?: SharedModelType) {
       // When new dataset is attached, store its ID and pick a primary attribute to display.
       const dataSetId = self.sharedModel?.dataSet?.id;