From 4a0f3b8873fa8497f212d63409dcc68419b75cb3 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris@tirado.com>
Date: Tue, 7 Aug 2018 12:49:21 -0700
Subject: [PATCH] UI-3135: Remove `service` property when not service plan is
 selected (#77)

* Only set user service plan with valid IDs on creation

* Remove `services` from document when no plan is selected
---
 submodules/users/users.js            | 4 +++-
 submodules/users/views/creation.html | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 422389d5..a0d29d30 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -3067,6 +3067,8 @@ define(function(require) {
 						account_id: monster.config.resellerId,
 						overrides: {}
 					};
+				} else {
+					delete userData.service;
 				}
 			}
 
@@ -3571,7 +3573,7 @@ define(function(require) {
 				};
 
 			if (formattedData.user.extra) {
-				if (formattedData.user.extra.hasOwnProperty('licensedRole')) {
+				if (formattedData.user.extra.hasOwnProperty('licensedRole') && formattedData.user.extra.licensedRole !== 'none') {
 					formattedData.user.service = formattedData.user.service || {};
 					formattedData.user.service.plans = {};
 					formattedData.user.service.plans[formattedData.user.extra.licensedRole] = {
diff --git a/submodules/users/views/creation.html b/submodules/users/views/creation.html
index f894fc31..34751bd9 100644
--- a/submodules/users/views/creation.html
+++ b/submodules/users/views/creation.html
@@ -30,7 +30,9 @@
 				<label for="licensed_role" class="control-label"><i class="fa fa-user"></i></label>
 				<div class="controls">
 					<select id="licensed_role" name="user.extra.licensedRole" data-placeholder="{{ i18n.users.licensedUserRoles.selectPlaceholder }}">
-						<option value></option>
+						<option value="none">
+							{{ i18n.users.licensedUserRoles.licensedUserRoles.none }}
+						</option>
 						{{#each licensedUserRoles}}
 							<option value="{{id}}">{{name}}</option>
 						{{/each}}