Load office-js cdn only in excel #442

nfdi4plants · Jun 27, 2024 · c78b08e · c78b08e
1 parent 088138b
commit c78b08e
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 31 deletions.
diff --git a/src/Client/States/OfficeInteropState.fs b/src/Client/States/OfficeInteropState.fs
@@ -29,6 +29,7 @@ type Msg =
     // create and update table element functions
     | CreateAnnotationTable                 of tryUsePrevOutput:bool 
     | AnnotationtableCreated
+    | TryFindAnnotationTable
     | AnnotationTableExists                 of TryFindAnnoTableResult
     | InsertOntologyTerm                    of TermMinimal
     | AddAnnotationBlock                    of InsertBuildingBlock

diff --git a/src/Client/Update/InterfaceUpdate.fs b/src/Client/Update/InterfaceUpdate.fs
@@ -14,10 +14,44 @@ open Shared
 open Fable.Core.JsInterop
 open Shared.ARCtrlHelper
 
-module private Helper =
+/// This seems like such a hack :(
+module private ExcelHelper =
+
+    open Fable.Core
     open ExcelJS.Fable.GlobalBindings
 
-    let initializeAddIn () = Office.onReady()
+    let initializeAddIn () = Office.onReady().``then``(fun _ -> ()) |> Async.AwaitPromise
+
+    /// Office-js will kill iframe loading in ARCitect, therefore we must load it conditionally
+    let addOfficeJsScript(callback: unit -> unit) =
+        let cdn = @"https://appsforoffice.microsoft.com/lib/1/hosted/office.js"
+        let _type = "text/javascript"
+        let s = Browser.Dom.document.createElement("script")
+        s?``type`` <- _type
+        s?src <- cdn
+        Browser.Dom.document.head.appendChild s |> ignore
+        s.onload <- fun _ -> callback()
+        ()
+
+    /// Make a function that loops short sleep sequences until a mutable variable is set to true
+    /// do mutabel dotnet ref for variable
+    let myAwaitLoadedThenInit(loaded: ref<bool>) =
+        let rec loop() =
+            async {
+            if loaded.Value then
+                do! initializeAddIn()
+            else
+                do! Async.Sleep 100
+                do! loop()
+            }
+        loop()
+
+    let officeload() =
+        let loaded = ref false
+        async {
+            addOfficeJsScript(fun _ -> loaded.Value <- true)
+            do! myAwaitLoadedThenInit loaded
+        }
 
 //open Fable.Core.JS
 
