foreman_acd 0.7.0 → 0.9.0

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstanceReducer.test.js

@@ -5,6 +5,7 @@ import {
   successState,
   editState,
   initApplicationInstancePayload,
+  closeAlertModalPayload,
   addHostPayload,
   deleteHostPayload,
   activateEditHostPayload,
@@ -18,6 +19,7 @@ import {
 
 import {
   APPLICATION_INSTANCE_INIT,
+  APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
@@ -27,10 +29,13 @@ import {
   APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
   APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
   APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
+  APPLICATION_INSTANCE_HOST_EDIT_ERROR,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
   APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from '../ApplicationInstanceConstants';
 
@@ -50,6 +55,13 @@ const fixtures = {
       payload: initApplicationInstancePayload,
     },
   },
+  'should close alert modal': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
+      payload: closeAlertModalPayload,
+    },
+  },
   'should add a host': {
     state: successState,
     action: {

data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstance.test.js.snap

@@ -2,8 +2,32 @@
 
 exports[`ApplicationInstance should render application instance 1`] = `
 <span>
+  <MessageDialog
+    accessibleDescription=""
+    accessibleName=""
+    className=""
+    enforceFocus={true}
+    footer={null}
+    icon={
+      <Icon
+        name="error-circle-o"
+        type="pf"
+      />
+    }
+    onHide={[Function]}
+    primaryAction={[Function]}
+    primaryActionButtonBsStyle="danger"
+    primaryActionButtonContent="OK"
+    primaryContent=""
+    secondaryAction={[Function]}
+    secondaryActionButtonBsStyle="default"
+    secondaryActionButtonContent={null}
+    secondaryContent={null}
+    show={false}
+    title=""
+  />
   <div
-    class="service-counter"
+    className="service-counter"
   >
     <ServiceCounter
       hostList={Array []}
@@ -19,12 +43,13 @@ exports[`ApplicationInstance should render application instance 1`] = `
         }
       }
       editable={false}
+      hidden={false}
       label="Application Definition"
       onChange={[Function]}
       selectValue=""
       viewText=""
     />
-    <p
+    <div
       style={
         Object {
           "paddingTop": 25,
@@ -34,7 +59,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
       <pre>
         App Definition can't be blank
       </pre>
-    </p>
+    </div>
   </div>
   <div
     className="form-group"
@@ -75,6 +100,28 @@ exports[`ApplicationInstance should render application instance 1`] = `
       hidden={false}
       onAddTableEntry={[Function]}
     />
+    <span
+      style={
+        Object {
+          "marginLeft": 10,
+        }
+      }
+    >
+      <Button
+        active={false}
+        block={false}
+        bsClass="btn"
+        bsStyle="default"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <Icon
+          name="server"
+          title="Add existing hosts"
+          type="pf"
+        />
+      </Button>
+    </span>
     <span
       style={
         Object {
@@ -88,7 +135,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
         block={false}
         bsClass="btn"
         bsStyle="default"
-        disabled={false}
+        disabled={true}
         onClick={[Function]}
         style={
           Object {
@@ -97,7 +144,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
         }
       >
         <span
-          title="change ansible variables for 'all'"
+          title="Change ansible variables for 'all'"
         >
           A
         </span>
@@ -192,15 +239,58 @@ exports[`ApplicationInstance should render application instance 1`] = `
       </Footer>
     </ForemanModal>
   </div>
+  <div>
+    <ForemanModal
+      dialogClassName="add_existing_hosts_modal"
+      id="AppInstanceAddExistingHosts"
+      title="Add existing hosts to an Application Instance"
+    >
+      <Header
+        closeButton={false}
+      >
+        Existing hosts selection
+      </Header>
+      <Connect(ExistingHostSelection)
+        allHosts={Array []}
+        location="Default Location"
+        organization="Default Organization"
+        services={Array []}
+      />
+      <Footer>
+        <div>
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="primary"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Save
+          </Button>
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="default"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Footer>
+    </ForemanModal>
+  </div>
   <div />
   <RailsData
-    key="applications_instance"
+    key="application_instance_hosts_data"
     parameter="hosts"
     value="[]"
     view="app_instance"
   />
   <RailsData
-    key="applications_instance"
+    key="application_instance_ansible_data"
     parameter="ansible_vars_all"
     value="[]"
     view="app_instance"

data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstanceReducer.test.js.snap

@@ -469,6 +469,7 @@ Object {
         "foremanParameters": Array [],
         "hostname": "",
         "id": 5,
+        "isExistingHost": false,
         "newEntry": true,
         "service": "",
       },
@@ -476,6 +477,7 @@ Object {
       "foremanParameters": Array [],
       "hostname": "",
       "id": 5,
+      "isExistingHost": false,
       "newEntry": true,
       "service": "",
     },
@@ -1114,6 +1116,275 @@ Object {
 }
 `;
 
+exports[`ApplicationInstanceReducer should close alert modal 1`] = `
+Object {
+  "alertModalText": "",
+  "alertModalTitle": "",
+  "ansibleVarsAll": Array [
+    Object {
+      "id": 0,
+      "name": "repository",
+      "value": "https://github.com/bennojoy/mywebapp.git",
+    },
+  ],
+  "appDefinition": Object {
+    "ansible_vars_all": "[{\\"id\\":0,\\"name\\":\\"repository\\",\\"value\\":\\"https://github.com/bennojoy/mywebapp.git\\"}]",
+    "created_at": "2021-03-11 12:51:34 +0100",
+    "description": "",
+    "id": 1,
+    "location_ids": Array [
+      2,
+    ],
+    "name": "LAMP",
+    "organization_ids": Array [
+      1,
+    ],
+    "services": "[{\\"id\\":1,\\"name\\":\\"web\\",\\"description\\":\\"\\",\\"hostgroup\\":\\"1\\",\\"ansibleGroup\\":\\"webservers\\",\\"minCount\\":\\"2\\",\\"maxCount\\":\\"\\",\\"foremanParameters\\":[{\\"id\\":1,\\"locked\\":false,\\"name\\":\\"CP\\",\\"description\\":\\"\\",\\"type\\":\\"computeprofile\\",\\"value\\":\\"1\\"},{\\"id\\":2,\\"locked\\":true,\\"name\\":\\"LE\\",\\"description\\":\\"\\",\\"type\\":\\"lifecycleenv\\",\\"value\\":\\"1\\"}],\\"ansibleParameters\\":[{\\"id\\":0,\\"name\\":\\"dummy_var\\",\\"value\\":\\"0\\"}]},{\\"id\\":2,\\"name\\":\\"db\\",\\"description\\":\\"\\",\\"hostgroup\\":\\"1\\",\\"ansibleGroup\\":\\"dbservers\\",\\"minCount\\":\\"1\\",\\"maxCount\\":\\"\\",\\"foremanParameters\\":[],\\"ansibleParameters\\":[{\\"id\\":0,\\"name\\":\\"mysqlservice\\",\\"value\\":\\"mysqld\\"},{\\"id\\":1,\\"name\\":\\"mysql_port\\",\\"value\\":\\"3306\\",\\"locked\\":true},{\\"id\\":2,\\"name\\":\\"dbuser\\",\\"value\\":\\"webapp\\"},{\\"id\\":3,\\"name\\":\\"dbname\\",\\"value\\":\\"ANSAP01\\"},{\\"id\\":4,\\"name\\":\\"upassword\\",\\"value\\":\\"Bond@007\\"},{\\"id\\":5,\\"name\\":\\"masterpassword\\",\\"value\\":\\"MySQL@007\\"}]}]",
+    "updated_at": "2021-03-13 00:06:12 +0100",
+  },
+  "columns": Array [
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Hostname",
+        "props": Object {
+          "index": 0,
+          "style": Object {
+            "width": "30%",
+          },
+        },
+      },
+      "property": "hostname",
+    },
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Description",
+        "props": Object {
+          "index": 1,
+          "style": Object {
+            "width": "30%",
+          },
+        },
+      },
+      "property": "description",
+    },
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Service",
+        "props": Object {
+          "index": 2,
+          "style": Object {
+            "width": "20%",
+          },
+        },
+      },
+      "property": "service",
+    },
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Actions",
+        "props": Object {
+          "index": 4,
+          "style": Object {
+            "width": "20%",
+          },
+        },
+      },
+      "property": "actions",
+    },
+  ],
+  "error": Object {
+    "errorMsg": "",
+    "status": "",
+    "statusText": "",
+  },
+  "hosts": Array [
+    Object {
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "mysqlservice",
+          "value": "mysqld",
+        },
+        Object {
+          "id": 1,
+          "name": "mysql_port",
+          "value": "3306",
+        },
+        Object {
+          "id": 2,
+          "name": "dbuser",
+          "value": "webapp",
+        },
+        Object {
+          "id": 3,
+          "name": "dbname",
+          "value": "ANSAP01",
+        },
+        Object {
+          "id": 4,
+          "name": "upassword",
+          "value": "Bond@007",
+        },
+        Object {
+          "id": 5,
+          "name": "masterpassword",
+          "value": "MySQL@007",
+        },
+      ],
+      "description": "",
+      "foremanParameters": Array [],
+      "hostname": "great-web-app-db-1",
+      "id": 4,
+      "service": "2",
+    },
+    Object {
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "dummy_var",
+          "value": "0",
+        },
+      ],
+      "description": "",
+      "foremanParameters": Array [],
+      "hostname": "great-web-app-web-1",
+      "id": 1,
+      "service": "1",
+    },
+    Object {
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "dummy_var",
+          "value": "0",
+        },
+      ],
+      "description": "",
+      "foremanParameters": Array [],
+      "hostname": "great-web-app-web-2",
+      "id": 2,
+      "service": "1",
+    },
+  ],
+  "loading": false,
+  "name": false,
+  "services": Array [
+    Object {
+      "ansibleGroup": "webservers",
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "dummy_var",
+          "value": "0",
+        },
+      ],
+      "currentCount": 2,
+      "description": "",
+      "foremanParameters": Array [
+        Object {
+          "description": "",
+          "id": 1,
+          "locked": false,
+          "name": "CP",
+          "type": "computeprofile",
+          "value": "1",
+        },
+        Object {
+          "description": "",
+          "id": 2,
+          "locked": true,
+          "name": "LE",
+          "type": "lifecycleenv",
+          "value": "1",
+        },
+      ],
+      "hostgroup": "1",
+      "id": 1,
+      "maxCount": "",
+      "minCount": "2",
+      "name": "web",
+    },
+    Object {
+      "ansibleGroup": "dbservers",
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "mysqlservice",
+          "value": "mysqld",
+        },
+        Object {
+          "id": 1,
+          "locked": true,
+          "name": "mysql_port",
+          "value": "3306",
+        },
+        Object {
+          "id": 2,
+          "name": "dbuser",
+          "value": "webapp",
+        },
+        Object {
+          "id": 3,
+          "name": "dbname",
+          "value": "ANSAP01",
+        },
+        Object {
+          "id": 4,
+          "name": "upassword",
+          "value": "Bond@007",
+        },
+        Object {
+          "id": 5,
+          "name": "masterpassword",
+          "value": "MySQL@007",
+        },
+      ],
+      "currentCount": 1,
+      "description": "",
+      "foremanParameters": Array [],
+      "hostgroup": "1",
+      "id": 2,
+      "maxCount": "",
+      "minCount": "1",
+      "name": "db",
+    },
+  ],
+  "showAlertModal": false,
+}
+`;
+
 exports[`ApplicationInstanceReducer should confirm edit host 1`] = `
 Object {
   "ansibleVarsAll": Array [

data/webpack/components/ApplicationInstance/components/AppDefinitionSelector.js

@@ -18,6 +18,7 @@ const AppDefinitionSelector= ({
       <label className="col-md-2 control-label">{label}</label>
       <div className="col-md-4">
         <ExtSelect
+          hidden={hidden}
           editable={editable}
           viewText={viewText}
           selectValue={selectValue}

data/webpack/components/ApplicationInstance/components/ServiceCounter.js

@@ -15,7 +15,7 @@ const ServiceCounter= ({
 
   return (
     <div>
-      <label class="service-counter-title">{title}</label>
+      <label className="service-counter-title">{title}</label>
     {Object.keys(services).map(key => (
       <Service
         key={services[key].id}

data/webpack/components/ApplicationInstance/index.js

@@ -6,6 +6,9 @@ import ApplicationInstance from './ApplicationInstance';
 import * as ApplicationInstanceActions from './ApplicationInstanceActions';
 
 import {
+  selectShowAlertModal,
+  selectAlertModalText,
+  selectAlertModalTitle,
   selectEditMode,
   selectAppDefinition,
   selectHosts,
@@ -17,6 +20,9 @@ import {
 } from './ApplicationInstanceSelectors';
 
 const mapStateToProps = state => ({
+  showAlertModal: selectShowAlertModal(state),
+  alertModalText: selectAlertModalText(state),
+  alertModalTitle: selectAlertModalTitle(state),
   editMode: selectEditMode(state),
   appDefinition: selectAppDefinition(state),
   hosts: selectHosts(state),