From 5d439749c04d932932645bee5128321ef86df656 Mon Sep 17 00:00:00 2001
From: Roman Blanco <rblanco@redhat.com>
Date: Thu, 7 Mar 2019 16:31:30 +0100
Subject: [PATCH 1/4] Allow setting default value for date/time picker in
 Dialog Editor modal

fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1686077
---
 .../modal-field-template/date-control.html    | 88 +++++++++++++++++++
 .../date-time-control.html                    | 10 +++
 .../components/modal-field/field.html         |  2 +-
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/dialog-editor/components/modal-field-template/date-control.html

diff --git a/src/dialog-editor/components/modal-field-template/date-control.html b/src/dialog-editor/components/modal-field-template/date-control.html
new file mode 100644
index 0000000000..6c80617578
--- /dev/null
+++ b/src/dialog-editor/components/modal-field-template/date-control.html
@@ -0,0 +1,88 @@
+<div ng-if="vm.modalTabIsSet('options') && !vm.modalData.dynamic">
+  <form class="form-horizontal">
+    <div pf-form-group pf-label="{{'Default value'|translate}}">
+      <div class="dateTimePadding">
+        <input ng-model="vm.modalData.default_value"
+               pf-datepicker
+               date="vm.modalData.default_value">
+      </div>
+    </div>
+    <div pf-form-group pf-label="{{'Read only'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.read_only"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <div pf-form-group pf-label="{{'Visible'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.visible"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <div pf-form-group pf-label="{{'Show Past Dates'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.options.show_past_dates"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <dialog-editor-modal-field-template template="fields-to-refresh.html"
+                                        modal-data="vm.modalData">
+    </dialog-editor-modal-field-template>
+  </form>
+</div>
+<div ng-if="vm.modalTabIsSet('options') && vm.modalData.dynamic">
+  <form class="form-horizontal">
+    <div ng-show="!vm.treeOptions.show">
+      <div pf-form-group pf-label="{{'Entry Point'|translate}}">
+        <div class="input-group">
+          <input type="text" class="form-control" ng-value="vm.showFullyQualifiedName(vm.modalData.resource_action)" disabled>
+          <span class="input-group-btn">
+            <button class="btn btn-default" ng-click="vm.treeOptions.toggle();"><i class="ff ff-load-balancer"></i></button>
+          </span>
+        </div>
+      </div>
+      <div pf-form-group pf-label="{{'Show Refresh Button'|translate}}">
+        <input bs-switch
+               ng-model="vm.modalData.show_refresh_button"
+               type="checkbox"
+               switch-on-text="{{'Yes'|translate}}"
+               switch-off-text="{{'No'|translate }}"/>
+      </div>
+      <div pf-form-group pf-label="{{'Show Past Dates'|translate}}">
+        <input bs-switch
+               ng-model="vm.modalData.options.show_past_dates"
+               type="checkbox"
+               switch-on-text="{{'Yes'|translate}}"
+               switch-off-text="{{'No'|translate}}">
+      </div>
+      <dialog-editor-modal-field-template template="fields-to-refresh.html"
+                                          modal-data="vm.modalData">
+      </dialog-editor-modal-field-template>
+    </div>
+
+    <dialog-editor-tree-selector ng-if="vm.treeOptions.show"
+                                 tree-options="vm.treeOptions">
+    </dialog-editor-tree-selector>
+  </form>
+</div>
+<div ng-if="vm.modalTabIsSet('overridable') && vm.modalData.dynamic">
+  <form class="form-horizontal">
+    <div pf-form-group pf-label="{{'Read only'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.read_only"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <div pf-form-group pf-label="{{'Visible'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.visible"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+  </form>
+</div>
diff --git a/src/dialog-editor/components/modal-field-template/date-time-control.html b/src/dialog-editor/components/modal-field-template/date-time-control.html
index badefb8f65..5cae96b724 100644
--- a/src/dialog-editor/components/modal-field-template/date-time-control.html
+++ b/src/dialog-editor/components/modal-field-template/date-time-control.html
@@ -7,6 +7,16 @@
              switch-on-text="{{'Yes'|translate}}"
              switch-off-text="{{'No'|translate}}">
     </div>
+    <div pf-form-group pf-label="{{'Default value'|translate}}">
+      <div class="dateTimePadding">
+        <input ng-model="vm.modalData.default_value"
+               pf-datepicker
+               date="vm.modalData.default_value">
+      </div>
+      <div >
+        <uib-timepicker ng-model="vm.modalData.default_value"></uib-timepicker>
+      </div>
+    </div>
     <div pf-form-group pf-label="{{'Read only'|translate}}">
       <input bs-switch
              ng-model="vm.modalData.read_only"
