fix new bug with sorting

CHANGES

@@ -1,3 +1,10 @@
+## 15.0.9
+
+---
+
+- Bugfix:
+  - fix a bug with sorting strings that looks like numbers. now trying to parse all stings as numbers and if they are numbers, sort as numbers
+
 ## 15.0.8
 
 ---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helsenorge/refero",
-  "version": "15.0.8",
+  "version": "15.0.9",
   "engines": {
     "node": "^18.0.0",
     "npm": ">=9.0.0"

src/components/formcomponents/table/tables/utils.ts

@@ -131,7 +131,7 @@ type ItemTypeToDataTypeMap = {
 };
 export const getPrimitiveValueFromItemType = <
   ItemType extends keyof ItemTypeToDataTypeMap,
-  DisplayType extends ItemTypeToDataTypeMap[ItemType]
+  DisplayType extends ItemTypeToDataTypeMap[ItemType],
 >(
   type: IItemType,
   res: QuestionnaireResponseItemAnswer,
@@ -165,7 +165,7 @@ export const getPrimitiveValueFromItemType = <
   }
 };
 export function getQuestionnaireResponseItemAnswer(
-  type: typeof ItemType[keyof typeof ItemType],
+  type: (typeof ItemType)[keyof typeof ItemType],
   result: never[]
 ): QuestionnaireResponseItemAnswer | Array<QuestionnaireResponseItemAnswer> {
   switch (type) {
@@ -235,15 +235,15 @@ export const getValueIfDataReceiver = (
       });
     }
 
-    return getQuestionnaireResponseItemAnswer(item.type as Exclude<typeof ItemType[keyof typeof ItemType], 'url'>, result);
+    return getQuestionnaireResponseItemAnswer(item.type as Exclude<(typeof ItemType)[keyof typeof ItemType], 'url'>, result);
   }
   return undefined;
 };
 
 export const convertValuesToStrings = (values: Array<string | number | Quantity>): string[] => values.map(value => value.toString());
 
 export const extractValuesFromAnswer = (
-  type: typeof ItemType[keyof typeof ItemType],
+  type: (typeof ItemType)[keyof typeof ItemType],
   questionnaireAnswer?: QuestionnaireResponseItemAnswer | QuestionnaireResponseItemAnswer[]
 ): Array<string | number | Quantity> => {
   if (questionnaireAnswer === undefined) {
@@ -255,7 +255,7 @@ export const extractValuesFromAnswer = (
 };
 
 export const transformAnswersToListOfStrings = (
-  type: typeof ItemType[keyof typeof ItemType],
+  type: (typeof ItemType)[keyof typeof ItemType],
   answer?: QuestionnaireResponseItemAnswer | QuestionnaireResponseItemAnswer[]
 ): string[] => {
   const value = extractValuesFromAnswer(type, answer);
@@ -397,10 +397,28 @@ export const sortByItemType = (aValue: string, bValue: string, sortOrder: SortDi
     case ItemType.STRING:
     case ItemType.TEXT:
     case ItemType.OPENCHOICE:
-      return compareStrings(aValue, bValue, sortOrder);
+    case ItemType.CHOICE:
+      return isNumber(aValue, bValue) ? compareNumbers(aValue, bValue, sortOrder) : compareStrings(aValue, bValue, sortOrder);
     default:
-      return compareStrings(aValue, bValue, sortOrder);
+      return isNumber(aValue, bValue) ? compareNumbers(aValue, bValue, sortOrder) : compareStrings(aValue, bValue, sortOrder);
+  }
+};
+const isNumber = (aValue: string, bValues: string): boolean => {
+  return isNumberString(aValue) && isNumberString(bValues);
+};
+const isNumberString = (str: string): boolean => {
+  str = str.trim();
+
+  if (str === '') {
+    return false;
+  }
+  const numberRegex = /^-?\d+(\.\d+)?([eE][-+]?\d+)?$/;
+
+  if (!numberRegex.test(str)) {
+    return false;
   }
+  const number = Number(str);
+  return !isNaN(number);
 };
 
 const extractNumber = (value: string | undefined): number => {

src/preview/FormFillerPreview.tsx

@@ -12,7 +12,7 @@ import LanguageLocales from '@helsenorge/core-utils/constants/languages';
 import FormFillerSidebar from './FormFillerSidebar';
 import { emptyPropertyReplacer } from './helpers';
 import { getResources } from './resources/referoResources';
-import skjema from './skjema/Test_Slider_New-nb-NO-v01.json';
+import skjema from './skjema/q.json';
 import { ReferoContainer } from '../components';
 import rootReducer from '../reducers';