Fix inventory type filter (#2684)

Author: daphnemaeve

frontend/awx/common/awx-toolbar-filters.tsx

@@ -160,16 +160,17 @@ export function useInventoryTypeToolbarFilter() {
   const { t } = useTranslation();
   return useMemo<IToolbarFilter>(
     () => ({
-      key: 'kind',
+      key: 'inventory-type',
       label: t('Inventory type'),
       type: ToolbarFilterType.MultiSelect,
-      query: 'or__kind',
+      query: 'kind',
       options: [
         { label: t('Inventory'), value: '' },
         { label: t('Smart inventory'), value: 'smart' },
         { label: t('Constructed inventory'), value: 'constructed' },
       ],
       placeholder: t('Select types'),
+      disableSortOptions: true,
     }),
     [t]
   );

frontend/awx/resources/inventories/hooks/useInventoriesFilters.tsx

@@ -1,18 +1,25 @@
 import {
   useCreatedByToolbarFilter,
+  useInventoryTypeToolbarFilter,
   useModifiedByToolbarFilter,
 } from '../../../common/awx-toolbar-filters';
 import { useDynamicToolbarFilters } from '../../../common/useDynamicFilters';
 
 export function useInventoriesFilters() {
+  const inventoryTypeToolbarFilter = useInventoryTypeToolbarFilter();
   const createdByToolbarFilter = useCreatedByToolbarFilter();
   const modifiedByToolbarFilter = useModifiedByToolbarFilter();
 
   const toolbarFilters = useDynamicToolbarFilters({
     optionsPath: 'inventories',
-    preSortedKeys: ['name', 'id', 'created-by', 'modified-by'],
+    preSortedKeys: ['name', 'id', 'created-by', 'modified-by', 'inventory-type'],
     preFilledValueKeys: { name: { apiPath: 'inventories' }, id: { apiPath: 'inventories' } },
-    additionalFilters: [createdByToolbarFilter, modifiedByToolbarFilter],
+    additionalFilters: [
+      createdByToolbarFilter,
+      modifiedByToolbarFilter,
+      inventoryTypeToolbarFilter,
+    ],
+    removeFilters: ['kind'],
   });
   return toolbarFilters;
 }