BL-12977 OneDrive error dialog

Author: nabalone

DistFiles/localization/en/Bloom.xlf

@@ -5138,6 +5138,10 @@ Do you want to go ahead?</note>
         <note>ID: ReportProblemDialog.WhatDoing</note>
         <note>This is the label for the text field where the user enters what they were doing at the time of the problem.</note>
       </trans-unit>
+      <trans-unit id="ReportProblemDialog.SearchOnline" translate="no">
+        <source xml:lang="en">Search online</source>
+        <note>ID: ReportProblemDialog.SearchOnline</note>
+      </trans-unit>
       <trans-unit id="SamplePrintNotification.IGetIt">
         <source xml:lang="en">I get it. Do not show this again.</source>
         <note>ID: SamplePrintNotification.IGetIt</note>

DistFiles/localization/en/BloomLowPriority.xlf

@@ -185,6 +185,15 @@
             <source xml:lang="en">Bloom was not able to access a microphone.</source>
             <note>ID: EditTab.Toolbox.TalkingBookTool.MicrophoneAccessProblem</note>
           </trans-unit>
+          <trans-unit id="ReportProblemDialog.OneDriveProblem" translate="no">
+            <source xml:lang="en">OneDrive Problem</source>
+            <note>ID: ReportProblemDialog.OneDriveProblem</note>
+            <note>The title of a dialog telling the user about a problem with their Microsoft OneDrive.</note>
+          </trans-unit>
+          <trans-unit id="ReportProblemDialog.OneDriveErrorMessage" translate="no">
+            <source xml:lang="en">There is a problem with your Microsoft OneDrive which is preventing Bloom from accessing files.</source>
+            <note>ID: ReportProblemDialog.OneDriveErrorMessage</note>
+          </trans-unit>
         </body>
     </file>
 </xliff>

src/BloomBrowserUI/problemDialog/NotifyDialog.tsx

@@ -1,4 +1,5 @@
 import * as React from "react";
