Fix bug with weeklyMaintenanceTime for FSX filesystems

Author: PoeppingT

client/web/src/settings/ApplicationComponent.js

@@ -73,7 +73,7 @@ export function ApplicationComponent(props) {
     let filesystem = {
       ...FILESYSTEM_DEFAULTS,
       ...defaultValues.filesystem,
-      ...tierValues.filesystem
+      ...splitWeeklyMaintenanceTime(tierValues.filesystem)
     }
     let defaults = Object.assign({
       min: 0,
@@ -92,7 +92,7 @@ export function ApplicationComponent(props) {
       provisionDb: !!tierValues.database,
       provisionFS: !!tierValues.filesystem,
       filesystemType: filesystemType,
-      filesystem: splitWeeklyMaintenanceTime(uncleanedInitialTierValues.filesystem),
+      filesystem: filesystem,
     }
   }
 

client/web/src/settings/ApplicationContainer.js

@@ -146,15 +146,6 @@ export function ApplicationContainer(props) {
     updateConfiguration(formValues)
   }
 
-  const getFormattedTime = (timeString) => {
-    // Expecting timeString to be HH:MM:SS
-    let parts = timeString.split(':')
-    if (parts.length === 3) {
-      parts = parts.splice(0, 2) //Trim the trailing :00. Server doesn't need seconds
-    }
-    return parts.join(':')
-  }
-
   const cleanFilesystemForSubmittal = (provisionFS, filesystemType, filesystem) => {
     if (provisionFS) {
       let {
@@ -164,7 +155,7 @@ export function ApplicationContainer(props) {
       } = filesystem
       cleanedFs.type = FILESYSTEM_TYPES[filesystemType].configId
       if (weeklyMaintenanceDay && weeklyMaintenanceTime) {
-        cleanedFs.weeklyMaintenanceTime = `${weeklyMaintenanceDay}:${getFormattedTime(weeklyMaintenanceTime)}`
+        cleanedFs.weeklyMaintenanceTime = `${weeklyMaintenanceDay}:${weeklyMaintenanceTime}`
       }
       let wantedKeys = Object.keys(FILESYSTEM_TYPES[filesystemType].defaults)
       Object.keys(cleanedFs).forEach(k => {

client/web/src/settings/components/filesystem/index.js

@@ -58,7 +58,7 @@ export const FILESYSTEM_TYPES = {
             throughputMbs: 8,
             backupRetentionDays: 7,
             dailyBackupTime: '01:00',
-            weeklyMaintenanceTime: '07:01:00',
+            weeklyMaintenanceTime: '07:01',
             weeklyMaintenanceDay: '1',
             windowsMountDrive: 'G:',
         },
@@ -102,7 +102,7 @@ export const FILESYSTEM_TYPES = {
             throughputMbs: 128,
             backupRetentionDays: 7,
             dailyBackupTime: '01:00',
-            weeklyMaintenanceTime: '07:01:00',
+            weeklyMaintenanceTime: '07:01',
             weeklyMaintenanceDay: '1',
             volumeSize: 40
         },
@@ -153,7 +153,7 @@ export const FILESYSTEM_TYPES = {
             throughputMbs: 128,
             backupRetentionDays: 7,
             dailyBackupTime: '01:00',
-            weeklyMaintenanceTime: '07:01:00',
+            weeklyMaintenanceTime: '07:01',
             weeklyMaintenanceDay: '1',
             windowsMountDrive: 'G:',
             volumeSize: 40