From 6995450c507359a1731ebba3a188e9cb29105002 Mon Sep 17 00:00:00 2001
From: David Douglas <david.douglas@microsoft.com>
Date: Mon, 14 Aug 2017 13:54:07 +0100
Subject: [PATCH 1/4] Removed code editor loading screen for empty string

---
 client/src/components/Dashboard/Editor/Editor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Dashboard/Editor/Editor.tsx b/client/src/components/Dashboard/Editor/Editor.tsx
index 8d0a626..5d5ee37 100644
--- a/client/src/components/Dashboard/Editor/Editor.tsx
+++ b/client/src/components/Dashboard/Editor/Editor.tsx
@@ -162,7 +162,7 @@ export default class Editor extends React.PureComponent<IEditorProps, IEditorSta
     ];
 
     const actions = !value ? null : actionButtons;
-    const content = !value ? this.renderLoading() : this.renderEditor(value, theme);
+    const content = value !== null ? this.renderEditor(value, theme) : this.renderLoading();
 
     return (
       <Dialog

From 823f05eb495da498faa22344c7767d9ccf82705f Mon Sep 17 00:00:00 2001
From: David Douglas <david.douglas@microsoft.com>
Date: Mon, 14 Aug 2017 15:01:02 +0100
Subject: [PATCH 2/4] Changed Card's open query and data dialog button

---
 client/src/components/Card/Card.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Card/Card.tsx b/client/src/components/Card/Card.tsx
index bd18177..30392ec 100644
--- a/client/src/components/Card/Card.tsx
+++ b/client/src/components/Card/Card.tsx
@@ -108,7 +108,7 @@ export default class Card extends React.PureComponent<ICardProps, ICardState> {
         onClick={() => SettingsActions.openDialog(title, id)}
         className="card-settings-btn"
       >
-        settings
+        expand_more
       </Button>
     );
 

From c1c00604f0da828a248f258e793786d87528cf74 Mon Sep 17 00:00:00 2001
From: David Douglas <david.douglas@microsoft.com>
Date: Tue, 15 Aug 2017 11:54:22 +0100
Subject: [PATCH 3/4] Dashboard setup: Cancel is now Delete

---
 .../components/Settings/SetupDashboard.tsx    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/src/components/Settings/SetupDashboard.tsx b/client/src/components/Settings/SetupDashboard.tsx
index 7f79804..adb7df6 100644
--- a/client/src/components/Settings/SetupDashboard.tsx
+++ b/client/src/components/Settings/SetupDashboard.tsx
@@ -30,7 +30,7 @@ export default class SetupDashboard extends React.Component<ISetupDashboardProps
     super(props);
 
     this.onSave = this.onSave.bind(this);
-    this.onCancel = this.onCancel.bind(this);
+    this.onDelete = this.onDelete.bind(this);
     this.onSaveGoToDashboard = this.onSaveGoToDashboard.bind(this);
     this.redirectToHomepageIfStandalone = this.redirectToHomepageIfStandalone.bind(this);
 
@@ -46,15 +46,15 @@ export default class SetupDashboard extends React.Component<ISetupDashboardProps
   }
 
   onParamChange(connectionKey: string, paramKey: string, value: any) {
-    let { connections } = this.state;
+    const { connections } = this.state;
 
     connections[connectionKey] = connections[connectionKey] || {};
     connections[connectionKey][paramKey] = value;
   }
 
   onSave() {
-    let { dashboard } = this.props;
-    let { connections } = this.state;
+    const { dashboard } = this.props;
+    const { connections } = this.state;
 
     dashboard.config.connections = connections;
 
@@ -66,18 +66,23 @@ export default class SetupDashboard extends React.Component<ISetupDashboardProps
     setTimeout(this.redirectToHomepageIfStandalone, 2000);
   }
 
-  onCancel() {
-    this.redirectToHomepageIfStandalone();    
+  onDelete() {
+    const { dashboard } = this.props;
+    if (!dashboard) {
+      console.warn('Dashboard not found. Aborting delete.');
+    }
+    ConfigurationsActions.deleteDashboard(dashboard.id);
+    window.location.href = '/';
   }
 
   redirectToHomepageIfStandalone() {
-    let { dashboard } = this.props;
+    const { dashboard } = this.props;
     window.location.replace(`/dashboard/${dashboard.url}`);
   }
 
   render() {
-    let { dashboard } = this.props;
-    let { connections } = this.state;
+    const { dashboard } = this.props;
+    const { connections } = this.state;
 
     return (
       <div style={{ width: '100%' }}>
@@ -85,8 +90,8 @@ export default class SetupDashboard extends React.Component<ISetupDashboardProps
         
         <div>
           <Button flat primary label="Save" onClick={this.onSave}>save</Button>
-          <Button flat secondary label="Save and Go to Dashboard" onClick={this.onSaveGoToDashboard}>save</Button>
-          <Button flat secondary label="Cancel" onClick={this.onCancel}>cancel</Button>
+          <Button flat primary label="Save and Go to Dashboard" onClick={this.onSaveGoToDashboard}>save</Button>
+          <Button flat secondary label="Delete" onClick={this.onDelete}>delete</Button>
         </div>
         
       </div>

From 0f260c93538fdb088876629aad72a276ef036337 Mon Sep 17 00:00:00 2001
From: "MANDOGROUP\\gary.pretty" <gary.pretty@mandogroup.com>
Date: Tue, 15 Aug 2017 14:33:04 +0100
Subject: [PATCH 4/4] Fixed incorrect custom dimension property name for Goal
 event

---
 server/dashboards/preconfigured/bot-framework-goals.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/dashboards/preconfigured/bot-framework-goals.ts b/server/dashboards/preconfigured/bot-framework-goals.ts
index 0ea0be4..d00bc54 100644
--- a/server/dashboards/preconfigured/bot-framework-goals.ts
+++ b/server/dashboards/preconfigured/bot-framework-goals.ts
@@ -124,7 +124,7 @@ html: `
 				queries: {
 					goals_top_goals_count: {
 						query: () => `
-              extend GoalName=tostring(customDimensions.Name) | 
+              extend GoalName=tostring(customDimensions.GoalName) | 
               where name=='MBFEvent.GoalEvent' | 
               summarize count=count() by GoalName | take 3`,
 						mappings: { goal: (val) => val || "Unknown",count: (val) => val || 0 },
@@ -188,7 +188,7 @@ html: `
 					params: {
             filters: [{ dependency: "selectedChannels",queryProperty: "customDimensions.channel" }],
 						query: () => `customEvents |
-              extend GoalName=tostring(customDimensions.Name) | 
+              extend GoalName=tostring(customDimensions.GoalName) | 
               where name=='MBFEvent.GoalEvent' |
               summarize count=count() by GoalName | order by GoalName asc`
 					}
@@ -230,7 +230,7 @@ html: `
             filters: [{ dependency: "selectedChannels" ,queryProperty: "customDimensions.channel" }],
 						query: ({ goal }) => ` 
               customEvents
-              | extend conversation=tostring(customDimensions.conversationId), goal=customDimensions.Name
+              | extend conversation=tostring(customDimensions.conversationId), goal=customDimensions.GoalName
               | where name=='MBFEvent.GoalEvent' and goal =~ '${goal}'
               | summarize count=count(), maxTimestamp=max(timestamp) by conversation
               | order by maxTimestamp`,