#434

frontend/src/components/counts/CountsAdditionalConditions.tsx

@@ -48,7 +48,8 @@ const ConditionEditor = (
 	  const operator = fields.find (item => item.key === field)?.operators[0]
 	  if (operator != null) setCondition ({ field, operator })
 	}}>
-      {fields.filter (field => field.operators.length > 0).map (field => (
+      {fields.filter (item => item.operators.length > 0
+	  && (!item.legacy || item.key === field)).map (field => (
 	  <option key={field.key} value={field.key}>{fieldName (field.key)}</option>))}
     </select>
     <select value={operator} aria-label={message ('operator').text}
@@ -98,7 +99,7 @@ const CountsAdditionalConditions = ({ params, update }: {
   const dialogue = useDialogue ()
   const conditions = readCountState<CountsCondition[]> (params, 'conditions', [])
   const metadata = definition.filterFields ?? definition.fields
-  const fields = metadata.filter (field => field.operators.length > 0)
+  const fields = metadata.filter (field => field.operators.length > 0 && !field.legacy)
   const fieldName = (key: string) => (metadata.find (item => item.key === key)?.labels
       ?? [countsFieldLabel (key)]).map (label => message (
 	  label, metadata.find (item => item.key === key)?.labelValues).text).join (' › ')

frontend/src/components/counts/CountsFieldTree.tsx

@@ -69,7 +69,9 @@ const FieldGroup = ({ fields, path, params, enabled, selected, select, update }:
   const prefix = path ? `${path}.` : ''
   return <SortableList groups={{ items: ordered.map (field => field.key) }}
       fixed={path === '' ? ['thumbnail'] : []}
-      name={key => message ('reorder', {
+      name={key => message (fields.find (field => field.key === key)!.label,
+	  fields.find (field => field.key === key)!.labelValues)}
+      handleName={key => message ('reorder', {
           column: message (fields.find (field => field.key === key)!.label,
 	      fields.find (field => field.key === key)!.labelValues).text })}
       renderGroup={(_, content) => content}