@@ -31,13 +65,12 @@ module Interface =
             let cmd =
                 Cmd.batch [
                     Cmd.ofMsg (Ontologies.GetOntologies |> OntologyMsg)
-                    log ("HOST",host)
                     match host with
                     | Swatehost.Excel ->
-                        Cmd.OfPromise.either
-                            OfficeInterop.Core.tryFindActiveAnnotationTable
+                        Cmd.OfAsync.either
+                            ExcelHelper.officeload
                             ()
-                            (OfficeInterop.AnnotationTableExists >> OfficeInteropMsg)
+                            (fun _ -> TryFindAnnotationTable |> OfficeInteropMsg)
                             (curry GenericError Cmd.none >> DevMsg)
                     | Swatehost.Browser ->
                         Cmd.none

diff --git a/src/Client/Update/OfficeInteropUpdate.fs b/src/Client/Update/OfficeInteropUpdate.fs
@@ -9,9 +9,9 @@ open Shared
 open OfficeInteropTypes
 
 module OfficeInterop = 
-    let update (currentModel:Messages.Model) (excelInteropMsg: OfficeInterop.Msg) : Messages.Model * Cmd<Messages.Msg> =
+    let update (model:Messages.Model) (msg: OfficeInterop.Msg) : Messages.Model * Cmd<Messages.Msg> =
 
-        match excelInteropMsg with
+        match msg with
 
         | AutoFitTable hidecols ->
             let p = fun () -> ExcelJS.Fable.GlobalBindings.Excel.run (OfficeInterop.Core.autoFitTable hidecols)
@@ -21,18 +21,26 @@ module OfficeInterop =
                     ()
                     (curry GenericInteropLogs Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
+        | TryFindAnnotationTable ->
+            let cmd =
+                Cmd.OfPromise.either
+                    OfficeInterop.Core.tryFindActiveAnnotationTable
+                    ()
+                    (OfficeInterop.AnnotationTableExists >> OfficeInteropMsg)
+                    (curry GenericError Cmd.none >> DevMsg)
+            model, cmd
         | AnnotationTableExists annoTableOpt ->
             let exists =
                 match annoTableOpt with
                 | Success name -> true
                 | _ -> false
             let nextState = {
-                currentModel.ExcelState with
+                model.ExcelState with
                     HasAnnotationTable = exists
             }
-            currentModel.updateByExcelState nextState,Cmd.none
+            model.updateByExcelState nextState,Cmd.none
 
         | InsertOntologyTerm (term) ->
             let cmd =
@@ -41,7 +49,7 @@ module OfficeInterop =
                     term
                     (curry GenericLog Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
         | AddAnnotationBlock (minBuildingBlockInfo) ->
             let cmd =
@@ -50,7 +58,7 @@ module OfficeInterop =
                     (minBuildingBlockInfo)
                     (curry GenericInteropLogs Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
         | AddAnnotationBlocks minBuildingBlockInfos ->
             let cmd =
@@ -59,7 +67,7 @@ module OfficeInterop =
                     minBuildingBlockInfos
                     (curry GenericInteropLogs Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
         | ImportFile buildingBlockTables ->
             let nextCmd =
@@ -68,7 +76,7 @@ module OfficeInterop =
                     buildingBlockTables
                     (curry GenericInteropLogs Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, nextCmd
+            model, nextCmd
 
         | RemoveBuildingBlock ->
             let cmd =
@@ -77,7 +85,7 @@ module OfficeInterop =
                     ()
                     (curry GenericInteropLogs Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
         | UpdateUnitForCells (unitTerm) ->
             let cmd =
@@ -86,7 +94,7 @@ module OfficeInterop =
                     unitTerm
                     (curry GenericInteropLogs Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
         | CreateAnnotationTable(tryUsePrevOutput) ->
             let cmd =
@@ -95,14 +103,14 @@ module OfficeInterop =
                     (false,tryUsePrevOutput)
                     (curry GenericInteropLogs (AnnotationtableCreated |> OfficeInteropMsg |> Cmd.ofMsg) >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel,cmd
+            model,cmd
 
         | AnnotationtableCreated ->
             let nextState = {
-                currentModel.ExcelState with
+                model.ExcelState with
                     HasAnnotationTable = true
             }
-            currentModel.updateByExcelState nextState, Cmd.none
+            model.updateByExcelState nextState, Cmd.none
 
 
         | GetParentTerm ->
@@ -112,7 +120,7 @@ module OfficeInterop =
                     ()
                     (fun tmin -> tmin |> Option.map (fun t -> ARCtrl.OntologyAnnotation.fromTerm t.toTerm) |> TermSearch.UpdateParentTerm |> TermSearchMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
         //
         | FillHiddenColsRequest ->
             failwith "FillHiddenColsRequest Not implemented yet"
@@ -133,11 +141,11 @@ module OfficeInterop =
             //        (curry GenericError (UpdateFillHiddenColsState FillHiddenColsState.Inactive |> OfficeInteropMsg |> Cmd.ofMsg) >> DevMsg)
             //let stateCmd = UpdateFillHiddenColsState FillHiddenColsState.ExcelCheckHiddenCols |> OfficeInteropMsg |> Cmd.ofMsg
             //let cmds = Cmd.batch [cmd; stateCmd]
-            currentModel, Cmd.none
+            model, Cmd.none
 
         | FillHiddenColumns (termsWithSearchResult) ->
             let nextState = {
-                currentModel.ExcelState with
+                model.ExcelState with
                     FillHiddenColsStateStore = FillHiddenColsState.ExcelWriteFoundTerms
             }
             let cmd =
@@ -146,15 +154,15 @@ module OfficeInterop =
                     (termsWithSearchResult)
                     (curry GenericInteropLogs (UpdateFillHiddenColsState FillHiddenColsState.Inactive |> OfficeInteropMsg |> Cmd.ofMsg) >> DevMsg)
                     (curry GenericError (UpdateFillHiddenColsState FillHiddenColsState.Inactive |> OfficeInteropMsg |> Cmd.ofMsg) >> DevMsg)
-            currentModel.updateByExcelState nextState, cmd
+            model.updateByExcelState nextState, cmd
 
 
         | UpdateFillHiddenColsState newState ->
             let nextState = {
-                currentModel.ExcelState with
+                model.ExcelState with
                     FillHiddenColsStateStore = newState
             }
-            currentModel.updateByExcelState nextState, Cmd.none
+            model.updateByExcelState nextState, Cmd.none
         //
         | InsertFileNames (fileNameList) ->
             let cmd = 
@@ -163,7 +171,7 @@ module OfficeInterop =
                     (fileNameList)
                     (curry GenericLog Cmd.none >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
         //
         | GetSelectedBuildingBlockTerms ->
@@ -179,7 +187,7 @@ module OfficeInterop =
                         ]
                     )
                     (curry GenericError (UpdateCurrentRequestState RequestBuildingBlockInfoStates.Inactive |> BuildingBlockDetails |> Cmd.ofMsg) >> DevMsg)
-            currentModel, cmd
+            model, cmd
 
         // DEV
         | TryExcel  ->
@@ -189,15 +197,15 @@ module OfficeInterop =
                     ()
                     ((fun x -> curry GenericLog Cmd.none ("Debug",x)) >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
         | TryExcel2 ->
             let cmd = 
                 Cmd.OfPromise.either
                     OfficeInterop.Core.exampleExcelFunction2 
                     ()
                     ((fun x -> curry GenericLog Cmd.none ("Debug",x)) >> DevMsg)
                     (curry GenericError Cmd.none >> DevMsg)
-            currentModel, cmd
+            model, cmd
         //| _ ->
         //    printfn "Hit currently non existing message"
         //    currentState, Cmd.none
diff --git a/src/Client/index.html b/src/Client/index.html
@@ -4,7 +4,6 @@
     <!-- The "Edge" mode tells IE to use the best available mode; thus IE11 should use IE11 mode. -->
     <!--<meta http-equiv="X-UA-Compatible" content="IE=edge" />-->
     <title>Swate</title>
-    <script src="https://appsforoffice.microsoft.com/lib/1/hosted/office.js" type="text/javascript"></script>
     <!--<script src="https://kit.fontawesome.com/0d3e0ea7a6.js" crossorigin="anonymous"></script>-->
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">