Set default in code, remove defaults

Signed-off-by: Andrew W. Harn <[email protected]>

Author: awharn

packages/zosfiles/src/api/methods/create/Create.defaults.ts

@@ -28,7 +28,6 @@ export const CreateDefaults = {
             alcunit: "CYL",
             dsorg: "PO",
             primary: 1,
-            secondary: 1,
             dirblk: 5,
             recfm: "FB",
             blksize: 6160,
@@ -43,7 +42,6 @@ export const CreateDefaults = {
             alcunit: "CYL",
             dsorg: "PS",
             primary: 1,
-            secondary: 1,
             recfm: "FB",
             blksize: 6160,
             lrecl: 80
@@ -57,7 +55,6 @@ export const CreateDefaults = {
             alcunit: "CYL",
             dsorg: "PO",
             primary: 1,
-            secondary: 1,
             recfm: "FB",
             blksize: 6160,
             lrecl: 80,
@@ -72,7 +69,6 @@ export const CreateDefaults = {
             dsorg: "PO",
             alcunit: "CYL",
             primary: 1,
-            secondary: 1,
             recfm: "VB",
             blksize: 32760,
             lrecl: 260,
@@ -87,7 +83,6 @@ export const CreateDefaults = {
             dsorg: "PO",
             alcunit: "CYL",
             primary: 10,
-            secondary: 10,
             recfm: "U",
             blksize: 27998,
             lrecl: 27998,

packages/zosfiles/src/api/methods/create/Create.ts

@@ -47,7 +47,6 @@ export class Create {
 
         // Removes undefined properties
         let tempOptions = !isNullOrUndefined(options) ? JSON.parse(JSON.stringify(options)) : {};
-        const secondarySpecified = !isNullOrUndefined(tempOptions.secondary);
 
         // Required
         ImperativeExpect.toNotBeNullOrUndefined(cmdType, ZosFilesMessages.missingDatasetType.message);
@@ -91,14 +90,22 @@ export class Create {
                     if (!isNullOrUndefined(tPrimary)) {
                         tempOptions.primary = +(tPrimary.join(""));
 
-                        if (!secondarySpecified) {
+                        if (!isNullOrUndefined(tempOptions.secondary)) {
                             const TEN_PERCENT = 0.10;
                             tempOptions.secondary = Math.round(tempOptions.primary * TEN_PERCENT);
                         }
                     }
-
-                    delete tempOptions.size;
+                } else {
+                    if (tempOptions.primary && isNullOrUndefined(tempOptions.secondary)) {
+                        if (cmdType !== CreateDataSetTypeEnum.DATA_SET_BINARY) {
+                            tempOptions.secondary = 1;
+                        } else {
+                            // tslint:disable-next-line:no-magic-numbers
+                            tempOptions.secondary = 10;
+                        }
+                    }
                 }
+                delete tempOptions.size;
 
                 let response = "";
                 // Handle the print attributes option

packages/zosfiles/src/cli/create/binaryPds/BinaryPDS.definition.ts

@@ -45,8 +45,9 @@ export const BinaryPDSDefinition: ICommandDefinition = {
             ...ZosFilesCreateExtraOptions.size,
             defaultValue: CreateDefaults.DATA_SET.BINARY.primary + CreateDefaults.DATA_SET.BINARY.alcunit
         },
+        ZosFilesCreateOptions.primary,
         ZosFilesCreateOptions.volser,
-        {...ZosFilesCreateOptions.secondary, defaultValue: CreateDefaults.DATA_SET.BINARY.secondary},
+        ZosFilesCreateOptions.secondary,
         {...ZosFilesCreateOptions.dirblk, defaultValue: CreateDefaults.DATA_SET.BINARY.dirblk},
         {...ZosFilesCreateOptions.recfm, defaultValue: CreateDefaults.DATA_SET.BINARY.recfm},
         {...ZosFilesCreateOptions.blksize, defaultValue: CreateDefaults.DATA_SET.BINARY.blksize},

packages/zosfiles/src/cli/create/cPds/CPDS.definition.ts

@@ -46,7 +46,8 @@ export const CPDSDefinition: ICommandDefinition = {
             defaultValue: CreateDefaults.DATA_SET.C.primary + CreateDefaults.DATA_SET.C.alcunit
         },
         ZosFilesCreateOptions.volser,
-        {...ZosFilesCreateOptions.secondary, defaultValue: CreateDefaults.DATA_SET.C.secondary},
+        ZosFilesCreateOptions.primary,
+        ZosFilesCreateOptions.secondary,
         {...ZosFilesCreateOptions.dirblk, defaultValue: CreateDefaults.DATA_SET.C.dirblk},
         {...ZosFilesCreateOptions.recfm, defaultValue: CreateDefaults.DATA_SET.C.recfm},
         {...ZosFilesCreateOptions.blksize, defaultValue: CreateDefaults.DATA_SET.C.blksize},

packages/zosfiles/src/cli/create/classicPds/ClassicPDS.definition.ts

@@ -45,8 +45,9 @@ export const ClassicPDSDefinition: ICommandDefinition = {
             ...ZosFilesCreateExtraOptions.size,
             defaultValue: CreateDefaults.DATA_SET.CLASSIC.primary + CreateDefaults.DATA_SET.CLASSIC.alcunit
         },
+        ZosFilesCreateOptions.primary,
         ZosFilesCreateOptions.volser,
-        {...ZosFilesCreateOptions.secondary, defaultValue: CreateDefaults.DATA_SET.CLASSIC.secondary},
+        ZosFilesCreateOptions.secondary,
         {...ZosFilesCreateOptions.dirblk, defaultValue: CreateDefaults.DATA_SET.CLASSIC.dirblk},
         {...ZosFilesCreateOptions.recfm, defaultValue: CreateDefaults.DATA_SET.CLASSIC.recfm},
         {...ZosFilesCreateOptions.blksize, defaultValue: CreateDefaults.DATA_SET.CLASSIC.blksize},

packages/zosfiles/src/cli/create/pds/Pds.definition.ts

@@ -46,7 +46,8 @@ export const PdsDefinition: ICommandDefinition = {
             defaultValue: CreateDefaults.DATA_SET.PARTITIONED.primary + CreateDefaults.DATA_SET.PARTITIONED.alcunit
         },
         ZosFilesCreateOptions.volser,
-        {...ZosFilesCreateOptions.secondary, defaultValue: CreateDefaults.DATA_SET.PARTITIONED.secondary},
+        ZosFilesCreateOptions.primary,
+        ZosFilesCreateOptions.secondary,
         {...ZosFilesCreateOptions.dirblk, defaultValue: CreateDefaults.DATA_SET.PARTITIONED.dirblk},
         {...ZosFilesCreateOptions.recfm, defaultValue: CreateDefaults.DATA_SET.PARTITIONED.recfm},
         {...ZosFilesCreateOptions.blksize, defaultValue: CreateDefaults.DATA_SET.PARTITIONED.blksize},

packages/zosfiles/src/cli/create/ps/Ps.definition.ts

@@ -46,7 +46,8 @@ export const PsDefinition: ICommandDefinition = {
             defaultValue: CreateDefaults.DATA_SET.SEQUENTIAL.primary + CreateDefaults.DATA_SET.SEQUENTIAL.alcunit
         },
         ZosFilesCreateOptions.volser,
-        {...ZosFilesCreateOptions.secondary, defaultValue: CreateDefaults.DATA_SET.SEQUENTIAL.secondary},
+        ZosFilesCreateOptions.primary,
+        ZosFilesCreateOptions.secondary,
         ZosFilesCreateOptions.dirblk,
         {...ZosFilesCreateOptions.recfm, defaultValue: CreateDefaults.DATA_SET.SEQUENTIAL.recfm},
         {...ZosFilesCreateOptions.blksize, defaultValue: CreateDefaults.DATA_SET.SEQUENTIAL.blksize},