forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-07-20 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move settings from store to another context

Browse Source
This commit is contained in:
Alejandro Celaya
2023-07-23 18:30:59 +02:00
parent dddbc232c2
commit b3122219be
37 changed files with 293 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/MenuLayout.tsx
View File

@@ -2,18 +2,19 @@ import type { FC } from 'react';
import { useEffect } from 'react';
import { isReachableServer } from '../servers/data';
import { withSelectedServer } from '../servers/helpers/withSelectedServer';
import type { ShlinkWebComponentType } from '../shlink-web-component';
import { ShlinkWebComponent } from '../shlink-web-component';
import type { Settings } from '../shlink-web-component/utils/settings';
import './MenuLayout.scss';
interface MenuLayoutProps {
sidebarPresent: Function;
sidebarNotPresent: Function;
settings: Settings;
}
export const MenuLayout = (
ServerError: FC,
ShlinkWebComponent: ShlinkWebComponentType,
) => withSelectedServer<MenuLayoutProps>(({ selectedServer, sidebarNotPresent, sidebarPresent }) => {
) => withSelectedServer<MenuLayoutProps>(({ selectedServer, sidebarNotPresent, sidebarPresent, settings }) => {
const showContent = isReachableServer(selectedServer);
useEffect(() => {
@@ -28,6 +29,7 @@ export const MenuLayout = (
return (
<ShlinkWebComponent
serverVersion={selectedServer.version}
settings={settings}
routesPrefix={`/server/${selectedServer.id}`}
/>
);

7
src/common/services/provideServices.ts
View File

@@ -31,8 +31,11 @@ export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
bottle.decorator('Home', withoutSelectedServer);
bottle.decorator('Home', connect(['servers'], ['resetSelectedServer']));
bottle.serviceFactory('MenuLayout', MenuLayout, 'ServerError', 'ShlinkWebComponent');
bottle.decorator('MenuLayout', connect(['selectedServer'], ['selectServer', 'sidebarPresent', 'sidebarNotPresent']));
bottle.serviceFactory('MenuLayout', MenuLayout, 'ServerError');
bottle.decorator('MenuLayout', connect(
['selectedServer', 'settings'],
['selectServer', 'sidebarPresent', 'sidebarNotPresent'],
));
bottle.serviceFactory('ShlinkVersionsContainer', () => ShlinkVersionsContainer);
bottle.decorator('ShlinkVersionsContainer', connect(['selectedServer', 'sidebar']));