archive fix & archive/filter toggle removed

Issue-ID: SDC-1383
Change-Id: I38548e5e0b5cce224e0d1324a97f9edce6dc0cfb
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>

3 files changed, 19 insertions, 159 deletions

diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreation.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreation.js
index c6a0702a57..94eef113b1 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreation.js
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreation.js
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 import { connect } from 'react-redux';
-import featureToggle from 'sdc-app/features/featureToggle.js';
-import { featureToggleNames } from 'sdc-app/features/FeaturesConstants.js';
 import LicenseModelCreationActionHelper from './LicenseModelCreationActionHelper.js';
 import LicenseModelCreationView from './LicenseModelCreationView.jsx';
-import LicenseModelCreationViewWithFilter from './LicenseModelCreationViewWithFilter.jsx';
 
 import ValidationHelper from 'sdc-app/common/helpers/ValidationHelper.js';
 import LicenseModelActionHelper from 'sdc-app/onboarding/licenseModel/LicenseModelActionHelper.js';
@@ -31,13 +28,6 @@ import UniqueTypesHelper from 'sdc-app/common/helpers/UniqueTypesHelper.js';
 import i18n from 'nfvo-utils/i18n/i18n.js';
 import { itemType } from 'sdc-app/common/helpers/ItemsHelperConstants.js';
 
-const ToggledLicenseModelCreationView = featureToggle(
-    featureToggleNames.FILTER
-)({
-    OnComp: LicenseModelCreationViewWithFilter,
-    OffComp: LicenseModelCreationView
-});
-
 export const mapStateToProps = ({
     users: { usersList },
     licenseModelList,
@@ -118,5 +108,5 @@ export const mapActionsToProps = dispatch => {
 };
 
 export default connect(mapStateToProps, mapActionsToProps)(
-    ToggledLicenseModelCreationView
+    LicenseModelCreationView
 );
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationView.jsx
index 59c4152213..8c5d966938 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationView.jsx
@@ -1,22 +1,21 @@
-/*!
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+/*
+ * Copyright © 2016-2018 European Support Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 import React from 'react';
 import PropTypes from 'prop-types';
 import i18n from 'nfvo-utils/i18n/i18n.js';
-import Validator from 'nfvo-utils/Validator.js';
 import Input from 'nfvo-components/input/validation/Input.jsx';
 import Form from 'nfvo-components/input/validation/Form.jsx';
 import { LICENSE_MODEL_CREATION_FORM_NAME } from './LicenseModelCreationConstants.js';
@@ -61,13 +60,12 @@ class LicenseModelCreationView extends React.Component {
                             onChange={vendorName =>
                                 onDataChanged(
                                     { vendorName },
-                                    LICENSE_MODEL_CREATION_FORM_NAME,
-                                    {
-                                        vendorName: name =>
-                                            this.validateName(name)
-                                    }
+                                    LICENSE_MODEL_CREATION_FORM_NAME
                                 )
                             }
+                            onBlur={e =>
+                                this.validateIsNameUnique(e.target.value)
+                            }
                             isValid={genericFieldInfo.vendorName.isValid}
                             errorText={genericFieldInfo.vendorName.errorText}
                             type="text"
@@ -102,24 +100,12 @@ class LicenseModelCreationView extends React.Component {
         this.props.onSubmit(licenseModel, usersList);
     }
 
-    validateName(value) {
-        const { data: { id }, VLMNames } = this.props;
-        const isExists = Validator.isItemNameAlreadyExistsInList({
-            itemId: id,
-            itemName: value,
-            list: VLMNames
-        });
-
-        return !isExists
-            ? { isValid: true, errorText: '' }
-            : {
-                  isValid: false,
-                  errorText: i18n(
-                      "License model by the name '" +
-                          value +
-                          "' already exists. License model name must be unique"
-                  )
-              };
+    validateIsNameUnique(value) {
+        this.props.isNameUnique(
+            value,
+            'vendorName',
+            LICENSE_MODEL_CREATION_FORM_NAME
+        );
     }
 
     validate() {
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationViewWithFilter.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationViewWithFilter.jsx
deleted file mode 100644
index 8c5d966938..0000000000
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationViewWithFilter.jsx
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright © 2016-2018 European Support Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import React from 'react';
-import PropTypes from 'prop-types';
-import i18n from 'nfvo-utils/i18n/i18n.js';
-import Input from 'nfvo-components/input/validation/Input.jsx';
-import Form from 'nfvo-components/input/validation/Form.jsx';
-import { LICENSE_MODEL_CREATION_FORM_NAME } from './LicenseModelCreationConstants.js';
-
-const LicenseModelPropType = PropTypes.shape({
-    id: PropTypes.string,
-    vendorName: PropTypes.string,
-    description: PropTypes.string
-});
-
-class LicenseModelCreationView extends React.Component {
-    static propTypes = {
-        data: LicenseModelPropType,
-        VLMNames: PropTypes.object,
-        usersList: PropTypes.array,
-        onDataChanged: PropTypes.func.isRequired,
-        onSubmit: PropTypes.func.isRequired,
-        onValidateForm: PropTypes.func.isRequired,
-        onCancel: PropTypes.func.isRequired
-    };
-
-    render() {
-        let { data = {}, onDataChanged, genericFieldInfo } = this.props;
-        let { vendorName, description } = data;
-        return (
-            <div>
-                {genericFieldInfo && (
-                    <Form
-                        ref="validationForm"
-                        hasButtons={true}
-                        onSubmit={() => this.submit()}
-                        submitButtonText={i18n('Create')}
-                        onReset={() => this.props.onCancel()}
-                        labledButtons={true}
-                        isValid={this.props.isFormValid}
-                        formReady={this.props.formReady}
-                        onValidateForm={() => this.validate()}>
-                        <Input
-                            value={vendorName}
-                            label={i18n('Vendor Name')}
-                            data-test-id="vendor-name"
-                            onChange={vendorName =>
-                                onDataChanged(
-                                    { vendorName },
-                                    LICENSE_MODEL_CREATION_FORM_NAME
-                                )
-                            }
-                            onBlur={e =>
-                                this.validateIsNameUnique(e.target.value)
-                            }
-                            isValid={genericFieldInfo.vendorName.isValid}
-                            errorText={genericFieldInfo.vendorName.errorText}
-                            type="text"
-                            isRequired={true}
-                            className="field-section"
-                        />
-                        <Input
-                            isRequired={true}
-                            value={description}
-                            label={i18n('Description')}
-                            data-test-id="vendor-description"
-                            overlayPos="bottom"
-                            onChange={description =>
-                                onDataChanged(
-                                    { description },
-                                    LICENSE_MODEL_CREATION_FORM_NAME
-                                )
-                            }
-                            isValid={genericFieldInfo.description.isValid}
-                            errorText={genericFieldInfo.description.errorText}
-                            type="textarea"
-                            className="field-section"
-                        />
-                    </Form>
-                )}
-            </div>
-        );
-    }
-
-    submit() {
-        const { data: licenseModel, usersList } = this.props;
-        this.props.onSubmit(licenseModel, usersList);
-    }
-
-    validateIsNameUnique(value) {
-        this.props.isNameUnique(
-            value,
-            'vendorName',
-            LICENSE_MODEL_CREATION_FORM_NAME
-        );
-    }
-
-    validate() {
-        this.props.onValidateForm(LICENSE_MODEL_CREATION_FORM_NAME);
-    }
-}
-
-export default LicenseModelCreationView;