diff --git a/src/dialog-editor/components/modal-field/field.html b/src/dialog-editor/components/modal-field/field.html
index 7934053d34..3060b70fba 100644
--- a/src/dialog-editor/components/modal-field/field.html
+++ b/src/dialog-editor/components/modal-field/field.html
@@ -76,7 +76,7 @@ <h4 class="modal-title" id="myModalLabel" translate>Edit Field Details</h4>
                                         modal-data="vm.modalData">
     </dialog-editor-modal-field-template>
     <dialog-editor-modal-field-template ng-switch-when="DialogFieldDateControl"
-                                        template="date-time-control.html"
+                                        template="date-control.html"
                                         show-fully-qualified-name="vm.showFullyQualifiedName"
                                         tree-options="vm.treeOptions"
                                         modal-tab-is-set="vm.modalTabIsSet"

From 4750ab0267037675cac999f9db5044c53a61014f Mon Sep 17 00:00:00 2001
From: Roman Blanco <rblanco@redhat.com>
Date: Fri, 29 Mar 2019 12:41:16 +0000
Subject: [PATCH 2/4] Add a button to clear default value

---
 .../modal-field-template/date-control.html       |  1 +
 .../modal-field-template/date-time-control.html  |  1 +
 .../modalFieldTemplateComponent.ts               | 16 +++++++++++++++-
 .../components/modal/modalComponent.ts           |  1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/dialog-editor/components/modal-field-template/date-control.html b/src/dialog-editor/components/modal-field-template/date-control.html
index 6c80617578..6a56264f63 100644
--- a/src/dialog-editor/components/modal-field-template/date-control.html
+++ b/src/dialog-editor/components/modal-field-template/date-control.html
@@ -6,6 +6,7 @@
                pf-datepicker
                date="vm.modalData.default_value">
       </div>
+      <button class="btn btn-default" ng-click="vm.clearDefaultValue()" translate>Clear</button>
     </div>
     <div pf-form-group pf-label="{{'Read only'|translate}}">
       <input bs-switch
diff --git a/src/dialog-editor/components/modal-field-template/date-time-control.html b/src/dialog-editor/components/modal-field-template/date-time-control.html
index 5cae96b724..87595616b4 100644
--- a/src/dialog-editor/components/modal-field-template/date-time-control.html
+++ b/src/dialog-editor/components/modal-field-template/date-time-control.html
@@ -16,6 +16,7 @@
       <div >
         <uib-timepicker ng-model="vm.modalData.default_value"></uib-timepicker>
       </div>
+      <button class="btn btn-default" ng-click="vm.clearDefaultValue()" translate>Clear</button>
     </div>
     <div pf-form-group pf-label="{{'Read only'|translate}}">
       <input bs-switch
