foreman_acd 0.0.2 → 0.2.1

data/db/migrate/20190610202252_create_app_definitions.rb

@@ -6,11 +6,9 @@ class CreateAppDefinitions < ActiveRecord::Migration[5.2]
     create_table :app_definitions do |t|
       t.string :name, :default => '', :null => false, :limit => 255, :unique => true
       t.text :description
-      t.column :hostgroup_id, :integer
-      t.text :parameters
+      t.text :services
       t.timestamps :null => true
     end
-    add_foreign_key :app_definitions, :hostgroups
   end
 
   def down

data/db/migrate/20190625140305_create_app_instances.rb

@@ -7,7 +7,7 @@ class CreateAppInstances < ActiveRecord::Migration[5.2]
       t.string :name, :default => '', :null => false, :limit => 255, :unique => true
       t.column :app_definition_id, :integer, :null => false
       t.text :description
-      t.text :parameters
+      t.text :hosts
       t.timestamps :null => true
     end
     add_foreign_key :app_instances, :app_definitions

data/lib/foreman_acd/plugin.rb

@@ -39,6 +39,16 @@ Foreman::Plugin.register :foreman_acd do
                  :'foreman_acd/api/v2/app_definitions' => [:destroy] },
                :resource_type => 'ForemanAcd::AppDefinition'
 
+    permission :export_app_definitions,
+               { :'foreman_acd/app_definitions' => [:export],
+                 :'foreman_acd/api/v2/app_definitions' => [:export] },
+               :resource_type => 'ForemanAcd::AppDefinition'
+
+    permission :import_app_definitions,
+               { :'foreman_acd/app_definitions' => [:import],
+                 :'foreman_acd/api/v2/app_definitions' => [:import] },
+               :resource_type => 'ForemanAcd::AppDefinition'
+
     permission :create_app_instances,
                { :'foreman_acd/app_instances' => [:new, :create],
                  :'foreman_acd/api/v2/app_instances' => [:create] },
@@ -63,18 +73,25 @@ Foreman::Plugin.register :foreman_acd do
                { :'foreman_acd/app_instances' => [:deploy],
                  :'foreman_acd/api/v2/app_instances' => [:deploy] },
                :resource_type => 'ForemanAcd::AppInstance'
+
+    permission :report_app_instances,
+               { :'foreman_acd/app_instances' => [:report],
+                 :'foreman_acd/api/v2/app_instances' => [:report] },
+               :resource_type => 'ForemanAcd::AppInstance'
   end
 
   # Manager Role
   role 'Application Centric Deployment Manager', [:create_app_definitions,
                                                   :view_app_definitions,
                                                   :edit_app_definitions,
-                                                  :destroy_app_definitions]
+                                                  :export_app_definitions,
+                                                  :import_app_definitions]
 
   # User Role
   role 'Application Centric Deployment User', [:create_app_instances,
                                                :view_app_instances,
                                                :edit_app_instances,
                                                :destroy_app_instances,
-                                               :deploy_app_instances]
+                                               :deploy_app_instances,
+                                               :report_app_instances]
 end

data/lib/foreman_acd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanAcd
-  VERSION = '0.0.2'
+  VERSION = '0.2.1'
 end

data/package.json

