1 files changed, 23 insertions, 28 deletions

diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationActionHelper.js
index c2a0409bd2..51f5b7f276 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/creation/LicenseModelCreationActionHelper.js
@@ -1,27 +1,24 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ *
  * 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.
- * ============LICENSE_END=========================================================
+ * 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 RestAPIUtil from 'nfvo-utils/RestAPIUtil.js';
 import Configuration from 'sdc-app/config/Configuration.js';
-import LicenseModelActionHelper from 'sdc-app/onboarding/licenseModel/LicenseModelActionHelper.js';
 import {actionTypes} from './LicenseModelCreationConstants.js';
+import {modalContentMapper} from 'sdc-app/common/modal/ModalContentMapper.js';
+import {actionTypes as modalActionTypes} from 'nfvo-components/modal/GlobalModalConstants.js';
+import i18n from 'nfvo-utils/i18n/i18n.js';
 
 function baseUrl() {
 	const restPrefix = Configuration.get('restPrefix');
@@ -29,7 +26,7 @@ function baseUrl() {
 }
 
 function createLicenseModel(licenseModel) {
-	return RestAPIUtil.create(baseUrl(), {
+	return RestAPIUtil.post(baseUrl(), {
 		vendorName: licenseModel.vendorName,
 		description: licenseModel.description,
 		iconRef: 'icon'
@@ -43,30 +40,28 @@ export default {
 		dispatch({
 			type: actionTypes.OPEN
 		});
+
+		dispatch({
+			type: modalActionTypes.GLOBAL_MODAL_SHOW,
+			data: {
+				modalComponentName: modalContentMapper.LICENSE_MODEL_CREATION,
+				title: i18n('New License Model')
+			}
+		});
 	},
 
 	close(dispatch){
 		dispatch({
 			type: actionTypes.CLOSE
 		});
-	},
 
-	dataChanged(dispatch, {deltaData}){
 		dispatch({
-			type: actionTypes.DATA_CHANGED,
-			deltaData
+			type: modalActionTypes.GLOBAL_MODAL_CLOSE
 		});
 	},
 
 	createLicenseModel(dispatch, {licenseModel}){
-		return createLicenseModel(licenseModel).then(response => {
-			LicenseModelActionHelper.addLicenseModel(dispatch, {
-				licenseModel: {
-					...licenseModel,
-					id: response.value
-				}
-			});
-			return response.value;
-		});
+		return createLicenseModel(licenseModel);
 	}
+
 };