Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix console errors in Extensions #3349

Merged
merged 1 commit into from
Sep 17, 2024
Merged

fix: fix console errors in Extensions #3349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 50 additions & 48 deletions src/components/BusolaExtensions/BusolaExtensionDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ export function BusolaExtensionDetails({ name, namespace }) {
const updateResourceMutation = useUpdate(resourceUrl);
const notification = useNotification();

if (!name) {
return null;
}

const updateBusolaExtension = async (newBusolaExtension, configmap) => {
try {
const diff = createPatch(configmap, newBusolaExtension);
Expand All @@ -66,56 +70,53 @@ export function BusolaExtensionDetails({ name, namespace }) {

const BusolaExtensionEditor = resource => {
const { data } = resource;
return (
<>
{SECTIONS.map(key => (
<ReadonlyEditorPanel
editorProps={{ language: 'yaml' }}
title={t(`extensibility.sections.${key}`)}
value={data[key]}
key={key + JSON.stringify(data[key])}
actions={[
<ModalWithForm
title={t('extensibility.edit-section', {
return SECTIONS.map(key => (
<ReadonlyEditorPanel
editorProps={{ language: 'yaml' }}
title={t(`extensibility.sections.${key}`)}
value={data[key]}
key={key + JSON.stringify(data[key])}
actions={[
<ModalWithForm
title={t('extensibility.edit-section', {
section: t(`extensibility.sections.${key}`),
})}
modalOpeningComponent={
<Button style={spacing.sapUiTinyMarginEnd} design="Default">
{t('extensibility.edit-section', {
section: t(`extensibility.sections.${key}`),
})}
modalOpeningComponent={
<Button style={spacing.sapUiTinyMarginEnd} design="Default">
{t('extensibility.edit-section', {
section: t(`extensibility.sections.${key}`),
})}
</Button>
}
confirmText={t('common.buttons.save')}
id={`edit-resource-modal`}
className="modal-size--l"
renderForm={props => (
<ErrorBoundary>
<SectionEditor
{...props}
onlyYaml={!extensibilitySchemas[key]}
data={data[key]}
schema={extensibilitySchemas[key]}
resource={data}
onSubmit={newData => {
const newResource = {
...resource,
data: {
...data,
[key]: newData,
},
};
updateBusolaExtension(newResource, resource);
}}
/>
</ErrorBoundary>
)}
/>,
]}
/>
))}
</>
);
</Button>
}
confirmText={t('common.buttons.save')}
id={`edit-resource-modal`}
key={`edit-resource-modal`}
className="modal-size--l"
renderForm={props => (
<ErrorBoundary>
<SectionEditor
{...props}
onlyYaml={!extensibilitySchemas[key]}
data={data[key]}
schema={extensibilitySchemas[key]}
resource={data}
onSubmit={newData => {
const newResource = {
...resource,
data: {
...data,
[key]: newData,
},
};
updateBusolaExtension(newResource, resource);
}}
/>
</ErrorBoundary>
)}
/>,
]}
/>
));
};

const ExtensibilityVersion = configmap => {
Expand Down Expand Up @@ -180,6 +181,7 @@ export function BusolaExtensionDetails({ name, namespace }) {
<UI5Panel
keyComponent="extensibility-version"
title={t('extensibility.sections.version')}
key={'extensibility-version'}
headerActions={
hasMigrationFunction && (
<>
Expand Down
1 change: 1 addition & 0 deletions src/components/BusolaExtensions/BusolaExtensionEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export function BusolaExtensionEdit({
<ResourceForm.CollapsibleSection
title={t(`extensibility.sections.${key}`)}
defaultOpen
key={key}
>
<Editor
language="yaml"
Expand Down
20 changes: 13 additions & 7 deletions src/shared/ResourceForm/fields/KeyValueField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,11 @@ export function KeyValueField({
.reduce((acc, entry) => ({ ...acc, [entry.key]: entry.val }), {})
}
inputs={[
({ value, setValue, ref, updateValue, focus }) => (
<div className={readableFromFile ? 'bsl-col-md--4' : 'bsl-col-md--6'}>
({ value, setValue, ref, updateValue, focus, index }) => (
<div
key={`key-value-field-key-${index}`}
className={readableFromFile ? 'bsl-col-md--4' : 'bsl-col-md--6'}
>
{input.key({
fullWidth: true,
className: 'full-width',
Expand All @@ -101,8 +104,11 @@ export function KeyValueField({
})}
</div>
),
({ focus, value, setValue, updateValue, ...props }) => (
<div className={readableFromFile ? 'bsl-col-md--5' : 'bsl-col-md--6'}>
({ focus, value, setValue, updateValue, index, ...props }) => (
<div
key={`key-value-field-value-${index}`}
className={readableFromFile ? 'bsl-col-md--5' : 'bsl-col-md--6'}
>
{input.value({
fullWidth: true,
className: 'value-input full-width',
Expand Down Expand Up @@ -131,8 +137,8 @@ export function KeyValueField({
})}
</div>
),
({ value, setValue, updateValue }) => (
<>
({ value, setValue, updateValue, index }) => (
<React.Fragment key={`read-file-button-${index}`}>
{readableFromFile ? (
<Button
onClick={() =>
Expand All @@ -151,7 +157,7 @@ export function KeyValueField({
{t('components.key-value-form.read-value')}
</Button>
) : null}
</>
</React.Fragment>
),
]}
actions={actions}
Expand Down
1 change: 0 additions & 1 deletion src/shared/components/MonacoEditorESM/Editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ export function Editor({
return (
<div
className="resource-form__wrapper"
{...rest}
style={{ height, minHeight: height }}
>
{loading ? (
Expand Down
5 changes: 3 additions & 2 deletions src/sidebar/CategoryItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
import { useTranslation } from 'react-i18next';
import { SetterOrUpdater, useRecoilValue } from 'recoil';
import { Category } from 'state/navigation/categories';
Expand Down Expand Up @@ -40,15 +41,15 @@ export function CategoryItem({
};

const children = category.items?.map(nn => (
<>
<React.Fragment key={nn.pathSegment}>
{nn.dataSources ? (
<DataSourcesContextProvider dataSources={nn.dataSources}>
<NavItem node={nn} key={nn.pathSegment} subItem={true} />
</DataSourcesContextProvider>
) : (
<NavItem node={nn} key={nn.pathSegment} subItem={true} />
)}
</>
</React.Fragment>
));

return (
Expand Down
Loading