fix(adminPanel): Fix UsedBy queries for data elements and data-tables

beyondessential · Apr 12, 2024 · 6f059bd · 6f059bd
1 parent 54d4c16
commit 6f059bd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/database/src/TupaiaDatabase.js b/packages/database/src/TupaiaDatabase.js
@@ -687,8 +687,11 @@ function getColSelector(connection, inputColStr) {
 
   const params = inputColStr.split(jsonOperatorPattern);
   const allButFirst = params.slice(1);
+  const lastIndexOfLookupAsText = inputColStr.lastIndexOf('->>');
+  const lastIndexOfLookupAsJson = inputColStr.lastIndexOf('->');
+  const selector = lastIndexOfLookupAsText >= lastIndexOfLookupAsJson ? '#>>' : '#>';
 
   // Turn `config->item->>colour` into `config #>> '{item,colour}'`
   // For some reason, Knex fails when we try to convert it to `config->'item'->>'colour'`
-  return connection.raw(`?? #>> '{${allButFirst.map(() => '??').join(',')}}'`, params);
+  return connection.raw(`?? ${selector} '{${allButFirst.map(() => '??').join(',')}}'`, params);
 }