pritify

openshift · May 20, 2020 · 36265a9 · 36265a9
1 parent 1229e07
commit 36265a9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/...ugin/src/components/create-vm-wizard/redux/initial-state/vm-settings-tab-initial-state.ts b/...ugin/src/components/create-vm-wizard/redux/initial-state/vm-settings-tab-initial-state.ts
@@ -53,8 +53,8 @@ export const getInitialVmSettings = (data: CommonData): VMSettings => {
       isRequired: asRequired(true),
     },
     [VMSettingsField.MOUNT_WINDOWS_GUEST_TOOLS]: {
-      value: true,
-      isHidden: true,
+      value: false,
+      isHidden: asHidden(true),
     },
     [VMSettingsField.FLAVOR]: {
       isRequired: asRequired(true),

diff --git a/...plugin/src/components/create-vm-wizard/redux/state-update/vm-settings-tab-state-update.ts b/...plugin/src/components/create-vm-wizard/redux/state-update/vm-settings-tab-state-update.ts
@@ -147,35 +147,39 @@ const flavorUpdater = ({ id, prevState, dispatch, getState }: UpdateOptions) =>
 
 const osUpdater = ({ id, prevState, dispatch, getState }: UpdateOptions) => {
   const state = getState();
-  if (
-    !hasVMSettingsValueChanged(prevState, state, id, VMSettingsField.OPERATING_SYSTEM) &&
-    !hasVMSettingsValueChanged(prevState, state, id, VMSettingsField.MOUNT_WINDOWS_GUEST_TOOLS)
-  ) {
+  if (!hasVMSettingsValueChanged(prevState, state, id, VMSettingsField.OPERATING_SYSTEM)) {
     return;
   }
   const os = iGetVmSettingValue(state, id, VMSettingsField.OPERATING_SYSTEM);
-  const mountWindowsGuestTools = iGetVmSettingValue(
-    state,
-    id,
-    VMSettingsField.MOUNT_WINDOWS_GUEST_TOOLS,
-  );
   const isWindows = os && os.startsWith('win');
-  const windowsTools = getStorages(state, id).find(
-    (storage) => !!isWinToolsImage(getVolumeContainerImage(storage.volume)),
-  );
 
   dispatch(
     vmWizardInternalActions[InternalActionType.UpdateVmSettingsField](
       id,
       VMSettingsField.MOUNT_WINDOWS_GUEST_TOOLS,
-      { isHidden: !isWindows },
+      { isHidden: !isWindows, value: isWindows },
     ),
   );
+};
+
+const windowsToolsUpdater = ({ id, prevState, dispatch, getState }: UpdateOptions) => {
+  const state = getState();
+  if (!hasVMSettingsValueChanged(prevState, state, id, VMSettingsField.MOUNT_WINDOWS_GUEST_TOOLS)) {
+    return;
+  }
+  const mountWindowsGuestTools = iGetVmSettingValue(
+    state,
+    id,
+    VMSettingsField.MOUNT_WINDOWS_GUEST_TOOLS,
+  );
+  const windowsTools = getStorages(state, id).find(
+    (storage) => !!isWinToolsImage(getVolumeContainerImage(storage.volume)),
+  );
 
-  if (isWindows && mountWindowsGuestTools && !windowsTools) {
+  if (mountWindowsGuestTools && !windowsTools) {
     dispatch(vmWizardInternalActions[InternalActionType.UpdateStorage](id, windowsToolsStorage));
   }
-  if (!(isWindows && mountWindowsGuestTools) && windowsTools) {
+  if (!mountWindowsGuestTools && windowsTools) {
     dispatch(vmWizardInternalActions[InternalActionType.RemoveStorage](id, windowsTools.id));
   }
 };
@@ -225,6 +229,7 @@ export const updateVmSettingsState = (options: UpdateOptions) =>
     provisioningSourceUpdater,
     flavorUpdater,
     osUpdater,
+    windowsToolsUpdater,
     workloadConsistencyUpdater,
     nativeK8sUpdater,
   ].forEach((updater) => {