Merge branch '830-snapshot-not-found-on-bm29' into 'main'

Resolve "Snapshot not found on BM29"

Closes #830

See merge request !725

apps/dataset_viewer/src/components/technique/saxs/saxsSampleChangerConfig.ts

@@ -4,6 +4,7 @@ import {
   SnashoptConfigItem,
   getDatasetName,
   getDatasetParamValue,
+  getParameterByName,
   isProcessed,
 } from '@edata-portal/core';
 import type { Dataset } from '@edata-portal/icat-plus-api';
@@ -12,14 +13,28 @@ const isBuffer = (dataset: Dataset) => {
   return getDatasetParamValue(dataset, 'SAXS_sample_type') === 'buffer';
 };
 
-const isIntegration = (dataset: Dataset): boolean => {
-  return getDatasetName(dataset).indexOf('integrate') !== -1;
-};
+const checkScanType = (
+  dataset: Dataset,
+  scanType: string,
+  keyword: string,
+): boolean => {
+  // Retrieve the scanType parameter from the dataset
+  const parameter = getParameterByName('scanType', dataset.parameters);
 
-const isSubtraction = (dataset: Dataset): boolean => {
-  return getDatasetName(dataset).indexOf('subtract') !== -1;
+  // Return true if scanType exists and matches the provided type
+  if (parameter?.value === scanType) {
+    return true;
+  }
+
+  // Check if the dataset name contains the specified keyword
+  return getDatasetName(dataset).includes(keyword);
 };
 
+const isIntegration = (dataset: Dataset): boolean =>
+  checkScanType(dataset, 'integration', 'integrate');
+const isSubtraction = (dataset: Dataset): boolean =>
+  checkScanType(dataset, 'subtraction', 'subtract');
+
 function sampleParameters() {
   return [
     {
@@ -144,7 +159,7 @@ export function getSnapshotConfigByProcesssedDataset(
   processedDataset: Dataset,
 ): SnashoptConfigItem[] {
   /** if subtractiong */
-  if (processedDataset.name.indexOf('subtract') !== -1) {
+  if (isSubtraction(processedDataset)) {
     return [
       {
         type: 'metadata',
@@ -196,7 +211,7 @@ export function getSnapshotConfigByProcesssedDataset(
     ];
   }
 
-  if (processedDataset.name.indexOf('integrate') !== -1) {
+  if (isIntegration(processedDataset)) {
     return [
       {
         type: 'metadata',