Skip to content

Commit

Permalink
rename, bump, docs
Browse files Browse the repository at this point in the history
  • Loading branch information
mrCherry97 committed Oct 17, 2023
1 parent e170b71 commit 950cc1d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/extensibility/resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ category: My Category
scope: namespace
defaultPlaceholder: '- not set -'
description: See the {{[docs](https://github.com/kyma-project/busola)}} for more information.
filter: "$filter($item, function($data) {$data.type = 'Opaque'})"
filter: "$filter(data, function($data) {$data.type = 'Opaque'})"
features:
actions:
disableCreate: true
Expand Down
2 changes: 1 addition & 1 deletion resources/web/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: busola
image: europe-docker.pkg.dev/kyma-project/dev/busola-web:PR-2596
image: europe-docker.pkg.dev/kyma-project/dev/busola-web:PR-2609
imagePullPolicy: Always
resources:
requests:
Expand Down
10 changes: 7 additions & 3 deletions src/components/Extensibility/ExtensibilityList.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const ExtensibilityListCore = ({
const { t: tBusola } = useTranslation();
const jsonata = useJsonata({});

const { resource, description, features, filter } =
const { resource, description, features, filter: generalFilter } =
resMetaData?.general ?? {};

const { disableCreate, disableEdit, disableDelete } = features?.actions ?? {
Expand Down Expand Up @@ -88,10 +88,14 @@ export const ExtensibilityListCore = ({

const isFilterAString =
typeof resMetaData?.resource?.filter === 'string' ||
typeof filter === 'string';
typeof generalFilter === 'string';

const filterFn = value =>
applyFormula(value, resMetaData?.resource?.filter || filter, tBusola);
applyFormula(
value,
resMetaData?.resource?.filter || generalFilter,
tBusola,
);
listProps.filter = isFilterAString ? filterFn : filterFunction;

const sortOptions = (resMetaData?.list || []).filter(element => element.sort);
Expand Down

0 comments on commit 950cc1d

Please sign in to comment.