Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · May 11, 2022 · f3c6b3e · f3c6b3e
2 parents fbba598 + 2b1cb9e
commit f3c6b3e
Show file tree

Hide file tree

Showing 106 changed files with 2,183 additions and 1,284 deletions.
diff --git a/gui/admin-gui/.npmrc b/gui/admin-gui/.npmrc
@@ -1 +1 @@
-registry = https://nexus.evolveum.com/nexus/repository/npm/
+000registry = https://nexus.evolveum.com/nexus/repository/npm/
diff --git a/gui/admin-gui/package-lock.json b/gui/admin-gui/package-lock.json
diff --git a/gui/admin-gui/package.json b/gui/admin-gui/package.json
@@ -4,6 +4,7 @@
   "description": "Evolveum midPoint admin-gui module npm project for css/javascript code",
   "main": "index.js",
   "scripts": {
+    "postinstall": "patch-package",
     "build": "webpack build --env production --config ./webpack.config.js --progress --profile --bail",
     "watch": "webpack watch --env development --config ./webpack.config.js --progress --profile"
   },
@@ -12,7 +13,7 @@
   "devDependencies": {
     "@fontsource/source-sans-pro": "^4.5.9",
     "ace-builds": "^1.4.14",
-    "admin-lte": "3.1.0",
+    "admin-lte": "3.2.0",
     "babel-loader": "^8.2.4",
     "bootstrap-multiselect": "^1.1.0",
     "bootstrap-select": "^1.13.18",
@@ -23,6 +24,7 @@
     "file-loader": "^6.2.0",
     "knockout": "^3.5.1",
     "mini-css-extract-plugin": "^2.6.0",
+    "patch-package": "^6.4.7",
     "postcss-loader": "^6.2.1",
     "sass": "^1.50.0",
     "sass-loader": "^12.6.0",

diff --git a/gui/admin-gui/patches/admin-lte+3.2.0.patch b/gui/admin-gui/patches/admin-lte+3.2.0.patch
@@ -0,0 +1,26 @@
+diff --git a/node_modules/admin-lte/build/scss/mixins/_backgrounds.scss b/node_modules/admin-lte/build/scss/mixins/_backgrounds.scss
+index a4a031c..531ae12 100644
+--- a/node_modules/admin-lte/build/scss/mixins/_backgrounds.scss
++++ b/node_modules/admin-lte/build/scss/mixins/_backgrounds.scss
+@@ -4,7 +4,7 @@
+
+ // Background Variant
+ @mixin background-variant($name, $color) {
+-  &.bg-#{$name} {
++  #{if(&, '&.bg-#{$name}','.bg-#{$name}')} {
+     background-color: #{$color} !important;
+
+     &,
+diff --git a/node_modules/admin-lte/build/scss/mixins/_toasts.scss b/node_modules/admin-lte/build/scss/mixins/_toasts.scss
+index 563f329..4f3a735 100644
+--- a/node_modules/admin-lte/build/scss/mixins/_toasts.scss
++++ b/node_modules/admin-lte/build/scss/mixins/_toasts.scss
+@@ -4,7 +4,7 @@
+
+ // Toast Variant
+ @mixin toast-variant($name, $color) {
+-  &.bg-#{$name} {
++  #{if(&, '&.bg-#{$name}','.bg-#{$name}')} {
+     background-color: rgba($color, .9) !important;
+     @if (color-yiq($color) == $yiq-text-light) {
+
diff --git a/gui/admin-gui/src/frontend/_to-remove/less/midpoint-theme-variables.less b/gui/admin-gui/src/frontend/_to-remove/less/midpoint-theme-variables.less
@@ -97,7 +97,6 @@
 // --------------------------------------------------------
 @box-border-color: #f4f4f4;
 @box-border-radius: 3px;
-@box-footer-bg: #fff;
 @box-boxshadow: 0 1px 1px rgba(0, 0, 0, .1);
 @box-padding: 10px;
 
@@ -147,4 +146,4 @@
 @transition-speed: .3s;
 @transition-fn: ease-in-out;
 
-//AdminLTE VARIABLES END..
+//AdminLTE VARIABLES END..
diff --git a/gui/admin-gui/src/frontend/js/midpoint-theme.js b/gui/admin-gui/src/frontend/js/midpoint-theme.js
@@ -425,12 +425,13 @@ export default class MidPointTheme {
         $('#' + compId).multiselect(options);
     }
 
+    togglePopover(refId, popupId) {
+        var popup = $(popupId);
+
+        this.showPopover(refId, popupId, !popup.is(':visible'));
+    }
+
     showPopover(refId, popupId, show) {
-        console.log("showPopover", {
-            ref: refId,
-            popup: popupId,
-            show: show,
-        })
         var ref = $(refId);
         var popup = $(popupId);
         var arrow = popup.find('.arrow');

diff --git a/gui/admin-gui/src/frontend/js/vendors.js b/gui/admin-gui/src/frontend/js/vendors.js
@@ -19,6 +19,8 @@ ace.config.setModuleUrl('ace/mode/xml',
     require('../../../node_modules/ace-builds/src-noconflict/mode-xml.js'));
 ace.config.setModuleUrl('ace/ext/language_tools',
     require('../../../node_modules/ace-builds/src-noconflict/ext-language_tools.js'));
+ace.config.setModuleUrl('ace/ext/searchbox',
+    require('../../../node_modules/ace-builds/src-noconflict/ext-searchbox.js'));
 
 // ace.config.setModuleUrl('ace/mode/xml_worker', require('../../../node_modules/ace-builds/src-noconflict/worker-xml.js'));
 ace.config.setModuleUrl('ace/mode/xml_worker',

diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -6,18 +6,19 @@
  */
 @import "midpoint-theme-variables";
 
-@import "../../../node_modules/admin-lte/build/scss/adminlte";
-@import "../../../node_modules/overlayscrollbars/css/OverlayScrollbars.css";
-@import "../../../node_modules/@fortawesome/fontawesome-free/css/all.css";
-@import "../../../node_modules/datatables.net-bs4/css/dataTables.bootstrap4";
-
-@import "../../../node_modules/bootstrap-select/dist/css/bootstrap-select.css";
-@import "../../../node_modules/bootstrap-multiselect/dist/css/bootstrap-multiselect.css";
+// AdminLTE and Bootstrap
+@import "../../../node_modules/admin-lte/node_modules/bootstrap/scss/functions";
+@import "../../../node_modules/admin-lte/build/scss/bootstrap-variables";
+@import "../../../node_modules/admin-lte/node_modules/bootstrap/scss/variables";
+@import "../../../node_modules/admin-lte/build/scss/variables";
+@import "../../../node_modules/admin-lte/build/scss/variables-alt";
+// AdminLTE and Bootstrap end
 
 @import "icon-style";
 @import "prism-forms";
 @import "midpoint-utils";
 @import "details-menu";
+@import "wicket";
 
 //@import "midpoint/prism-container";
 //@import "midpoint/wizard";
@@ -68,31 +69,6 @@ body.custom-hold-transition {
 
 }
 
-#wicketDebugLink {
-  bottom: 55px !important;
-}
-
-#wicketDebugBar img {
-  vertical-align: unset;
-}
-
-div.wicket-debug-buttons {
-  border: 1px solid #000000;
-  background-color: #ffffff;
-  opacity: 0.7;
-  bottom: 85px;
-  display: block;
-  position: fixed;
-  right: 10px;
-  z-index: 1000000;
-
-  a {
-    color: #0000ff;
-    display: block;
-    padding: 3px 20px;
-  }
-}
-
 div.navbar-custom-menu {
   margin-right: 14px;
 }
@@ -1445,10 +1421,6 @@ td .prism-property-value {
 	width: 38px;
 }
 
-.ace-editor-left-aligning {
-  margin-left: -15px;
-}
-
 .search-form {
 
 }
@@ -1474,6 +1446,11 @@ td .prism-property-value {
   .search-item-field {
     padding-left: 3px !important;
   }
+
+  & > a.btn,
+  & > a.btn:hover {
+    border-top: 0 !important;
+  }
 }
 
 .metadata {
@@ -1967,3 +1944,7 @@ span.yui-skin-sam {
   flex-wrap: wrap !important;
   gap: 0.5rem;
 }
+
+.card-footer {
+  background-color: $white;
+}
diff --git a/gui/admin-gui/src/frontend/scss/prism-forms.scss b/gui/admin-gui/src/frontend/scss/prism-forms.scss
@@ -5,6 +5,15 @@
  * and European Union Public License. See LICENSE file for details.
  */
 
+@mixin container-wrapper($padding-left) {
+  padding-left: $padding-left;
+  border-top: none;
+}
+
+.container-wrapper {
+  width: 100% !important;
+}
+
 .top-level-prism-container {
   border-top: 1px solid $table-divider-color;
   padding-top: 5px;
@@ -34,19 +43,15 @@
         border-top: none;
 
         .container-wrapper {
-          padding-left: 40px;
-          border-top: none;
+          @include container-wrapper(40px);
         }
       }
 
       .container-wrapper {
-        padding-left: 40px;
-        border-top: none;
+        @include container-wrapper(40px);
 
         .container-wrapper {
-          padding-left: 0px;
-          border-top: none;
-        }
+          @include container-wrapper(0px);        }
       }
     }
   }
@@ -72,11 +77,11 @@
 }
 
 .multivalue-container > .container-wrapper > div > .added-value-background {
-  background-color: $green; // green background for new value of multivalue container
+  background-color: rgba($green, .1); // green background for new value of multivalue container
 }
 
 .multivalue-container > .container-wrapper > div > .removed-value-background {
-  background-color: $red; // green background for new value of multivalue container
+  background-color: rgba($red, .1); // green background for new value of multivalue container
 }
 
 .top-level-prism-container > .prism-properties > div {
@@ -85,7 +90,6 @@
 
 .prism-properties {
 
-
   .prism-property {
     padding-left: 40px;
 

diff --git a/gui/admin-gui/src/frontend/scss/vendors.scss b/gui/admin-gui/src/frontend/scss/vendors.scss
@@ -11,3 +11,13 @@
 @import "../../../node_modules/@fontsource/source-sans-pro/400.css";
 @import "../../../node_modules/@fontsource/source-sans-pro/400-italic.css";
 @import "../../../node_modules/@fontsource/source-sans-pro/700.css";
+
+@import "midpoint-theme-variables";
+
+@import "../../../node_modules/admin-lte/build/scss/adminlte";
+@import "../../../node_modules/overlayscrollbars/css/OverlayScrollbars.css";
+@import "../../../node_modules/@fortawesome/fontawesome-free/css/all.css";
+@import "../../../node_modules/datatables.net-bs4/css/dataTables.bootstrap4";
+
+@import "../../../node_modules/bootstrap-select/dist/css/bootstrap-select.css";
+@import "../../../node_modules/bootstrap-multiselect/dist/css/bootstrap-multiselect.css";
diff --git a/gui/admin-gui/src/frontend/scss/wicket.scss b/gui/admin-gui/src/frontend/scss/wicket.scss
@@ -0,0 +1,76 @@
+/*!
+ * Copyright (c) 2022 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+@import "midpoint-theme-variables";
+
+#wicketDebugLink {
+  bottom: 55px !important;
+}
+
+#wicketDebugBar img {
+  vertical-align: unset;
+}
+
+div.wicket-debug-buttons {
+  border: 1px solid #000000;
+  background-color: #ffffff;
+  opacity: 0.7;
+  bottom: 85px;
+  display: block;
+  position: fixed;
+  right: 10px;
+  z-index: 1000000;
+
+  a {
+    color: #0000ff;
+    display: block;
+    padding: 3px 20px;
+  }
+}
+
+/**
+ *  Auto-complete drop-down choice styles
+ */
+.autocomplete-parent > a.icon {
+  position: absolute;
+  right: 10px;
+  top: 8px;
+  z-index: 5;
+  cursor: default;
+  color: #555555;
+  font-size: 10.5px;
+}
+
+div.wicket-aa-container {
+  z-index: 20003 !important;  // used because if autocomplete used on popup
+
+  div.wicket-aa {
+    background-color: $input-bg;
+    border: 1px solid $input-border-color;
+    border-bottom-left-radius: $input-border-radius;
+    border-bottom-right-radius: $input-border-radius;
+    padding: $input-padding-y $input-padding-x;
+    margin: 1px;
+    text-align: left;
+
+    ul {
+      list-style: none;
+      padding: 2px;
+      margin: 0;
+
+      li {
+        padding: 2px;
+        margin: 0;
+
+        &.selected {
+          background-color: lighten($input-focus-border-color, 10%);
+        }
+      }
+    }
+  }
+}
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -246,7 +246,7 @@ public class GuiStyleConstants {
 
     public static final String CLASS_ICON_SAVE = "fa fa-save";
     public static final String CLASS_ICON_PREVIEW = "fa fa-eye";
-    public static final String CLASS_ICON_REMOVE = "fa fa-trash";
+    public static final String CLASS_ICON_REMOVE = CLASS_ICON_TRASH;
 
     public static final String CLASS_ICON_WIZARD = "fa fa-magic";
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -410,7 +410,7 @@ public void onClick(AjaxRequestTarget target) {
                 target.add(getTable());
             }
         };
-        refreshIcon.add(AttributeAppender.append("class", "btn btn-default btn-margin-left btn-sm"));
+        refreshIcon.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
         return refreshIcon;
     }
 

diff --git a/.../java/com/evolveum/midpoint/gui/api/component/autocomplete/AbstractAutoCompletePanel.html b/.../java/com/evolveum/midpoint/gui/api/component/autocomplete/AbstractAutoCompletePanel.html
@@ -9,14 +9,10 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
     <div class="autocomplete-parent" style="height:30px; position: relative;">
-        <div class="col-md-12" style="padding: 0px !important;">
-            <input wicket:id="input" class="form-control form-control-sm" type="text" style="padding-right: 16px;"/>
-        </div>
-        <div style="position: absolute; right: 3px; top: 7px; z-index: 5;">
-            <a wicket:id="iconButton" style="float:right; cursor: default; color: #555555; font-size: 10.5px;">
-                <i class="fa fa-chevron-down"/>
-            </a>
-        </div>
+        <input wicket:id="input" class="form-control form-control-sm w-100" type="text"/>
+        <a class="icon" wicket:id="iconButton">
+            <i class="fa fa-chevron-down"/>
+        </a>
     </div>
 </wicket:panel>
 </html>
diff --git a/...src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPropertyPanel.html b/...src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPropertyPanel.html
@@ -8,8 +8,8 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div class="col-lg-2 col-md-4 col-xs-12 prism-property-label " wicket:id="header"/>
-    <div class="col-lg-10 col-md-8 col-xs-12 prism-property-value" wicket:id="values">
+    <div class="col-xl-2 col-md-4 col-xs-12 prism-property-label " wicket:id="header"/>
+    <div class="col-xl-10 col-md-8 col-xs-12 prism-property-value" wicket:id="values">
         <div class="row">
             <div class="col-10" wicket:id="passwordPanel" />
         </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.html
@@ -13,8 +13,8 @@
             <div wicket:id="namespaceModeConteiner">
                 <div wicket:id="namespace" style="padding-bottom: 5px;" />
                 <div wicket:id="definition"/>
-                <button wicket:id="plus" class="btn btn-box-tool" trigger="hover"><i class="fa fa-plus-circle"></i></button>
-                <button wicket:id="minus" class="btn btn-box-tool" trigger="hover"><i class="fa fa-minus-circle"></i></button>
+                <button wicket:id="plus" class="btn btn-tool" trigger="hover"><i class="fa fa-plus-circle"></i></button>
+                <button wicket:id="minus" class="btn btn-tool" trigger="hover"><i class="fa fa-minus-circle"></i></button>
             </div>
             <div wicket:id="itemPathTextField"/>
         </div>