@@ -1,66 +1,42 @@
 {
   "name": "foreman_acd",
-  "version": "0.5.0",
+  "version": "0.0.6",
   "description": "foreman application centric deployment",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "jquery": "~2.2.4",
-    "c3": "^0.4.11",
-    "humanize-duration": "^3.20.1",
+    "@theforeman/vendor": "^1.7.0",
     "react-intl": "^2.8.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^5.0.1",
-    "@storybook/addon-knobs": "^5.0.1",
-    "@storybook/react": "^5.0.1",
-    "@theforeman/vendor-dev": "^1.4.0",
-    "classnames": "^2.2.5",
+    "@theforeman/vendor-dev": "^1.7.0",
     "babel-eslint": "^8.2.1",
     "babel-jest": "^23.6.0",
-    "babel-loader": "^7.1.1",
     "babel-plugin-dynamic-import-node": "^2.0.0",
-    "babel-plugin-module-resolver": "^3.2.0",
-    "babel-plugin-lodash": "^3.3.2",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.5.0",
+    "babel-preset-react": "^6.24.1",
     "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.4.0",
-    "enzyme-to-json": "^3.2.1",
+    "enzyme-adapter-react-16": "^1.7.0",
+    "enzyme-to-json": "^3.3.5",
     "eslint": "^4.18.1",
-    "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jest": "^21.2.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-patternfly-react": "^0.2.1",
     "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
     "lodash": "^4.17.11",
+    "jest": "^23.6.0",
     "jest-cli": "^23.6.0",
     "jest-prop-type-error": "^1.1.0",
-    "patternfly": "^3.58.0",
-    "patternfly-react": "^2.31.0",
-    "prettier": "^1.16.4",
-    "prop-types": "^15.6.2",
-    "react": "^16.8.1",
-    "react-redux": "^5.0.7",
     "react-redux-test-utils": "^0.1.1",
-    "react-bootstrap": "^0.32.1",
-    "react-dom": "^16.6.3",
-    "react-json-tree": "^0.11.0",
-    "redux": "^3.7.2",
-    "redux-thunk": "^2.3.0",
-    "reselect": "^3.0.1",
-    "seamless-immutable": "^7.1.3",
     "sortabular": "~1.5.1",
-    "table-resolver": "~3.3.0"
+    "table-resolver": "~3.2.0"
   },
   "scripts": {
     "test": "node node_modules/.bin/jest --no-cache"

data/test/controllers/app_definitions_controller_test.rb

@@ -4,6 +4,7 @@ require 'test_plugin_helper'
 require 'nokogiri'
 
 module ForemanAcd
+  # Application Definitions Controller tests
   class AppDefinitionsControllerTest < ActionController::TestCase
     setup do
       as_admin { FactoryBot.create(:app_definition) }

data/test/controllers/app_instances_controller_test.rb

@@ -4,6 +4,7 @@ require 'test_plugin_helper'
 require 'nokogiri'
 
 module ForemanAcd
+  # Application Instances Controller tests
   class AppInstancesControllerTest < ActionController::TestCase
     setup do
       as_admin { FactoryBot.create(:app_instance) }

data/test/controllers/ui_acd_controller_test.rb

@@ -3,6 +3,16 @@
 require 'test_plugin_helper'
 require 'nokogiri'
 
+module Katello
+  # Mock Katello::KTEnvironment so that tests run without Katello
+  class KTEnvironment
+    def self.all
+      [{ :id => 1, :name => 'Library' }, { :id => 2, :name => 'Test' }]
+    end
+  end
+end
+
+# UI Controller tests
 class UiAcdControllerTest < ActionController::TestCase
   test 'get app json' do
     app_def = FactoryBot.create(:app_definition)

data/test/models/app_definition_test.rb

@@ -3,6 +3,7 @@
 require 'test_plugin_helper'
 
 module ForemanAcd
+  # Application Definition Model tests
   class AppDefinitionTest < ActiveSupport::TestCase
     should validate_presence_of(:name)
     should validate_uniqueness_of(:name)

data/test/models/app_instance_test.rb

@@ -3,6 +3,7 @@
 require 'test_plugin_helper'
 
 module ForemanAcd
+  # Application Instance Model tests
   class AppInstanceTest < ActiveSupport::TestCase
     should validate_presence_of(:name)
     should belong_to(:app_definition)

data/webpack/components/ApplicationDefinition/ApplicationDefinition.js

@@ -0,0 +1,261 @@
+import React, { useState } from 'react'
+import PropTypes from 'prop-types';
+import {
+  Icon,
+  Button,
+} from 'patternfly-react';
+import * as resolve from 'table-resolver';
+import ForemanModal from 'foremanReact/components/ForemanModal';
+import Select from 'foremanReact/components/common/forms/Select';
+import ParameterSelection from '../ParameterSelection';
+import AddTableEntry from '../common/AddTableEntry';
+import DeleteTableEntry from '../common/DeleteTableEntry';
+import RailsData from '../common/RailsData'
+
+import {
+  Table,
+  FormControl,
+  inlineEditFormatterFactory,
+} from 'patternfly-react';
+
+class ApplicationDefinition extends React.Component {
+
+  constructor(props) {
+    super(props);
+  }
+
+  isEditing({rowData}) {
+    return (rowData.backup !== undefined);
+  }
+
+  componentDidMount() {
+    const {
+      data: { services, hostgroups },
+      initApplicationDefinition,
+      addApplicationDefinitionService,
+      deleteApplicationDefinitionService,
+      activateEditApplicationDefinitionService,
+      changeEditApplicationDefinitionService,
+      openParameterSelectionModal,
+      closeParameterSelectionModal,
+    } = this.props;
+
+    const inlineEditButtonsFormatter = inlineEditFormatterFactory({
+      isEditing: additionalData => this.props.editMode,
+      renderValue: (value, additionalData) => (
+        <td style={{ padding: '2px' }}>
+          <Button
+            bsStyle="default"
+            onClick={() => activateEditApplicationDefinitionService(additionalData)}
+          >
+            <Icon type="pf" name="edit" />
+          </Button>
+          <Button
+            bsStyle="default"
+            onClick={() => openParameterSelectionModal(additionalData)}
+          >
+            <Icon type="pf" name="settings" />
+          </Button>
+          <DeleteTableEntry
+            hidden={false}
+            disabled={false}
+            onDeleteTableEntry={deleteApplicationDefinitionService}
+            additionalData={additionalData}
+          />
+        </td>
+      ),
+      renderEdit: (value, additionalData) => (
+        <td style={{ padding: '2px' }}>
+          <Button bsStyle="default" disabled>
+            <Icon type="pf" name="edit" />
+          </Button>
+          <Button bsStyle="default" disabled>
+            <Icon type="pf" name="settings" />
+          </Button>
+          <DeleteTableEntry
+            hidden={false}
+            disabled={true}
+            onDeleteTableEntry={deleteApplicationDefinitionService}
+            additionalData={additionalData}
+          />
+        </td>
+      )
+    });
+    this.inlineEditButtonsFormatter = inlineEditButtonsFormatter;
+
+    const headerFormatter = value => <Table.Heading>{value}</Table.Heading>;
+    this.headerFormatter = headerFormatter;
+
+    const inlineEditFormatterImpl = {
+      renderValue: (value, additionalData) => (
+        <td>
+          <span className="static">{value}</span>
+        </td>
+      ),
+      renderEditText: (value, additionalData, subtype='text') => (
+        <td className="editing">
+          <FormControl
+            type={subtype}
+            defaultValue={value}
+            onBlur={e => changeEditApplicationDefinitionService(e.target.value, additionalData) }
+          />
+        </td>
+      ),
+      renderEditSelect: (value, additionalData, options) => (
+        <td className="editing">
+          <Select
+            value={value.toString()}
+            onChange={e => changeEditApplicationDefinitionService(e.target.value, additionalData) }
+            options={options}
+            allowClear
+            key="key"
+          />
+        </td>
+      )
+    };
+
+    const inlineEditFormatter = inlineEditFormatterFactory({
+      isEditing: additionalData => this.isEditing(additionalData),
+      renderValue: (value, additionalData) => {
+        let prettyValue = value;
+        if (additionalData.property == 'hostgroup') {
+          prettyValue = hostgroups[value];
+        }
+        return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)
+      },
+      renderEdit: (value, additionalData) => {
+        if (additionalData.property == 'hostgroup') {
+          if (additionalData.rowData.newEntry === true) {
+            return inlineEditFormatterImpl.renderEditSelect(value, additionalData, hostgroups);
+          }
+          return inlineEditFormatterImpl.renderValue(hostgroups[value], additionalData)
+        }
+        return inlineEditFormatterImpl.renderEditText(value, additionalData);
+      }
+    });
+    this.inlineEditFormatter = inlineEditFormatter;
+
+    initApplicationDefinition(
+      services,
+      this.headerFormatter,
+      this.inlineEditFormatter,
+      this.inlineEditButtonsFormatter,
+    );
+  };
+
+  render() {
+    const {
+      data: { organization, location, loadForemanDataUrl },
+      services,
+      columns,
+      addApplicationDefinitionService,
+      confirmEditApplicationDefinitionService,
+      cancelEditApplicationDefinitionService,
+      openParameterSelectionModal,
+      closeParameterSelectionModal,
+      ParameterSelectionModal,
+    } = this.props;
+
+    return (
+      <span>
+        <div className="form-group">
+          <AddTableEntry
+             hidden={ false }
+             disabled={ this.props.editMode }
+             onAddTableEntry={ addApplicationDefinitionService }
+          />
+          <Table.PfProvider
+            striped
+            bordered
+            hover
+            dataTable
+            inlineEdit
+            columns={columns}
+            components={{
+              body: {
+                row: Table.InlineEditRow,
+                cell: cellProps => cellProps.children
+              }
+            }}
+          >
+            <Table.Header headerRows={resolve.headerRows({ columns })} />
+            <Table.Body
+              rows={services}
+              rowKey="id"
+              onRow={(rowData, { rowIndex }) => ({
+                role: 'row',
+                isEditing: () => this.isEditing({ rowData }),
+                onCancel: () => cancelEditApplicationDefinitionService({ rowData, rowIndex }),
+                onConfirm: () => confirmEditApplicationDefinitionService({ rowData, rowIndex }),
+                last: rowIndex === services.length - 1
+              })}
+            />
+          </Table.PfProvider>
+          <AddTableEntry
+             hidden={ false }
+             disabled={ this.props.editMode }
+             onAddTableEntry={ addApplicationDefinitionService }
+          />
+        </div>
+        <div>
+          <ForemanModal
+            id="AppDefinitionParamSelection"
+            dialogClassName="param_selection_modal"
+            title="Parameter definition for Application Definition"
+          >
+            <ForemanModal.Header closeButton={false}>
+              Parameter definition
+            </ForemanModal.Header>
+            {this.props.parametersData ? (
+              <ParameterSelection
+                location={ location }
+                organization={ organization }
+                loadForemanDataUrl= { loadForemanDataUrl }
+                data={ this.props.parametersData }
+              />
+            ) : (<span>Empty</span>)
+            }
+            <ForemanModal.Footer>
+              <div>
+                <Button bsStyle="primary" onClick={() => closeParameterSelectionModal({ mode: 'save' })}>Save</Button>
+                <Button bsStyle="default" onClick={() => closeParameterSelectionModal({ mode: 'cancel' })}>Cancel</Button>
+              </div>
+            </ForemanModal.Footer>
+          </ForemanModal>
+        </div>
+        <RailsData
+          key='applications_definition'
+          view='app_definition'
+          parameter='services'
+          value={JSON.stringify(this.props.services)}
+        />
+      </span>
+    )};
+}
+
+ApplicationDefinition.defaultProps = {
+  error: {},
+  editMode: false,
+  services: [],
+  parametersData: {},
+  columns: [],
+  editParamsOfRowId: null,
+}
+
+ApplicationDefinition.propTypes = {
+  initApplicationDefinition: PropTypes.func,
+  editMode: PropTypes.bool.isRequired,
+  services: PropTypes.array,
+  columns: PropTypes.array,
+  addApplicationDefinitionService: PropTypes.func,
+  deleteApplicationDefinitionService: PropTypes.func,
+  activateEditApplicationDefinitionService: PropTypes.func,
+  confirmEditApplicationDefinitionService: PropTypes.func,
+  cancelEditApplicationDefinitionService: PropTypes.func,
+  changeEditApplicationDefinitionService: PropTypes.func,
+  openParameterSelectionModal: PropTypes.func,
+  closeParameterSelectionModal: PropTypes.func,
+  parametersData: PropTypes.object,
+};
+
+export default ApplicationDefinition;