Skip to content

Commit

Permalink
Fixed issue with sorting filters
Browse files Browse the repository at this point in the history
  • Loading branch information
rmathis authored and credman committed Feb 6, 2023
1 parent da991d0 commit c4f05a7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
4 changes: 4 additions & 0 deletions ui/src/app/dashboard/component/Ordered.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ export function Ordered({ path = '/MetadataResolversPositionOrder', entities, ch

React.useEffect(() => orderEntities(order, entities), [order, entities]);

React.useEffect(() => {
loadOrder();
}, [entities]);

return (
<>
{children(ordered, firstId, lastId, onOrderUp, onOrderDown)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ export function MetadataFilters ({ providerId, types = [], filters, children })
}
}, [providerId]);


return (
<DeleteConfirmation title={`message.delete-filter-title`} body={`message.delete-filter-body`}>
{(block) =>
Expand Down
10 changes: 1 addition & 9 deletions ui/src/app/metadata/view/MetadataOptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ import { MetadataDefinitionContext, MetadataSchemaContext } from '../hoc/Metadat
import { useMetadataConfiguration } from '../hooks/configuration';
import { MetadataViewToggle } from '../component/MetadataViewToggle';
import { MetadataActions } from '../../admin/container/MetadataActions';
import { MetadataFilters } from '../domain/filter/component/MetadataFilters';
import { MetadataFilterConfigurationList } from '../domain/filter/component/MetadataFilterConfigurationList';
import { MetadataFilterTypes } from '../domain/filter';
import { useMetadataSchema } from '../hooks/schema';
import { FilterableProviders } from '../domain/provider';
import { useCanEnable, useIsAdmin } from '../../core/user/UserContext';
Expand Down Expand Up @@ -120,13 +118,7 @@ export function MetadataOptions ({reload}) {
</Link>
</div>
</div>
<MetadataFilters providerId={metadata.resourceId} types={MetadataFilterTypes}>
{(filters, onUpdate, onDelete, loading) =>
<MetadataFilterConfigurationList
provider={metadata}
filters={filters}
onDelete={onDelete} />}
</MetadataFilters>
<MetadataFilterConfigurationList provider={metadata} />
</div>
}
<Button variant="link" onClick={ () => onScrollTo('header', -60) }>
Expand Down

0 comments on commit c4f05a7

Please sign in to comment.