From 8679bf5b308841f7e47d804773af1c4de559e38e Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Fri, 25 Sep 2020 11:48:55 -0500
Subject: [PATCH] fix: proper reload of ext data

---
 app/assets/javascripts/directives/views/componentView.ts     | 3 ++-
 app/assets/javascripts/messages.ts                           | 4 ++++
 app/assets/javascripts/views/application/application_view.ts | 3 ++-
 app/assets/javascripts/views/footer/footer_view.ts           | 5 +++--
 app/assets/templates/directives/component-view.pug           | 2 +-
 dist/@types/app/assets/javascripts/messages.d.ts             | 4 ++++
 6 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/messages.ts
 create mode 100644 dist/@types/app/assets/javascripts/messages.d.ts

diff --git a/app/assets/javascripts/directives/views/componentView.ts b/app/assets/javascripts/directives/views/componentView.ts
index 03c71afba..776914f26 100644
--- a/app/assets/javascripts/directives/views/componentView.ts
+++ b/app/assets/javascripts/directives/views/componentView.ts
@@ -1,3 +1,4 @@
+import { RootScopeMessages } from './../../messages';
 import { WebApplication } from '@/ui_models/application';
 import { SNComponent, ComponentAction, LiveItem } from 'snjs';
 import { WebDirective } from './../../types';
@@ -199,7 +200,7 @@ class ComponentViewCtrl implements ComponentViewScope {
       this.error = undefined;
     }
     if (this.expired && doManualReload) {
-      this.$rootScope.$broadcast('reload-ext-dat');
+      this.$rootScope.$broadcast(RootScopeMessages.ReloadExtendedData);
     }
   }
 
diff --git a/app/assets/javascripts/messages.ts b/app/assets/javascripts/messages.ts
new file mode 100644
index 000000000..6f48d0777
--- /dev/null
+++ b/app/assets/javascripts/messages.ts
@@ -0,0 +1,4 @@
+export enum RootScopeMessages {
+  ReloadExtendedData = 'reload-ext-data',
+  NewUpdateAvailable = 'new-update-available'
+}
\ No newline at end of file
diff --git a/app/assets/javascripts/views/application/application_view.ts b/app/assets/javascripts/views/application/application_view.ts
index 9e776c872..135b09404 100644
--- a/app/assets/javascripts/views/application/application_view.ts
+++ b/app/assets/javascripts/views/application/application_view.ts
@@ -1,3 +1,4 @@
+import { RootScopeMessages } from './../../messages';
 import { WebDirective } from '@/types';
 import { getPlatformString } from '@/utils';
 import template from './application-view.pug';
@@ -82,7 +83,7 @@ class ApplicationViewCtrl extends PureViewCtrl {
   }
 
   onUpdateAvailable() {
-    this.$rootScope!.$broadcast('new-update-available');
+    this.$rootScope!.$broadcast(RootScopeMessages.NewUpdateAvailable);
   };
 
   /** @override */
diff --git a/app/assets/javascripts/views/footer/footer_view.ts b/app/assets/javascripts/views/footer/footer_view.ts
index b6ff6ff21..4dc8b3984 100644
--- a/app/assets/javascripts/views/footer/footer_view.ts
+++ b/app/assets/javascripts/views/footer/footer_view.ts
@@ -1,3 +1,4 @@
+import { RootScopeMessages } from './../../messages';
 import { ApplicationGroup } from '@/ui_models/application_group';
 import { FooterStatus, WebDirective } from '@/types';
 import { dateToLocalizedString, preventRefreshing } from '@/utils';
@@ -171,10 +172,10 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
   }
 
   addRootScopeListeners() {
-    this.rootScopeListener1 = this.$rootScope.$on("reload-ext-data", () => {
+    this.rootScopeListener1 = this.$rootScope.$on(RootScopeMessages.ReloadExtendedData, () => {
       this.reloadExtendedData();
     });
-    this.rootScopeListener2 = this.$rootScope.$on("new-update-available", () => {
+    this.rootScopeListener2 = this.$rootScope.$on(RootScopeMessages.NewUpdateAvailable, () => {
       this.$timeout(() => {
         this.onNewUpdateAvailable();
       });
diff --git a/app/assets/templates/directives/component-view.pug b/app/assets/templates/directives/component-view.pug
index 8e81371fd..f31383027 100644
--- a/app/assets/templates/directives/component-view.pug
+++ b/app/assets/templates/directives/component-view.pug
@@ -25,7 +25,7 @@
             .sk-p
               | Extensions are in a read-only state.
     .right
-      .sk-app-bar-item(ng-click='ctrl.reloadIframe()')
+      .sk-app-bar-item(ng-click='ctrl.reloadStatus(true)')
         .sk-button.info
           .sk-label Reload
       .sk-app-bar-item
diff --git a/dist/@types/app/assets/javascripts/messages.d.ts b/dist/@types/app/assets/javascripts/messages.d.ts
new file mode 100644
index 000000000..fece23538
--- /dev/null
+++ b/dist/@types/app/assets/javascripts/messages.d.ts
@@ -0,0 +1,4 @@
+export declare enum RootScopeMessages {
+    ReloadExtendedData = "reload-ext-data",
+    NewUpdateAvailable = "new-update-available"
+}