diff --git a/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts b/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
index 1b11936040..c5819a2148 100644
--- a/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
+++ b/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
@@ -12,7 +12,9 @@ class ModalFieldController {
   public readonly DROPDOWN_ENTRY_DESCRIPTION: number = 1;
 
   /*@ngInject*/
-  constructor(private $scope, private $element: any) {
+  constructor(private $scope,
+              private $timeout: ng.ITimeoutService,
+              private $element: any) {
     // Rules for Drag&Drop sorting of values in a Dropdown element
     this.sortableOptionsValues = {
       axis: 'y',
@@ -36,6 +38,17 @@ class ModalFieldController {
   public entriesChange() {
     setTimeout(() => this.$element.find('select').selectpicker('refresh'));
   }
+
+  /**
+   * Removes default value by setting `default_value` as
+   * `null`
+   * @memberof ModalFieldController
+   * @function clearDefaultValue
+   */
+  public clearDefaultValue() {
+    this.$timeout(() => this.modalData.default_value = null, 0);
+  }
+
 }
 
 /**
@@ -69,4 +82,5 @@ export default class ModalFieldTemplate {
     showFullyQualifiedName: '<',
     treeOptions: '<',
   };
+
 }
diff --git a/src/dialog-editor/components/modal/modalComponent.ts b/src/dialog-editor/components/modal/modalComponent.ts
index dd413e5112..b323230eb2 100644
--- a/src/dialog-editor/components/modal/modalComponent.ts
+++ b/src/dialog-editor/components/modal/modalComponent.ts
@@ -318,6 +318,7 @@ class ModalController {
       categories="modalCtrl.parent.categories"
       add-entry="modalCtrl.parent.addEntry"
       remove-entry="modalCtrl.parent.removeEntry"
+      clear-default-value="modalCtrl.parent.clearDefaultValue"
       current-category-entries="modalCtrl.parent.currentCategoryEntries"
       resolve-categories="modalCtrl.parent.resolveCategories"
       modal-tab-is-set="modalCtrl.parent.modalTabIsSet"

From e3243363ac9f77d98edb6902a04bd4120d6bab41 Mon Sep 17 00:00:00 2001
From: Roman Blanco <rblanco@redhat.com>
Date: Mon, 9 Sep 2019 12:02:23 +0000
Subject: [PATCH 3/4] Replaced pf-datepicker component for uib-datepicker

---
 src/dialog-editor/components/field/field.html | 37 +++++++++++++++----
 .../modal-field-template/date-control.html    | 19 ++++++++--
 .../date-time-control.html                    | 20 ++++++++--
 .../modalFieldTemplateComponent.ts            | 13 -------
 .../components/modal/modalComponent.ts        |  1 -
 5 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/src/dialog-editor/components/field/field.html b/src/dialog-editor/components/field/field.html
index dfbfa904f1..abb61c2af2 100644
--- a/src/dialog-editor/components/field/field.html
+++ b/src/dialog-editor/components/field/field.html
@@ -24,17 +24,38 @@
            type="checkbox">
 
     <!-- date control -->
-    <input ng-switch-when="DialogFieldDateControl"
-           pf-datepicker options="vm.fieldData.options"
-           ng-disabled="true"
-           date="vm.fieldData.default_value">
-
+    <p class="input-group" ng-switch-when="DialogFieldDateControl">
+      <input uib-datepicker-popup="MM/dd/yyyy"
+             type="text"
+             class="form-control"
+             ng-model="vm.fieldData.default_value"
+             is-open="open"
+             close-text="{{'Close'|translate}}"/>
+      <span class="input-group-btn">
+        <button type="button"
+                class="btn btn-default"
+                ng-click="open = !open">
+          <i class="fa fa-calendar"></i>
+        </button>
+      </span>
+    </p>
     <!-- date time control -->
     <div ng-switch-when="DialogFieldDateTimeControl">
       <div class="col-sm-6 dateTimePadding">
-        <input ng-model="vm.fieldData.default_value"
-               pf-datepicker options="vm.fieldData.dateOptions"
-               date="vm.fieldData.default_value">
+        <p class="input-group">
+          <input uib-datepicker-popup="MM/dd/yyyy"
+                 type="text"
+                 class="form-control"
+                 ng-model="vm.fieldData.default_value"
+                 is-open="open"
+                 close-text="{{'Close'|translate}}"/>
+          <span class="input-group-btn">
+            <button type="button"
+                    class="btn btn-default"
+                    ng-click="open = !open">
+              <i class="fa fa-calendar"></i></button>
+          </span>
+        </p>
       </div>
       <div class="col-sm-6">
         <uib-timepicker ng-model="vm.fieldData.default_value"></uib-timepicker>
diff --git a/src/dialog-editor/components/modal-field-template/date-control.html b/src/dialog-editor/components/modal-field-template/date-control.html
index 6a56264f63..7cee940dab 100644
--- a/src/dialog-editor/components/modal-field-template/date-control.html
+++ b/src/dialog-editor/components/modal-field-template/date-control.html
@@ -2,11 +2,22 @@
   <form class="form-horizontal">
     <div pf-form-group pf-label="{{'Default value'|translate}}">
       <div class="dateTimePadding">
-        <input ng-model="vm.modalData.default_value"
-               pf-datepicker
-               date="vm.modalData.default_value">
+        <p class="input-group">
+          <input uib-datepicker-popup="MM/dd/yyyy"
+                 type="text"
+                 class="form-control"
+                 ng-model="vm.modalData.default_value"
+                 is-open="open"
+                 close-text="{{'Close'|translate}}"/>
+          <span class="input-group-btn">
+            <button type="button"
+                    class="btn btn-default"
+                    ng-click="open = !open">
+              <i class="fa fa-calendar"></i>
+            </button>
+          </span>
+        </p>
       </div>
-      <button class="btn btn-default" ng-click="vm.clearDefaultValue()" translate>Clear</button>
     </div>
     <div pf-form-group pf-label="{{'Read only'|translate}}">
       <input bs-switch
diff --git a/src/dialog-editor/components/modal-field-template/date-time-control.html b/src/dialog-editor/components/modal-field-template/date-time-control.html
index 87595616b4..d55927a160 100644
--- a/src/dialog-editor/components/modal-field-template/date-time-control.html
+++ b/src/dialog-editor/components/modal-field-template/date-time-control.html
@@ -9,14 +9,26 @@
     </div>
     <div pf-form-group pf-label="{{'Default value'|translate}}">
       <div class="dateTimePadding">
-        <input ng-model="vm.modalData.default_value"
-               pf-datepicker
-               date="vm.modalData.default_value">
+        <p class="input-group">
+          <input uib-datepicker-popup="MM/dd/yyyy"
+                 type="text"
+                 class="form-control"
+                 ng-model="vm.modalData.default_value"
+                 is-open="open"
+                 min-date="vm.minDate"
+                 close-text="{{'Close'|translate}}"
+                 id="{{ vm.dialogField.name }}"/>
+          <span class="input-group-btn">
+            <button type="button"
+                    class="btn btn-default"
+                    ng-click="open = !open">
+              <i class="fa fa-calendar"></i></button>
+          </span>
+        </p>
       </div>
       <div >
         <uib-timepicker ng-model="vm.modalData.default_value"></uib-timepicker>
       </div>
-      <button class="btn btn-default" ng-click="vm.clearDefaultValue()" translate>Clear</button>
     </div>
     <div pf-form-group pf-label="{{'Read only'|translate}}">
       <input bs-switch
diff --git a/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts b/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
index c5819a2148..520f421f33 100644
--- a/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
+++ b/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
@@ -13,7 +13,6 @@ class ModalFieldController {
 
   /*@ngInject*/
   constructor(private $scope,
-              private $timeout: ng.ITimeoutService,
               private $element: any) {
     // Rules for Drag&Drop sorting of values in a Dropdown element
     this.sortableOptionsValues = {
@@ -38,17 +37,6 @@ class ModalFieldController {
   public entriesChange() {
     setTimeout(() => this.$element.find('select').selectpicker('refresh'));
   }
-
-  /**
-   * Removes default value by setting `default_value` as
-   * `null`
-   * @memberof ModalFieldController
-   * @function clearDefaultValue
-   */
-  public clearDefaultValue() {
-    this.$timeout(() => this.modalData.default_value = null, 0);
-  }
-
 }
 
 /**
@@ -82,5 +70,4 @@ export default class ModalFieldTemplate {
     showFullyQualifiedName: '<',
     treeOptions: '<',
   };
-
 }
diff --git a/src/dialog-editor/components/modal/modalComponent.ts b/src/dialog-editor/components/modal/modalComponent.ts
index b323230eb2..dd413e5112 100644
--- a/src/dialog-editor/components/modal/modalComponent.ts
+++ b/src/dialog-editor/components/modal/modalComponent.ts
@@ -318,7 +318,6 @@ class ModalController {
       categories="modalCtrl.parent.categories"
       add-entry="modalCtrl.parent.addEntry"
       remove-entry="modalCtrl.parent.removeEntry"
-      clear-default-value="modalCtrl.parent.clearDefaultValue"
       current-category-entries="modalCtrl.parent.currentCategoryEntries"
       resolve-categories="modalCtrl.parent.resolveCategories"
       modal-tab-is-set="modalCtrl.parent.modalTabIsSet"

From e6f5aaef672f4ec78bcf3a1bbe5a8e3897374689 Mon Sep 17 00:00:00 2001
From: Roman Blanco <rblanco@redhat.com>
Date: Wed, 11 Sep 2019 14:46:19 +0000
Subject: [PATCH 4/4] Added missing option to set field as required

---
 .../modal-field-template/date-control.html        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/dialog-editor/components/modal-field-template/date-control.html b/src/dialog-editor/components/modal-field-template/date-control.html
index 7cee940dab..c2d39adad2 100644
--- a/src/dialog-editor/components/modal-field-template/date-control.html
+++ b/src/dialog-editor/components/modal-field-template/date-control.html
@@ -1,5 +1,12 @@
 <div ng-if="vm.modalTabIsSet('options') && !vm.modalData.dynamic">
   <form class="form-horizontal">
+    <div pf-form-group pf-label="{{'Required'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.required"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
     <div pf-form-group pf-label="{{'Default value'|translate}}">
       <div class="dateTimePadding">
         <p class="input-group">
@@ -75,6 +82,14 @@
       </dialog-editor-modal-field-template>
     </div>
 
+    <div pf-form-group pf-label="{{'Required'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.required"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+
     <dialog-editor-tree-selector ng-if="vm.treeOptions.show"
                                  tree-options="vm.treeOptions">
     </dialog-editor-tree-selector>