KAAV-3388 generateConfirmedFields ei toimi odotetulla tavalla

src/sagas/projectSaga.js

@@ -756,8 +756,8 @@ function* validateProjectTimetable() {
     const phaseNames = [
       'periaatteet',
       'oas',
-      'luonnos',
-      'ehdotus',
+      'kaavaluonnos',
+      'kaavaehdotus',
       'tarkistettu_ehdotus'
     ];
     //Find confirmed fields from attribute_data so backend knows not to edit them
@@ -853,8 +853,8 @@ function* saveProjectTimetable(action,retryCount = 0) {
     const phaseNames = [
       'periaatteet',
       'oas',
-      'luonnos',
-      'ehdotus',
+      'kaavaluonnos',
+      'kaavaehdotus',
       'tarkistettu_ehdotus'
     ];
 

src/utils/generateConfirmedFields.js

@@ -1,13 +1,41 @@
+function getSpecialCaseFields(phase, base, finalSuffix) {
+  return [
+    `milloin_${phase}_${base}${finalSuffix}`,
+    `${phase}_lautakunta_aineiston_maaraaika${finalSuffix}`,
+  ];
+}
+
+function getRegularFields(phase, group, finalSuffix, attributeData) {
+  const fields = [
+    `${phase}_${group}_aineiston_maaraaika${finalSuffix}`,
+    `milloin_${phase}_${group}_alkaa${finalSuffix}`,
+    `milloin_${phase}_${group}_paattyy${finalSuffix}`,
+  ];
+  return fields.filter(key => key in attributeData);
+}
+
+function addMielipiteetField(confirmedFields, seenPhases, phase, attributeData) {
+  const mielipiteet = `viimeistaan_mielipiteet_${phase}`;
+  if (!seenPhases.has(phase) && mielipiteet in attributeData) {
+    confirmedFields.push(mielipiteet);
+    seenPhases.add(phase);
+  }
+}
+
 export function generateConfirmedFields(attributeData, confirmationAttributeNames, phaseNames) {
+  const filteredConfirmationAttributeNames = confirmationAttributeNames.filter(
+    key => key.includes('_alkaa') || key.includes('_lautakunnassa')
+  );
+
   const confirmedFields = [];
   const seenPhases = new Set();
 
-  confirmationAttributeNames.forEach((confirmationKey) => {
-    if (!attributeData[confirmationKey]) return;
+  for (const confirmationKey of filteredConfirmationAttributeNames) {
+    if (!attributeData[confirmationKey]) continue;
 
     const rawKey = confirmationKey.replace(/^vahvista_/, '');
     const phase = phaseNames.find((p) => rawKey === p || rawKey.startsWith(p + '_'));
-    if (!phase) return;
+    if (!phase) continue;
 
     const suffixMatch = rawKey.match(/(_\d+)$/);
     const suffix = suffixMatch ? suffixMatch[1] : '';
@@ -17,37 +45,17 @@ export function generateConfirmedFields(attributeData, confirmationAttributeName
     const base = keyWithoutSuffix.replace(`${phase}_`, '');
 
     const parts = base.split('_');
-    let group = parts[0];
-    let type = parts[1];
+    const group = parts[0];
 
     if (parts.length === 1) {
-      // Special case like vahvista_periaatteet_lautakunnassa
-      const field1 = `milloin_${phase}_${base}${finalSuffix}`;
-      const field2 = `${phase}_lautakunta_aineiston_maaraaika${finalSuffix}`;
-
-      confirmedFields.push(field1);
-      confirmedFields.push(field2);
-
-      return;
+      confirmedFields.push(...getSpecialCaseFields(phase, base, finalSuffix));
+      addMielipiteetField(confirmedFields, seenPhases, phase, attributeData);
+      continue;
     }
 
-    // Regular case
-    const aineisto = `${phase}_${group}_aineiston_maaraaika${finalSuffix}`;
-    const alkaa = `milloin_${phase}_${group}_alkaa${finalSuffix}`;
-    const paattyy = `milloin_${phase}_${group}_paattyy${finalSuffix}`;
-    const mielipiteet = `viimeistaan_mielipiteet_${phase}`;
-
-    [aineisto, alkaa, paattyy].forEach((key) => {
-      if (key in attributeData) {
-        confirmedFields.push(key);
-      }
-    });
-
-    if (!seenPhases.has(phase) && mielipiteet in attributeData) {
-      confirmedFields.push(mielipiteet);
-      seenPhases.add(phase);
-    }
-  });
+    confirmedFields.push(...getRegularFields(phase, group, finalSuffix, attributeData));
+    addMielipiteetField(confirmedFields, seenPhases, phase, attributeData);
+  }
 
   return [...new Set(confirmedFields)];
 }