Work in progress

RaphaelGauthier · May 6, 2024 · 4e19af0 · 4e19af0
1 parent 3aca60e
commit 4e19af0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts.elm
@@ -187,7 +187,23 @@ update msg model =
             ( newModel, Cmd.batch [ successNotification ("Account '" ++ account.name ++ "' successfully " ++ action), getAccounts newModel ] )
 
         SaveAccount (Err err) ->
-            processApiError "Saving account" err model
+                    case model.editAccount of
+                      Just account ->
+                        let
+                            ui =
+                                model.ui
+                            copyState =
+                                case ui.modalState of
+                                    NewAccount ->
+                                        Token account.token
+
+                                    _ ->
+                                        NoCopy
+                            newModel =
+                                { model | ui = { ui | modalState = NoModal, copyState = copyState }, editAccount = Nothing }
+                        in
+                            processApiError "Saving account" err newModel
+                      _ -> processApiError "Saving account" err model
 
         ConfirmActionAccount actionType (Ok ( metadata, account )) ->
             let

diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm
@@ -223,8 +223,7 @@ displayModals model =
     case model.ui.copyState of
         NoCopy ->
             div [ id accountsModalId, class ("modal modal-account fade " ++ modalClass), attribute "aria-modal" "true", attribute "role" "dialog" ]
-                [ div [ class "modal-backdrop fade show", onClick (ToggleEditPopup NoModal) ] []
-                , div [ class "modal-dialog" ]
+                [ div [ class "modal-dialog" ]
                     [ div [ class "modal-content" ]
                         [ div [ class "modal-header" ]
                             [ h5 [ class "modal-title" ] [ text modalTitle ]
@@ -272,7 +271,7 @@ displayModals model =
                                 ]
                             ]
                         , div [ class "modal-footer" ]
-                            [ button [ type_ "button", class "btn btn-default", onClick (ToggleEditPopup NoModal) ] [ text "Close" ]
+                            [ button [ type_ "button", class "btn btn-default", onClick (ToggleEditPopup NoModal), attribute "data-bs-dismiss" "modal", attribute "aria-label" "Close" ] [ text "Close" ]
                             , button [ type_ "button", class ("btn btn-" ++ btnClass), onClick modalUI.saveAction, disabled (checkEmptyBtn || checkAlreadyUsedName) ] [ text btnTxt ]
                             ]
                         ]
@@ -282,8 +281,7 @@ displayModals model =
         Token txt ->
             -- Almost a modal as it is a notification that requires user interaction (copy)
             div [ class "modal fade show", style "display" "block" ]
-                [ div [ class "modal-backdrop fade show", onClick CloseCopyPopup ] []
-                , div [ class "modal-dialog" ]
+                [ div [ class "modal-dialog" ]
                     [ div [ class "modal-content" ]
                         [ div [ class "modal-header" ]
                             [ h5 [ class "modal-title" ] [ text "Copy the token" ]
@@ -304,7 +302,7 @@ displayModals model =
                                 ]
                             ]
                         , div [ class "modal-footer" ]
-                            [ button [ type_ "button", class "btn btn-success", onClick CloseCopyPopup ] [ text "Close" ]
+                            [ button [ type_ "button", class "btn btn-success", onClick CloseCopyPopup, attribute "data-bs-dismiss" "modal", attribute "aria-label" "Close" ] [ text "Close" ]
                             ]
                         ]
                     ]

diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/GroupRelatedRules/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/GroupRelatedRules/View.elm
@@ -138,7 +138,7 @@ view model =
         else
           div [class "tags-container"]
           ( List.map (\t ->
-            div [class "btn-group btn-group-xs ng-scope"]
+            div [class "btn-group btn-group-xs"]
             [ button [class "btn btn-default tags-label", onClick (UpdateRuleFilters {treeFilters | newTag = {newTag | key = t.key, value = t.value}})]
               [ i [class "fa fa-tag"][]
               , span [class "tag-key"]

diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm
@@ -313,7 +313,7 @@ modalDelete model =
       [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][]
       , div [ class "modal-dialog" ]
         [ div [ class "modal-content" ]
-          [ div [ class "modal-header ng-scope" ]
+          [ div [ class "modal-header" ]
             [ h5 [ class "modal-title" ] [ text "Delete property"]
             , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][]
             ]

diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm
@@ -171,7 +171,7 @@ view model =
           [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][]
           , div [ class "modal-dialog" ] [
               div [ class "modal-content" ] [
-                div [ class "modal-header ng-scope" ] [
+                div [ class "modal-header" ] [
                   h5 [ class "modal-title" ] [ text "Delete Rule"]
                 , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][]
                 ]
@@ -208,7 +208,7 @@ view model =
           [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][]
           , div [ class "modal-dialog" ] [
               div [ class "modal-content" ]  [
-                div [ class "modal-header ng-scope" ] [
+                div [ class "modal-header" ] [
                   h5[ class "modal-title" ] [ text (txtDisable ++" Rule")]
                 , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][]
                 ]
@@ -233,7 +233,7 @@ view model =
          [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][]
          , div [ class "modal-dialog" ] [
              div [ class "modal-content" ] [
-               div [ class "modal-header ng-scope" ] [
+               div [ class "modal-header" ] [
                  h5 [ class "modal-title" ] [ text "Delete category"]
                , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][]
                ]
@@ -259,7 +259,7 @@ view model =
           [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][]
           , div [ class "modal-dialog" ]
             [ div [ class "modal-content" ]
-              [ div [ class "modal-header ng-scope" ]
+              [ div [ class "modal-header" ]
                 [ h5 [ class "modal-title" ] [ text (action ++" Rule")]
                 , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][]
                 ]
@@ -345,7 +345,7 @@ view model =
           else
             div [class "tags-container"]
             ( List.map (\t ->
-              div [class "btn-group btn-group-xs ng-scope"]
+              div [class "btn-group btn-group-xs"]
               [ button [class "btn btn-default tags-label", onClick (UpdateRuleFilters {ruleFilters | treeFilters = {treeFilters | newTag = {newTag | key = t.key, value = t.value}}})]
                 [ i [class "fa fa-tag"][]
                 , span [class "tag-key"]