From b898e886a5a57b994f90211c8961080a06f73a29 Mon Sep 17 00:00:00 2001
From: Vardan Hakobyan <vardan_live@live.com>
Date: Mon, 25 Oct 2021 17:08:37 +0400
Subject: [PATCH] feat: remove broadcasting Extensions Manager events from
 `ComponentView` (#703)

* feat: remove `broadcast` from `ComponentView`

As "Extensions Manager" is removed, the related events' broadcasting is not needed anymore

* fix: restore `manualDealloc`
---
 .../components/ComponentView/IsExpired.tsx          |  4 ++--
 .../components/ComponentView/OfflineRestricted.tsx  |  2 +-
 .../javascripts/components/ComponentView/index.tsx  | 13 +++----------
 app/assets/javascripts/messages.ts                  |  1 -
 app/assets/javascripts/views/editor/editor-view.pug |  2 --
 app/assets/javascripts/views/tags/tags-view.pug     |  1 -
 app/assets/templates/directives/component-modal.pug |  1 -
 .../templates/directives/revision-preview-modal.pug |  1 -
 8 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/components/ComponentView/IsExpired.tsx b/app/assets/javascripts/components/ComponentView/IsExpired.tsx
index 730e880c7..31d1faa1f 100644
--- a/app/assets/javascripts/components/ComponentView/IsExpired.tsx
+++ b/app/assets/javascripts/components/ComponentView/IsExpired.tsx
@@ -2,7 +2,7 @@ import { FunctionalComponent } from 'preact';
 
 interface IProps {
   expiredDate: string;
-  reloadStatus: (doManualReload?: boolean) => void;
+  reloadStatus: () => void;
 }
 
 export const IsExpired: FunctionalComponent<IProps> = ({
@@ -35,7 +35,7 @@ export const IsExpired: FunctionalComponent<IProps> = ({
           </div>
         </div>
         <div className={'right'}>
-          <div className={'sk-app-bar-item'} onClick={() => reloadStatus(true)}>
+          <div className={'sk-app-bar-item'} onClick={() => reloadStatus()}>
             <button className={'sn-button small info'}>Reload</button>
           </div>
           <div className={'sk-app-bar-item'}>
diff --git a/app/assets/javascripts/components/ComponentView/OfflineRestricted.tsx b/app/assets/javascripts/components/ComponentView/OfflineRestricted.tsx
index df2c04787..7de8ef90b 100644
--- a/app/assets/javascripts/components/ComponentView/OfflineRestricted.tsx
+++ b/app/assets/javascripts/components/ComponentView/OfflineRestricted.tsx
@@ -2,7 +2,7 @@ import { FunctionalComponent } from 'preact';
 
 interface IProps {
   isReloading: boolean;
-  reloadStatus: (doManualReload?: boolean) => void;
+  reloadStatus: () => void;
 }
 
 export const OfflineRestricted: FunctionalComponent<IProps> = ({
diff --git a/app/assets/javascripts/components/ComponentView/index.tsx b/app/assets/javascripts/components/ComponentView/index.tsx
index 50d972785..a83eda6d8 100644
--- a/app/assets/javascripts/components/ComponentView/index.tsx
+++ b/app/assets/javascripts/components/ComponentView/index.tsx
@@ -5,7 +5,6 @@ import { toDirective } from '@/components/utils';
 import { useCallback, useEffect, useRef, useState } from 'preact/hooks';
 import { observer } from 'mobx-react-lite';
 import { isDesktopApplication } from '@/utils';
-import { RootScopeMessages } from '@/messages';
 import { OfflineRestricted } from '@/components/ComponentView/OfflineRestricted';
 import { UrlMissing } from '@/components/ComponentView/UrlMissing';
 import { IsDeprecated } from '@/components/ComponentView/IsDeprecated';
@@ -20,7 +19,6 @@ interface IProps {
   componentUuid: string;
   onLoad?: (component: SNComponent) => void;
   templateComponent?: SNComponent;
-  broadcast?: (...args: unknown[]) => unknown;
   manualDealloc?: boolean;
 }
 
@@ -39,8 +37,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
      onLoad,
      componentUuid,
      templateComponent,
-     broadcast,
-     manualDealloc = false
+     manualDealloc = false,
    }) => {
     const liveComponentRef = useRef<LiveItem<SNComponent> | null>(null);
     const iframeRef = useRef<HTMLIFrameElement>(null);
@@ -71,7 +68,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
       });
     };
 
-    const reloadStatus = useCallback((doManualReload = true) => {
+    const reloadStatus = useCallback(() => {
       if (!component) {
         return;
       }
@@ -105,12 +102,9 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
       } else {
         setError(undefined);
       }
-      if (isExpired && doManualReload) {
-        broadcast?.(RootScopeMessages.ReloadExtendedData);
-      }
       setIsDeprecated(component.isDeprecated);
       setDeprecationMessage(component.package_info.deprecation_message);
-    }, [application.componentManager, broadcast, component, isComponentValid, isExpired]);
+    }, [application.componentManager, component, isComponentValid, isExpired]);
 
     const dismissDeprecationMessage = () => {
       setTimeout(() => {
@@ -362,6 +356,5 @@ export const ComponentViewDirective = toDirective<IProps>(ComponentView, {
   onLoad: '=',
   componentUuid: '=',
   templateComponent: '=',
-  broadcast: '=',
   manualDealloc: '='
 });
diff --git a/app/assets/javascripts/messages.ts b/app/assets/javascripts/messages.ts
index 2dcecff72..8e7ede0ac 100644
--- a/app/assets/javascripts/messages.ts
+++ b/app/assets/javascripts/messages.ts
@@ -1,4 +1,3 @@
 export enum RootScopeMessages {
-  ReloadExtendedData = 'reload-ext-data',
   NewUpdateAvailable = 'new-update-available'
 }
diff --git a/app/assets/javascripts/views/editor/editor-view.pug b/app/assets/javascripts/views/editor/editor-view.pug
index 18154258e..90ec90159 100644
--- a/app/assets/javascripts/views/editor/editor-view.pug
+++ b/app/assets/javascripts/views/editor/editor-view.pug
@@ -113,7 +113,6 @@
         on-load='self.onEditorLoad',
         application='self.application'
         app-state='self.appState'
-        broadcast='$broadcast'
         )
       textarea#note-text-editor.editable.font-editor(
         dir='auto',
@@ -171,5 +170,4 @@
           ng-show='!self.stackComponentHidden(component)',
           application='self.application'
           app-state='self.appState'
-          broadcast='$broadcast'
         )
diff --git a/app/assets/javascripts/views/tags/tags-view.pug b/app/assets/javascripts/views/tags/tags-view.pug
index 8af6838af..a32bb709e 100644
--- a/app/assets/javascripts/views/tags/tags-view.pug
+++ b/app/assets/javascripts/views/tags/tags-view.pug
@@ -4,7 +4,6 @@
       component-uuid='self.component.uuid',
       application='self.application'
       app-state='self.appState'
-      broadcast='$broadcast'
       )
   #tags-content.content(ng-if='!(self.component && self.component.active)')
     .tags-title-section.section-title-bar
diff --git a/app/assets/templates/directives/component-modal.pug b/app/assets/templates/directives/component-modal.pug
index 6b7300364..8baf0f119 100644
--- a/app/assets/templates/directives/component-modal.pug
+++ b/app/assets/templates/directives/component-modal.pug
@@ -15,5 +15,4 @@
         component-uuid="ctrl.component.uuid",
         application='ctrl.application'
         app-state='self.appState'
-        broadcast='$broadcast'
         )
diff --git a/app/assets/templates/directives/revision-preview-modal.pug b/app/assets/templates/directives/revision-preview-modal.pug
index 91fbbe011..2fe889748 100644
--- a/app/assets/templates/directives/revision-preview-modal.pug
+++ b/app/assets/templates/directives/revision-preview-modal.pug
@@ -34,5 +34,4 @@
             template-component="ctrl.state.editor",
             application='ctrl.application'
             app-state='self.appState'
-            broadcast='$broadcast'
             )