7085 ixstatus revamp revisited

app/api/services/informationextraction/specs/InformationExtraction.spec.ts

@@ -759,12 +759,12 @@ describe('InformationExtraction', () => {
           status: 'processing',
           state: {
             labeled: true,
+            match: null,
             withValue: true,
             withSuggestion: true,
-            match: false,
             hasContext: true,
             processing: true,
-            obsolete: false,
+            obsolete: true,
             error: false,
           },
         })
@@ -1011,9 +1011,9 @@ describe('InformationExtraction', () => {
           error: 'Issue calculation suggestion',
           state: {
             labeled: true,
+            match: null,
             withValue: true,
             withSuggestion: false,
-            match: false,
             hasContext: false,
             processing: false,
             obsolete: false,

app/api/services/informationextraction/specs/ixextractors.spec.ts

@@ -93,15 +93,15 @@ const fixtures: DBFixture = {
     fixtureFactory.ixExtractor('fungusKindExtractor', 'kind', ['fungusTemplate']),
   ],
   ixsuggestions: [
-    fixtureFactory.ixSuggestion(
+    fixtureFactory.ixSuggestion_deprecated(
       'sh1_en',
       'existingExtractor',
       'shared1',
       'animalTemplate',
       'F3',
       'kind'
     ),
-    fixtureFactory.ixSuggestion(
+    fixtureFactory.ixSuggestion_deprecated(
       'sh1_es',
       'existingExtractor',
       'shared1',
@@ -110,23 +110,23 @@ const fixtures: DBFixture = {
       'kind',
       { language: 'es' }
     ),
-    fixtureFactory.ixSuggestion(
+    fixtureFactory.ixSuggestion_deprecated(
       'sh3_en',
       'existingExtractor',
       'shared3',
       'plantTemplate',
       'F5',
       'kind'
     ),
-    fixtureFactory.ixSuggestion(
+    fixtureFactory.ixSuggestion_deprecated(
       'sh4_en',
       'fungusKindExtractor',
       'shared4',
       'fungusTemplate',
       'F7',
       'kind'
     ),
-    fixtureFactory.ixSuggestion(
+    fixtureFactory.ixSuggestion_deprecated(
       'sh4_es',
       'fungusKindExtractor',
       'shared4',

app/api/suggestions/pipelineStages.ts

@@ -14,46 +14,23 @@ export const baseQueryFragment = (extractorId: ObjectId, ignoreProcessing = true
 };
 
 export const filterFragments = {
-  labeled: {
-    _fragment: { 'state.labeled': true },
-    match: { 'state.labeled': true, 'state.match': true },
-    mismatch: { 'state.labeled': true, 'state.match': false },
-  },
-  nonLabeled: {
-    _fragment: { 'state.labeled': false },
-    withSuggestion: { 'state.labeled': false, 'state.withSuggestion': true },
-    noSuggestion: { 'state.labeled': false, 'state.withSuggestion': false },
-    noContext: { 'state.labeled': false, 'state.hasContext': false },
-    obsolete: { 'state.labeled': false, 'state.obsolete': true },
-    others: { 'state.labeled': false, 'state.error': true },
-  },
+  labeled: { 'state.labeled': true },
+  nonLabeled: { 'state.labeled': false },
+  match: { 'state.match': true },
+  mismatch: { 'state.match': false },
+  obsolete: { 'state.obsolete': true },
+  error: { 'state.error': true },
 };
 
 export const translateCustomFilter = (customFilter: SuggestionCustomFilter) => {
   const orFilters = [];
-  if (customFilter.labeled.match) {
-    orFilters.push(filterFragments.labeled.match);
-  }
-  if (customFilter.labeled.mismatch) {
-    orFilters.push(filterFragments.labeled.mismatch);
-  }
-
-  if (customFilter.nonLabeled.withSuggestion) {
-    orFilters.push(filterFragments.nonLabeled.withSuggestion);
-  }
+  if (customFilter.labeled) orFilters.push(filterFragments.labeled);
+  if (customFilter.nonLabeled) orFilters.push(filterFragments.nonLabeled);
+  if (customFilter.match) orFilters.push(filterFragments.match);
+  if (customFilter.mismatch) orFilters.push(filterFragments.mismatch);
+  if (customFilter.obsolete) orFilters.push(filterFragments.obsolete);
+  if (customFilter.error) orFilters.push(filterFragments.error);
 
-  if (customFilter.nonLabeled.noSuggestion) {
-    orFilters.push(filterFragments.nonLabeled.noSuggestion);
-  }
-  if (customFilter.nonLabeled.noContext) {
-    orFilters.push(filterFragments.nonLabeled.noContext);
-  }
-  if (customFilter.nonLabeled.obsolete) {
-    orFilters.push(filterFragments.nonLabeled.obsolete);
-  }
-  if (customFilter.nonLabeled.others) {
-    orFilters.push(filterFragments.nonLabeled.others);
-  }
   return orFilters;
 };