Data explorer: keep order of selected dimensions in sort editor (#3641)

Co-authored-by: Stefano Ricci <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

webapp/components/DataQuery/ButtonBar/ButtonSort/SortEditor/store/useSortEditor.js

@@ -1,20 +1,29 @@
 import { useState } from 'react'
 
+import { Objects } from '@openforis/arena-core'
+
 import { Query, Sort } from '@common/model/query'
+import * as ObjectUtils from '@core/objectUtils'
 import * as Expression from '@core/expressionParser/expression'
+
 import * as ExpressionVariables from '@webapp/components/expression/expressionVariables'
 
 import { useLang } from '@webapp/store/system'
 import { useNodeDefByUuid, useSurvey, useSurveyCycleKey } from '@webapp/store/survey'
 
-const getVariables = ({ survey, cycle, entityDef, attributeDefUuids, lang }) =>
-  ExpressionVariables.getVariables({
+const getVariables = ({ survey, cycle, entityDef, attributeDefUuids, lang }) => {
+  const variables = ExpressionVariables.getVariables({
     survey,
     cycle,
     nodeDefContext: entityDef,
     mode: Expression.modes.sql,
     lang,
-  }).filter((variable) => attributeDefUuids.includes(variable.uuid))
+  })
+  if (Objects.isEmpty(attributeDefUuids)) return variables
+
+  const variablesByUuid = ObjectUtils.toUuidIndexedObj(variables)
+  return attributeDefUuids.map((uuid) => variablesByUuid[uuid]).filter(Boolean)
+}
 
 export const useSortEditor = ({ query }) => {
   const sort = Query.getSort(query)