Merge pull request #133 from nfdi4plants/kevinf-patch-0.4.1

Kevinf patch 0.4.1
nfdi4plants · Mar 8, 2021 · 748dc2b · 748dc2b
2 parents 095e4b0 + 2e2a46b
commit 748dc2b
Show file tree

Hide file tree

Showing 39 changed files with 1,732 additions and 597 deletions.
diff --git a/.assets/assets/manifest.xml b/.assets/assets/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:ov="http://schemas.microsoft.com/office/taskpaneappversionoverrides" xsi:type="TaskPaneApp">
   <Id>5d6f5462-3401-48ec-9406-d12882e9ad83</Id>
-  <Version>0.4.0</Version>
+  <Version>0.4.1</Version>
   <ProviderName>Computational Systems Biology</ProviderName>
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="Swate"/>

diff --git a/.db/docker-compose.yml b/.db/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     volumes:
       - ./mysql-dump:/docker-entrypoint-initdb.d
     environment:
-      MYSQL_ROOT_PASSWORD: {PASSWORD}
+      MYSQL_ROOT_PASSWORD: example
     ports:
       - 42333:3306
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,25 @@
+### 0.4.1+d75743c (Released 2021-3-8)
+* Additions:
+    * latest commit #d75743c
+    * [[#0d9c945](https://github.com/nfdi4plants/Swate/commit/0d9c94558052d7f13e9707da6202e3a3f34440b9)] Add links to template repository.
+    * [[#6b5a56f](https://github.com/nfdi4plants/Swate/commit/6b5a56f5786eb356703438ecffcb768a6444abcb)] Improve darkmode (Issue #25).
+    * [[#37503a5](https://github.com/nfdi4plants/Swate/commit/37503a50786536ba88a72d591e2cf51fdfd113dc)] Enable term search without present annotation table (Issue #132).
+    * [[#05a69b3](https://github.com/nfdi4plants/Swate/commit/05a69b323db6325d1309b7fbd5cf5b7f4279308e)] Increase responsiveness for copy to clipboard.
+    * [[#44a75d1](https://github.com/nfdi4plants/Swate/commit/44a75d12c1583e138ed2cc328146922d14752d4f)] Add warnings to advanced setting functions.
+    * [[#7d4060b](https://github.com/nfdi4plants/Swate/commit/7d4060b15def48f17b64dd42d0e1da207a3285cd)] Add function to update used protocols. :sparkles:
+    * [[#088335f](https://github.com/nfdi4plants/Swate/commit/088335f811d41026269e2489337986331534c4a6)] Add option to update raw custom xml (Issue  #123).
+    * [[#a3286eb](https://github.com/nfdi4plants/Swate/commit/a3286ebcefe217bbc4354c9e19fe79004d7afb6d)] Add checksum content type (Issue #127, Issue #131).
+    * [[#97407d4](https://github.com/nfdi4plants/Swate/commit/97407d45c5139ded3234824f46c530e68e0556a1)] Changed DateTime to use UTC (Issue #126).
+    * [[#137cc54](https://github.com/nfdi4plants/Swate/commit/137cc542db62fecb52fad77177bb6de1a72c1965)] Add more info for existing building blocks (Issue #124).
+    * [[#66fb577](https://github.com/nfdi4plants/Swate/commit/66fb5771c55632c4cc0bf229996d8fa4cd304a69)] Add option to create pointer json template (Issue #129).
+* Deletions:
+    * [[#84d71ee](https://github.com/nfdi4plants/Swate/commit/84d71eef62c1d55bb2130143926d47e8b462fdeb)] Remove 'decimal' validation type.
+* Bugfixes:
+    * [[#d75743c](https://github.com/nfdi4plants/Swate/commit/d75743cc4597ab9ba557ea9522e6beea091db209)] Add minor fixes
+    * [[#bd13cbf](https://github.com/nfdi4plants/Swate/commit/bd13cbf39f013277381b04bb9f30577d2a929f42)] Fix drag n drop problems in filepicker.
+    * [[#33695f4](https://github.com/nfdi4plants/Swate/commit/33695f429ac6aa76e8638b9d5b375921b3d856bd)] Fix protocol grouping bug.
+    * [[#f4d08e8](https://github.com/nfdi4plants/Swate/commit/f4d08e8f1f41c712ff787ce231e4c085795eef2a)] Fix protocol xml not correctly removed bug.
+
 ### 0.4.0+a0e04f3 (Released 2021-3-1)
 * Additions:
     * latest commit #a0e04f3

diff --git a/manifest.xml b/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:ov="http://schemas.microsoft.com/office/taskpaneappversionoverrides" xsi:type="TaskPaneApp">
   <Id>5d6f5462-3401-48ec-9406-d12882e9ad83</Id>
-  <Version>0.4.0</Version>
+  <Version>0.4.1</Version>
   <ProviderName>Computational Systems Biology</ProviderName>
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="Swate"/>

diff --git a/src/Client/Client.fs b/src/Client/Client.fs
@@ -114,6 +114,19 @@ let view (model : Model) (dispatch : Msg -> unit) =
         ] [
             //Text.p [] [str ""]
         ]
+    | Routing.Route.SettingsDataStewards ->
+        BaseView.baseViewComponent model dispatch [
+            SettingsDataStewardView.settingsDataStewardViewComponent model dispatch
+        ] [
+            //Text.p [] [str ""]
+        ]
+    | Routing.Route.SettingsProtocol ->
+        BaseView.baseViewComponent model dispatch [
+            SettingsProtocolView.settingsProtocolViewComponent model dispatch
+        ] [
+            //Text.p [] [str ""]
+        ]
+
 
     | Routing.Route.Info ->
         BaseView.baseViewComponent model dispatch [
@@ -134,28 +147,7 @@ let view (model : Model) (dispatch : Msg -> unit) =
             div [][ str "This is the Swate web host. For a preview click on the following link." ]
             a [ Href (Routing.Route.toRouteUrl Routing.Route.TermSearch) ] [ str "Termsearch" ]
         ]
-    //| _ ->
-    //    div [   Style [MinHeight "100vh"; BackgroundColor model.SiteStyleState.ColorMode.BodyBackground; Color model.SiteStyleState.ColorMode.Text;]
-    //        ] [
-    //        Container.container [Container.IsFluid] [
-    //            br []
-    //            br []
-    //            Button.buttonComponent model.SiteStyleState.ColorMode true "make a test db insert xd" (fun _ -> ((sprintf "Me am test %A" (System.Guid.NewGuid())),"1","Me is testerino",System.DateTime.UtcNow,"MEEEMuser") |> TestOntologyInsert |> Request |> Api|> dispatch)
-    //            Button.buttonComponent model.SiteStyleState.ColorMode true "idk man=(" (fun _ -> TryExcel |> ExcelInterop |> dispatch)
-    //            Button.buttonComponent model.SiteStyleState.ColorMode true "create annoation table" (fun _ -> model.SiteStyleState.IsDarkMode |> CreateAnnotationTable |> ExcelInterop |> dispatch)
-    //            Button.buttonComponent model.SiteStyleState.ColorMode true "Log table metadata" (fun _ -> LogTableMetadata |> Dev |> dispatch)
-    //            Button.buttonComponent model.SiteStyleState.ColorMode true "Log table metadata" (fun _ -> LogTableMetadata |> Dev |> dispatch)
-
-    //            Footer.footer [ Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]] [
-    //                Content.content [
-    //                    Content.Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Left)]
-    //                    Content.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode] 
-    //                ][
-
-    //                ]
-    //            ] 
-    //    ]
-    //]
+
 
 #if DEBUG
 open Elmish.Debug

diff --git a/src/Client/Client.fsproj b/src/Client/Client.fsproj
@@ -23,13 +23,15 @@
         <Compile Include="Model.fs" />
         <Compile Include="Messages.fs" />
         <Compile Include="Update.fs" />
+        <Compile Include="CustomComponents\ResponsiveFA.fs" />
         <Compile Include="CustomComponents\DwnButton.fs" />
         <Compile Include="CustomComponents\Footer.fs" />
         <Compile Include="CustomComponents\Button.fs" />
         <Compile Include="CustomComponents\AnnotationTableMissingWarning.fs" />
         <Compile Include="CustomComponents\Navbar.fs" />
         <Compile Include="CustomComponents\Loading.fs" />
         <Compile Include="CustomComponents\ErrorModal.fs" />
+        <Compile Include="CustomComponents\WarningModal.fs" />
         <Compile Include="CustomComponents\BuildingBlockDetailsModal.fs" />
         <Compile Include="CustomComponents\PaginatedTable.fs" />
         <Compile Include="CustomComponents\AdvancedSearch.fs" />
@@ -47,6 +49,8 @@
         <Compile Include="Views\ActivityLogView.fs" />
         <Compile Include="Views\SettingsView.fs" />
         <Compile Include="Views\SettingsXmlView.fs" />
+        <Compile Include="Views\SettingsProtocolView.fs" />
+        <Compile Include="Views\SettingsDataStewardView.fs" />
         <Compile Include="Views\NotFoundView.fs" />
         <Compile Include="Client.fs" />
     </ItemGroup>

diff --git a/src/Client/CustomComponents/AdvancedSearch.fs b/src/Client/CustomComponents/AdvancedSearch.fs
@@ -35,7 +35,6 @@ let createOntologyDropdownItem (model:Model) (dispatch:Msg -> unit) (ontOpt: DbD
             TabIndex 0
             OnClick (fun _ -> ontOpt |> OntologySuggestionUsed |> AdvancedSearch |> dispatch)
             OnKeyDown (fun k -> if k.key = "Enter" then ontOpt |> OntologySuggestionUsed |> AdvancedSearch |> dispatch)
-            colorControl model.SiteStyleState.ColorMode
         ]
     ][
         Text.span [
@@ -62,8 +61,8 @@ let createAdvancedTermSearchResultRows (model:Model) (dispatch: Msg -> unit) (su
         |> Array.map (fun sugg ->
             tr [
                 OnClick (fun _ -> sugg |> suggestionUsedHandler |> dispatch)
-                colorControl model.SiteStyleState.ColorMode
                 Class "suggestion"
+                colorControl model.SiteStyleState.ColorMode
             ] [
                 td [Class (Tooltip.ClassName + " " + Tooltip.IsTooltipRight + " " + Tooltip.IsMultiline);Tooltip.dataTooltip sugg.Definition] [
                     Fa.i [Fa.Solid.InfoCircle] []
@@ -140,7 +139,7 @@ let advancedTermSearchComponent (model:Model) (dispatch: Msg -> unit) =
                     Input.input [
                         Input.Placeholder "... search key words"
                         Input.Size IsSmall
-                        Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
+                        //Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
                         Input.OnChange (fun e ->
                             {model.AdvancedSearchState.AdvancedSearchOptions
                                 with SearchTermName = e.Value
@@ -161,7 +160,7 @@ let advancedTermSearchComponent (model:Model) (dispatch: Msg -> unit) =
                     Input.input [
                         Input.Placeholder "... must exist in name"
                         Input.Size IsSmall
-                        Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
+                        //Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
                         Input.OnChange (fun e ->
                             {model.AdvancedSearchState.AdvancedSearchOptions
                                 with MustContainName = e.Value
@@ -182,7 +181,7 @@ let advancedTermSearchComponent (model:Model) (dispatch: Msg -> unit) =
                     Input.input [
                         Input.Placeholder "... search key words"
                         Input.Size IsSmall
-                        Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
+                        //Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
                         Input.OnChange (fun e ->
                             {model.AdvancedSearchState.AdvancedSearchOptions
                                 with SearchTermDefinition = e.Value
@@ -204,7 +203,7 @@ let advancedTermSearchComponent (model:Model) (dispatch: Msg -> unit) =
                         Input.input [
                             Input.Placeholder "... must exist in definition"
                             Input.Size IsSmall
-                            Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
+                            //Input.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]
                             Input.OnChange (fun e ->
                                 {model.AdvancedSearchState.AdvancedSearchOptions
                                     with MustContainDefinition = e.Value
@@ -227,7 +226,7 @@ let advancedSearchResultTable (model:Model) (dispatch: Msg -> unit) =
         ][
             Button.buttonComponent model.SiteStyleState.ColorMode true "Change search options" (fun _ -> UpdateAdvancedTermSearchSubpage AdvancedTermSearchSubpages.InputFormSubpage |> AdvancedSearch |> dispatch)
         ]
-        Label.label [] [str "Results:"]
+        Label.label [Label.Props [colorControl model.SiteStyleState.ColorMode]] [str "Results:"]
         if model.AdvancedSearchState.AdvancedTermSearchSubpage = AdvancedTermSearchSubpages.ResultsSubpage then
             if model.AdvancedSearchState.HasAdvancedSearchResultsLoading then
                 div [
@@ -251,17 +250,13 @@ let advancedSearchResultTable (model:Model) (dispatch: Msg -> unit) =
 
 let advancedSearchSelectedResultDisplay (model:Model) (result:DbDomain.Term) =
     Container.container [] [
-        Heading.h4 [] [str "Selected Result:"]
+        Heading.h4 [Heading.Props [colorControl model.SiteStyleState.ColorMode]] [str "Selected Result:"]
         Table.table [Table.IsFullWidth] [
-            thead [] []
-            tbody [] [
+            tbody [colorControl model.SiteStyleState.ColorMode] [
                 tr [
-                colorControl model.SiteStyleState.ColorMode
+                //colorControl model.SiteStyleState.ColorMode
                 Class "suggestion"
                 ] [
-                    td [Class (Tooltip.ClassName + " " + Tooltip.IsTooltipRight + " " + Tooltip.IsMultiline);Tooltip.dataTooltip result.Definition] [
-                        Fa.i [Fa.Solid.InfoCircle] []
-                    ]
                     td [] [
                         b [] [str result.Name]
                     ]
@@ -281,12 +276,12 @@ let advancedSearchModal (model:Model) (modalId: string) (relatedInputId:string)
             && model.AdvancedSearchState.ModalId = modalId
         )
         Modal.Props [
-            colorControl model.SiteStyleState.ColorMode
+            //colorControl model.SiteStyleState.ColorMode
             Id modalId
         ]
     ] [
         Modal.background [] []
-        Modal.Card.card [Props [colorControl model.SiteStyleState.ColorMode]] [
+        Modal.Card.card [] [
             Modal.Card.head [Props [colorControl model.SiteStyleState.ColorMode]] [
                 Modal.close [Modal.Close.Size IsLarge; Modal.Close.OnClick (fun _ -> ToggleModal modalId |> AdvancedSearch |> dispatch)] []
                 Heading.h4 [Heading.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]] [
@@ -306,7 +301,7 @@ let advancedSearchModal (model:Model) (modalId: string) (relatedInputId:string)
                 //    |None   -> advancedSearchResultTable model dispatch 
                 //    |Some r -> advancedSearchSelectedResultDisplay model r
             ]
-            Modal.Card.foot [] [
+            Modal.Card.foot [Props [colorControl model.SiteStyleState.ColorMode]] [
                 form [
                     OnSubmit    (fun e -> e.preventDefault())
                     OnKeyDown   (fun k -> if k.key = "Enter" then k.preventDefault())

diff --git a/src/Client/CustomComponents/AutocompleteSearch.fs b/src/Client/CustomComponents/AutocompleteSearch.fs
@@ -261,15 +261,13 @@ let autocompleteTermSearchComponent
     Control.div [Control.IsExpanded] [
         AdvancedSearch.advancedSearchModal model autocompleteParams.ModalId autocompleteParams.InputId dispatch autocompleteParams.OnAdvancedSearch
         Input.input [
+            Input.Props [Style [BorderColor ExcelColors.Colorfull.gray40]]
             Input.Disabled isDisabled
             Input.Placeholder inputPlaceholderText
             Input.ValueOrDefault autocompleteParams.StateBinding
             match inputSize with
             | Some size -> Input.Size size
             | _ -> ()
-            Input.Props [
-                ExcelColors.colorControl colorMode
-            ]           
             Input.OnChange (
                 fun e -> e.Value |> autocompleteParams.OnInputChangeMsg |> dispatch
             )
@@ -317,8 +315,6 @@ let autocompleteTermSearchComponentOfParentOntology
                     | Some size -> Input.Size size
                     | _ -> ()
                     Input.Props [
-
-                        ExcelColors.colorControl colorMode
                         OnFocus (fun e ->
                             //GenericLog ("Info","FOCUSED!") |> Dev |> dispatch
                             GetParentTerm |> ExcelInterop |> dispatch