Skip to content

Commit

Permalink
SHIBUI-1934 Fixed filter list link
Browse files Browse the repository at this point in the history
  • Loading branch information
rmathis committed Jun 9, 2021
1 parent f30f4ec commit 23ae5c5
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
11 changes: 10 additions & 1 deletion ui/src/app/metadata/domain/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { CustomAttributeDefinition } from './attribute/CustomAttributeDefinition';
import { MetadataFilterEditorTypes } from './filter';
import { MetadataProviderEditorTypes, MetadataProviderWizardTypes } from './provider';
import { DynamicHttpMetadataProviderEditor } from './provider/DynamicHttpMetadataProviderDefinition';
import { FileBackedHttpMetadataProviderEditor } from './provider/FileBackedHttpMetadataProviderDefinition';
import { LocalDynamicMetadataProviderEditor } from './provider/LocalDynamicMetadataProviderDefinition';
import { SourceEditor, SourceWizard } from "./source/SourceDefinition";

export const editors = {
Expand All @@ -23,7 +26,13 @@ export const FilterEditorTypes = [

export const AttributeEditorTypes = [
CustomAttributeDefinition
]
];

export const FilterableProviders = [
FileBackedHttpMetadataProviderEditor.type,
DynamicHttpMetadataProviderEditor.type,
LocalDynamicMetadataProviderEditor.type
];

export const getWizard = (type) =>
ProviderWizardTypes.find(def => def.type === type) ||
Expand Down
11 changes: 7 additions & 4 deletions ui/src/app/metadata/editor/MetadataEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { NavLink } from 'react-router-dom';
import { useTranslator } from '../../i18n/hooks';
import API_BASE_PATH from '../../App.constant';
import { MetadataObjectContext } from '../hoc/MetadataSelector';
import { FilterableProviders } from '../domain/provider';

export function MetadataEditor ({ current }) {

Expand Down Expand Up @@ -68,6 +69,8 @@ export function MetadataEditor ({ current }) {

const warnings = definition.warnings && definition.warnings(metadata);

const canFilter = FilterableProviders.indexOf(definition.type) > -1;

return (
<div className="container-fluid p-3">
<Prompt
Expand Down Expand Up @@ -97,12 +100,12 @@ export function MetadataEditor ({ current }) {
base={`/metadata/${type}/${id}/edit`}
format='dropdown'
errors={errors}>
<NavLink className="dropdown-item"
{canFilter && <NavLink className="dropdown-item"
to="../filter/list"
aria-label={translator('label.filter-list')}
role="button">
<Translate value="label.filter-list"></Translate>
</NavLink>
</NavLink>}
</MetadataEditorNav>
</div>
<div className="col-6 col-lg-3 order-2 text-right">
Expand Down Expand Up @@ -152,12 +155,12 @@ export function MetadataEditor ({ current }) {
base={`/metadata/${type}/${id}/edit`}
format='tabs'
errors={errors}>
<NavLink className="nav-link"
{canFilter && <NavLink className="nav-link"
to="../filter/list"
aria-label={translator('label.filter-list')}
role="button">
<Translate value="label.filter-list"></Translate>
</NavLink>
</NavLink> }
</MetadataEditorNav>
</div>
<div className="col-lg-9">
Expand Down

0 comments on commit 23ae5c5

Please sign in to comment.