+import { css } from "@emotion/react";
 import {
     Dialog,
     DialogActions,
@@ -14,18 +15,28 @@ import BloomButton from "../react_components/bloomButton";
 import { makeTheme, kindParams } from "./theme";
 import { useL10n } from "../react_components/l10nHooks";
 import { ProblemKind } from "./ProblemDialog";
+import { hookupLinkHandler } from "../utils/linkHandler";
+import { kBloomBlue, kFormBackground } from "../utils/colorUtils";
 
-export const NotifyDialog: React.FunctionComponent<{
-    reportLabel?: string | null;
-    secondaryLabel?: string | null;
-    message: string | null;
-}> = props => {
-    const theme = makeTheme(ProblemKind.NonFatal);
+export interface INotifyDialogProps {
+    message?: string | null; // The localized message to notify the user about.
+    reportLabel?: string | null; // The localized text that goes on the Report button. Omit or pass "" to disable Report button.
+    secondaryLabel?: string | null; // The localized text that goes on the secondary action button. Omit or pass "" to disable the secondary action button.
+    detailsBoxText?: string | null; // Localized text to go into a grey details box under the message. Omit or pass "" to not show a details box.
+    titleOverride?: string | null; // If present, wil be used in place of the dialog title defined for this level in themes.ts
+    titleL10nKeyOverride?: string | null; // The L10nKey for the titleOverride, if present.
+    themeOverride?: ProblemKind | null; // If present, will be used in place of the dialog theme defined for this level in themes.ts
+}
 
-    const englishTitle = kindParams[ProblemKind.NonFatal].title;
-    const titleKey = kindParams[ProblemKind.NonFatal].l10nKey;
+export const NotifyDialog: React.FC<INotifyDialogProps> = props => {
+    const theme = makeTheme(props.themeOverride || ProblemKind.NonFatal);
+
+    const englishTitle = props.titleOverride ?? kindParams[ProblemKind.NonFatal].title;
+    const titleKey = props.titleL10nKeyOverride ?? kindParams[ProblemKind.NonFatal].l10nKey;
     const localizedDlgTitle = useL10n(englishTitle, titleKey);
 
+    React.useEffect(() => hookupLinkHandler(), []);
+
     const getDialog = () => {
         return (
             <Dialog
@@ -45,16 +56,32 @@ export const NotifyDialog: React.FunctionComponent<{
                         onClick={() => post("common/closeReactDialog")}
                     /> */}
                 </DialogTitle>
-                <DialogContent className={"dialog-content"}>
-                    {/* InnerHTML is used so that we can insert markup like <br> into the message. */}
-                    <DialogContentText
-                        className="allowSelect"
-                        dangerouslySetInnerHTML={{
-                            __html: props.message || ""
-                        }}
-                    />
-                </DialogContent>
-                {getDialogActionButtons()}
+                    <DialogContent className={"dialog-content"}>
+                        {/* InnerHTML is used so that we can insert markup like <br> into the message. */}
+                        <DialogContentText
+                            className="allowSelect"
+                            dangerouslySetInnerHTML={{
+                                __html: props.message || ""
+                            }}
+                        />
+                        {props.detailsBoxText && 
+                            <DialogContentText
+                                css={css`
+                                    background-color: ${kFormBackground}; 
+                                    padding: 10px; 
+                                    margin-top: 20px; 
+                                    margin-bottom: 20px; 
+                                    a {
+                                        color: ${kBloomBlue}; // we are passing links in the detailsBoxText
+                                    }
+                                }`}
+                                dangerouslySetInnerHTML={{
+                                    __html: props.detailsBoxText || ""
+                                }}
+                            />
+                        }
+                    </DialogContent>
+                    {getDialogActionButtons()} 
             </Dialog>
         );
     };
@@ -111,16 +138,21 @@ export const NotifyDialog: React.FunctionComponent<{
     };
 
     const getCloseButton = (): JSX.Element | null => {
+        const buttonLabel = props.themeOverride === ProblemKind.Fatal ? "Quit" : "Close";
+        const l10nKey =
+                props.themeOverride === ProblemKind.Fatal
+                    ? "ReportProblemDialog.Quit" 
+                    : "Common.Close";
         return (
             <BloomButton
                 enabled={true}
-                l10nKey={"Common.Close"}
+                l10nKey={l10nKey}
                 hasText={true}
                 onClick={() => {
                     post("common/closeReactDialog");
                 }}
             >
-                Close
+                {buttonLabel}
             </BloomButton>
         );
     };

src/BloomBrowserUI/problemDialog/ProblemDialog.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import "./ProblemDialog.less";
-import { NotifyDialog } from "./NotifyDialog";
+import { INotifyDialogProps, NotifyDialog } from "./NotifyDialog";
 import { ReportDialog } from "./ReportDialog";
 import { WireUpForWinforms } from "../utils/WireUpWinform";
 
@@ -9,15 +9,10 @@ export enum ProblemKind {
     Notify = "notify",
     User = "user",
     NonFatal = "nonfatal",
-    Fatal = "fatal"
+    Fatal = "fatal",
 }
 
-export const ProblemDialog: React.FunctionComponent<{
-    level: ProblemKind;
-    message: string; // The localized message to notify the user about.
-    reportLabel?: string; // The localized text that goes on the Report button. Omit or pass "" to disable Report button.
-    secondaryLabel?: string; // The localized text that goes on the secondary action button. Omit or pass "" to disable the secondary action button.
-}> = props => {
+export const ProblemDialog: React.FC<{level:ProblemKind} & Partial<INotifyDialogProps>> = props => {
     if (props.level === ProblemKind.Notify) {
         return <NotifyDialog {...props} />;
     } else {

src/BloomBrowserUI/problemDialog/ReportDialog.tsx

@@ -105,7 +105,6 @@ export const ReportDialog: React.FunctionComponent<{
                     includeScreenshot
                 },
                 result => {
-                    console.log(JSON.stringify(result.data));
                     const failureResponseString = "failed:";
                     const link = result.data.issueLink;
                     if (link.startsWith(failureResponseString)) {

src/BloomBrowserUI/problemDialog/theme.ts

@@ -29,7 +29,7 @@ export const kindParams = {
         primaryColor: kNonFatalColor,
         title: "Bloom had a problem",
         l10nKey: "ReportProblemDialog.NonFatalTitle"
-    }
+    },
 };
 
 export function makeTheme(kind: ProblemKind): Theme {

src/BloomBrowserUI/utils/linkHandler.ts

@@ -13,7 +13,8 @@ const handler = (e: Event) => {
     if (!href) {
         return;
     }
-    if (href.startsWith("http") || href.startsWith("mailto")) {
+    if (href.startsWith("http") || href.startsWith("mailto") || href.startsWith('file')) {
+        console.log('handling link ', href);
         e.preventDefault();
         e.stopPropagation();
         postString("link", href);

src/BloomExe/Book/BookInfo.cs

@@ -745,7 +745,7 @@ public static string InstallFreshInstanceGuid(string bookFolder)
         /// This method recurses through the folders under 'pathToDirectory' and keeps track of all the unique bookInstanceId
         /// guids. When a duplicate is found, we will call InstallFreshInstanceGuid().
         /// </summary>
-        public static void RepairDuplicateInstanceIds(
+        public static void CheckForDuplicateInstanceIdsAndRepair(
             string pathToDirectory,
             Func<string, bool> okToChangeId
         )
@@ -1006,7 +1006,15 @@ public static BookMetaData GetRepairedMetaDataWithIdOnly(string metaDataPath)
         {
             if (RobustFile.Exists(metaDataPath))
             {
-                var id = GetIdFromDamagedMetaDataString(RobustFile.ReadAllText(metaDataPath));
+                string id;
+                try
+                {
+                    id = GetIdFromDamagedMetaDataString(RobustFile.ReadAllText(metaDataPath));
+                }
+                catch (IOException error)
+                {
+                    throw new FileException(metaDataPath, error);
+                }
                 if (id != null)
                     return new BookMetaData() { Id = id };
             }

src/BloomExe/Collection/CollectionSettings.cs

@@ -11,6 +11,7 @@
 using Bloom.Book;
 using Bloom.MiscUI;
 using Bloom.Publish.BloomPub;
+using Bloom.Utils;
 using Bloom.web.controllers;
 using DesktopAnalytics;
 using L10NSharp;
@@ -479,7 +480,7 @@ public void Load()
 
                 LoadDictionary(xml, "Palette", ColorPalettes);
             }
-            catch (Exception)
+            catch (Exception originalError)
             {
                 string settingsContents;
                 try
@@ -495,7 +496,8 @@ public void Load()
                 // We used to notify the user of a problem here.
                 // But now we decided it is better to catch at a higher level, at OpenProjectWindow(), else we have two different
                 // error UI dialogs for the same problem. See BL-9916.
-                throw;
+
+                throw new FileException(SettingsFilePath, originalError);
             }
 
             try

src/BloomExe/CollectionTab/CollectionTabView.cs

@@ -278,19 +278,19 @@ public void ReadyToShowCollections()
                         // However, until we get rid of the old collection tab, it's tricky to move it, so I've just
                         // duplicated it here.
                         // Doing it at this point seems to work fine.
-                        RepairDuplicates();
+                        CheckForDuplicatesAndRepair();
                         Controls.Add(_reactControl);
                     }
                 )
             );
         }
 
-        private void RepairDuplicates()
+        private void CheckForDuplicatesAndRepair()
         {
             var collectionPath = _model.TheOneEditableCollection.PathToDirectory;
             // A book's ID may not be changed if we have a TC and the book is actually in the shared folder.
             // Eventually we may allow it if the book is checked out.
-            BookInfo.RepairDuplicateInstanceIds(
+            BookInfo.CheckForDuplicateInstanceIdsAndRepair(
                 collectionPath,
                 (bookPath) =>
                 {