No longer displays cloud sync icon when opting out of online backups

marius00 · Aug 29, 2021 · 7b797d4 · 7b797d4
1 parent 9c134ed
commit 7b797d4
Show file tree

Hide file tree

Showing 11 changed files with 87 additions and 21,681 deletions.
diff --git a/IAGrim/UI/MainWindow.cs b/IAGrim/UI/MainWindow.cs
@@ -133,6 +133,7 @@ public partial class MainWindow : Form {
 
                         var settingsService = _serviceProvider.Get<SettingsService>();
                         _cefBrowserHandler.SetDarkMode(settingsService.GetPersistent().DarkMode);
+                        _cefBrowserHandler.SetOnlineBackupsEnabled(!settingsService.GetLocal().OptOutOfBackups);
                     }
                 }
             }
@@ -594,6 +595,10 @@ ParsingService parsingService
                 _cefBrowserHandler.SetDarkMode(settingsService.GetPersistent().DarkMode);
             }
 
+            settingsService.GetLocal().OnMutate += delegate(object o, EventArgs args) { _cefBrowserHandler.SetOnlineBackupsEnabled(!settingsService.GetLocal().OptOutOfBackups); };
+
+
+
             Logger.Debug("UI initialization complete");
         }
 

diff --git a/IAGrim/UI/Misc/CEF/CefBrowserHandler.cs b/IAGrim/UI/Misc/CEF/CefBrowserHandler.cs
@@ -135,17 +135,20 @@ public class CefBrowserHandler : IDisposable, ICefBackupAuthentication, IUserFee
             }
         }
 
-        private class QuickTimeoutWebClient : WebClient {
-            protected override WebRequest GetWebRequest(Uri uri) {
-                WebRequest w = base.GetWebRequest(uri);
-                w.Timeout = 500;
-                return w;
+        public bool SetOnlineBackupsEnabled(bool enabled) {
+            if (BrowserControl.CanExecuteJavascriptInMainFrame) {
+                BrowserControl.ExecuteScriptAsync("window.setOnlineBackupsEnabled", enabled);
+                return true;
+            } else {
+                Logger.Warn("Attempted to set dark/light mode but CEF not yet initialized.");
+                return false;
             }
         }
 
+
         private string GetSiteUri() {
 #if DEBUG
-            var client = new QuickTimeoutWebClient();
+            var client = new WebClient();
 
             try {
                 Logger.Debug("Checking if NodeJS is running...");

diff --git a/WebUi/package-lock.json b/WebUi/package-lock.json
diff --git a/WebUi/package.json b/WebUi/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "start": "cross-env REACT_APP_BUILD_TARGET=GDIA react-scripts start",
-    "start:online": "cross-env REACT_APP_BUILD_TARGET=ONLINE REACT_APP_SERVER_URL=http://localhost:8080 react-scripts start",
+    "dev": "cross-env REACT_APP_BUILD_TARGET=GDIA react-scripts start",
     "start:help": "cross-env REACT_APP_BUILD_TARGET=HELP react-scripts start",
     "build": "react-scripts build",
     "build:online": "cross-env REACT_APP_BUILD_TARGET=ONLINE react-scripts build",

diff --git a/WebUi/src/App.tsx b/WebUi/src/App.tsx
@@ -24,6 +24,7 @@ export interface ApplicationState {
   isDarkMode: boolean;
   helpSearchFilter: string;
   numItems: number;
+  showBackupCloudIcon: boolean;
 }
 
 
@@ -67,6 +68,7 @@ class App extends React.PureComponent<{}, object> {
     isDarkMode: false,
     helpSearchFilter: '',
     numItems: 0,
+    showBackupCloudIcon: true,
   } as ApplicationState;
 
   componentDidMount() {
@@ -144,6 +146,13 @@ class App extends React.PureComponent<{}, object> {
       });
     };
 
+      // @ts-ignore:
+    window.setOnlineBackupsEnabled = (enabled: boolean) => {
+        this.setState({
+            showBackupCloudIcon: enabled
+        });
+    };
+
     // Show a notification message such as "Item transferred" or "Too close to stash"
     // @ts-ignore: showMessage doesn't exist on window
     window.showMessage = (input: string) => {
@@ -202,6 +211,7 @@ class App extends React.PureComponent<{}, object> {
         {this.state.activeTab === 3 && <CharacterListContainer />}
 
         {this.state.activeTab === 0 && <ItemContainer
+            showBackupCloudIcon={this.state.showBackupCloudIcon}
             items={this.state.items}
             numItems={this.state.numItems}
             isLoading={this.state.isLoading}

diff --git a/WebUi/src/OnlineApp.css b/WebUi/src/OnlineApp.css
diff --git a/WebUi/src/OnlineApp.tsx b/WebUi/src/OnlineApp.tsx
diff --git a/WebUi/src/components/Item/Item.tsx b/WebUi/src/components/Item/Item.tsx
@@ -19,6 +19,7 @@ interface Props {
   transferAll: (x: any) => void;
   getItemName: (baseRecord: string) => ICollectionItem;
   requestUnknownItemHelp: () => void;
+  showBackupCloudIcon: boolean;
 }
 
 export function getUniqueId(item: IItem): string {
@@ -35,7 +36,7 @@ class Item extends React.PureComponent<Props, object> {
   }
 
   openItemSite() {
-    openUrl(`http://www.grimtools.com/db/search?src=itemassistant&query=${this.stripColorCodes(this.props.item.name)}`);
+    openUrl(`https://www.grimtools.com/db/search?src=itemassistant&query=${this.stripColorCodes(this.props.item.name)}`);
   }
 
   renderBuddyItem(item: IItem) {
@@ -181,7 +182,7 @@ class Item extends React.PureComponent<Props, object> {
           : ''
         }
 
-        <ItemCornerContainer {...item} />
+        <ItemCornerContainer {...item} showBackupCloudIcon={this.props.showBackupCloudIcon} />
 
         {item.hasRecipe && item.type === IItemType.Recipe ?
           <div className="recipe-item">

diff --git a/WebUi/src/components/Item/ItemCornerContainer.tsx b/WebUi/src/components/Item/ItemCornerContainer.tsx
@@ -4,11 +4,18 @@ import { isEmbedded } from '../../integration/integration';
 import translate from '../../translations/EmbeddedTranslator';
 import IItemType from '../../interfaces/IItemType';
 
-class ItemCornerContainer extends React.PureComponent<IItem, object> {
+
+interface Props {
+    showBackupCloudIcon: boolean;
+}
+type IItemWithshowBackupCloudIcon = Props & IItem;
+
+class ItemCornerContainer extends React.PureComponent<IItemWithshowBackupCloudIcon, object> {
   render() {
     const item = {...this.props};
-    const showCloudOkIcon = item.type === IItemType.Player && item.hasCloudBackup && isEmbedded;
-    const showCloudErrorIcon = item.type === IItemType.Player && !item.hasCloudBackup && isEmbedded;
+    const showBackupCloudIcon = item.showBackupCloudIcon;
+    const showCloudOkIcon = item.type === IItemType.Player && item.hasCloudBackup && isEmbedded && showBackupCloudIcon;
+    const showCloudErrorIcon = item.type === IItemType.Player && !item.hasCloudBackup && isEmbedded && showBackupCloudIcon;
     const showSingularBuddyItemIcon = item.type !== IItemType.Buddy && item.buddies.length === 1;
     const showPluralBuddyItemIcon = item.type !== IItemType.Buddy && item.buddies.length > 1;
     const showRecipeIcon = item.hasRecipe && item.type !== 0;