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

(feat) O3-4277: Enable app-specific SWRConfig #1253

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

(feat) O3-4277: Enable app-specific SWRConfig #1253

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f4d97f
extend ComponentDecoratorOptions to include serConfig
Twiineenock Dec 30, 2024
295e06e
fix swrConfig type
github-actions[bot] Jan 6, 2025
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
8 changes: 5 additions & 3 deletions packages/framework/esm-react-utils/src/openmrsComponentDecorator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export interface ComponentDecoratorOptions {
featureName: string;
disableTranslations?: boolean;
strictMode?: boolean;
swrConfig?: Partial<typeof defaultSwrConfig>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should really be Partial<Omit<SWRConfig, 'fetcher'>>, I think, or something similar.

}

export interface OpenmrsReactComponentProps {
Expand All @@ -52,7 +53,7 @@ export function openmrsComponentDecorator<T>(userOpts: ComponentDecoratorOptions
throw new Error('Invalid options');
}

const opts = Object.assign({}, defaultOpts, userOpts);
const opts = { ...defaultOpts, ...userOpts };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this non-functional change?


return function decorateComponent(Comp: ComponentType<T>): ComponentType<T> {
return class OpenmrsReactComponent extends React.Component<
Expand Down Expand Up @@ -98,9 +99,10 @@ export function openmrsComponentDecorator<T>(userOpts: ComponentDecoratorOptions
// TO-DO have a UX designed for when a catastrophic error occurs
return <div>An error has occurred. Please try reloading the page.</div>;
} else {
const swrConfig = { ...defaultSwrConfig, ...opts.swrConfig };
const content = (
<Suspense fallback={null}>
<SWRConfig value={defaultSwrConfig}>
<SWRConfig value={swrConfig}>
<ComponentContext.Provider value={this.state.config}>
{opts.disableTranslations ? (
<Comp {...this.props} />
Expand All @@ -120,7 +122,7 @@ export function openmrsComponentDecorator<T>(userOpts: ComponentDecoratorOptions
</SWRConfig>
</Suspense>
);

if (!opts.strictMode || !React.StrictMode) {
return content;
} else {
Expand Down
Loading