Subscription GUI: added AND & ARE between requirements and conditions (#69)

* Added AND & ARE between conditions and requirements

Author: saif-ericsson

src/functionaltest/java/com/ericsson/ei/frontend/SubscriptionHandlingFunctionality.java

@@ -204,29 +204,31 @@ public void testSubscription() throws Exception {
         String requirementFieldID = "requirementID";
 
         subscriptionPage.selectDropdown(selectAuthID, authValue);
-
         subscriptionPage.addFieldValue(userNameID, userName);
         subscriptionPage.addFieldValue(tokenID, token);
         String kvID = "kvID";
-        subscriptionPage.clickKVbtn(kvID);
+        subscriptionPage.clickKVbtn(kvID);        
         assert (new WebDriverWait(driver, 10).until((webdriver) -> driver.getPageSource().contains("Authorization")));
-
-        // Test "Repeat" dropdown: Select repeat value as "true" and then verify
-        // the selected value
+        
+        // Test "Repeat" dropdown: Select repeat value as "true" and then verify the selected value
         subscriptionPage.selectDropdown(selectRepeatID, repeatValue);
         assert (new WebDriverWait(driver, 10)
-                .until((webdriver) -> (subscriptionPage.getValueFromSelectRepeat().equals(repeatValue))));
-
-        // Test "Add Condition" button: click add condition button and check
-        // that it adds an additional "condition" field
+              .until((webdriver) -> (subscriptionPage.getValueFromSelectRepeat().equals(repeatValue))));
+        
+        // Test "Add Condition" button: click add condition button and check that it adds an additional "condition" field
         subscriptionPage.clickAddConditionBtn();
         assertEquals(2, subscriptionPage.countElements(conditionFieldID));
-
-        // Test "Add Requirement" button: click the button and assert that it
-        // adds an additional "requirement" field
+        
+        // Test "Add Requirement" button: click the button and assert that it adds an additional "requirement" field
         subscriptionPage.clickAddRequirementBtn();
         assertEquals(2, subscriptionPage.countElements(requirementFieldID));
 
+        // Test "Repeat" dropdown: Select repeat value as "true" and then verify
+        // the selected value
+        subscriptionPage.selectDropdown(selectRepeatID, repeatValue);
+        assert (new WebDriverWait(driver, 10)
+                .until((webdriver) -> (subscriptionPage.getValueFromSelectRepeat().equals(repeatValue))));
+
         // Test save subscription form: add subscription name
         // as "selenium_test_subscription" and then click "save" button
         // verification that subscription is added in the datatable (and is
@@ -235,6 +237,5 @@ public void testSubscription() throws Exception {
         subscriptionPage.addFieldValue(subNameID, subName);
         subscriptionPage.clickFormsSaveBtn(responseSave);
         assert (subscriptionPage.textExistsInTable("Selenium_test_subscription"));
-
     }
 }

src/main/resources/templates/subscription.html

@@ -249,16 +249,23 @@ <h3 class="modal-title text-center" id="formHeader">Subscription Form</h3>
 
                             <!-- ko foreach:   { data: requirements, as: 'requirements_item' } -->
                             <div class="pl-0 ml-0">
+                                <!-- ko if: $index() !== 0 -->
+                                <h5>OR</h5>
+                                <!-- /ko -->
                                 <img data-toggle="tooltip" data-placement="top" width="16" alt="Information" src="assets/images/information.png" title="Info: 'AND' is used between Conditions in Requirement groups, and 'OR' is used between Requirement groups"
                                 />
                             </div>
-                            <div class="p-1 border border-primary form-group">
+                            <div class="p-1 border border-primary form-group">                            
                                 <label class="control-label font-weight-bold">Requirement</label>
                                 <div id="requirementID">
 
                                     <!-- ko foreach: requirements_item.conditions -->
                                     <div id="conditionID">
-                                        <label class="control-label font-weight-bold">Condition</label>
+										<!-- ko if: $index() !== 0 -->
+										<h5 style="display:inline">AND</h5>
+										<!-- /ko -->
+
+										<label style="display:inline" class="control-label font-weight-bold">Condition</label>
                                         <textarea data-toggle="tooltip" title="Write a Subscription Rule(JmePath)" data-bind="textInput:$data.jmespath()" name="jmespath"
                                             placeholder="jmespath" class="form-control" type="text"></textarea>
                                         <div class="pt-1 d-flex justify-content-end">