소스 검색

Fixed prepareDeleteConfigValuesForCalc for undefined

Taichi Masuyama 4 년 전
부모
커밋
83ddef924a
1개의 변경된 파일8개의 추가작업 그리고 4개의 파일을 삭제
  1. 8 4
      packages/app/src/utils/page-delete-config.ts

+ 8 - 4
packages/app/src/utils/page-delete-config.ts

@@ -52,11 +52,15 @@ export const validateDeleteConfigs = (
  * @returns [(value for single), (value for recursive)]
  */
 export const prepareDeleteConfigValuesForCalc = (
-    confForSingle: IPageDeleteConfigValueToProcessValidation, confForRecursive: IPageDeleteConfigValue,
+    confForSingle: IPageDeleteConfigValueToProcessValidation | undefined, confForRecursive: IPageDeleteConfigValue | undefined,
 ): [IPageDeleteConfigValueToProcessValidation, IPageDeleteConfigValueToProcessValidation] => {
-  if (confForRecursive === Value.Inherit) {
-    return [confForSingle, confForSingle];
+  // convert undefined to default values
+  const confForSingleToReturn = confForSingle ?? Value.Anyone;
+  const confForRecursiveToReturn = confForRecursive ?? Value.Inherit;
+
+  if (confForRecursiveToReturn === Value.Inherit) {
+    return [confForSingleToReturn, confForSingleToReturn];
   }
 
-  return [confForSingle, confForRecursive];
+  return [confForSingleToReturn, confForRecursiveToReturn];
 };