matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MRF management

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-09-09 08:46:39 +02:00
parent d1676da2fc
commit 8b566d3bf7
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/pl-fe/src/actions/mrf.ts
View File

@ -1,5 +1,3 @@
import { Set as ImmutableSet } from 'immutable';
import ConfigDB from 'pl-fe/utils/config-db';
import { fetchConfig, updateConfig } from './admin';
@ -11,11 +9,15 @@ const simplePolicyMerge = (simplePolicy: MRFSimple, host: string, restrictions:
const entries = Object.entries(simplePolicy).map(([key, hosts]) => {
const isRestricted = restrictions[key];
const set = new Set(hosts);
if (isRestricted) {
return [key, ImmutableSet(hosts).add(host).toJS()];
set.add(host);
} else {
return [key, ImmutableSet(hosts).delete(host).toJS()];
set.delete(host);
}
return [key, [...set]];
});
return Object.fromEntries(entries);
@ -23,13 +25,12 @@ const simplePolicyMerge = (simplePolicy: MRFSimple, host: string, restrictions:
const updateMrf = (host: string, restrictions: Record<string, any>) =>
(dispatch: AppDispatch, getState: () => RootState) =>
dispatch(fetchConfig())
.then(() => {
const configs = getState().admin.get('configs');
const simplePolicy = ConfigDB.toSimplePolicy(configs);
const merged = simplePolicyMerge(simplePolicy, host, restrictions);
const config = ConfigDB.fromSimplePolicy(merged);
return dispatch(updateConfig(config));
});
dispatch(fetchConfig()).then(() => {
const configs = getState().admin.get('configs');
const simplePolicy = ConfigDB.toSimplePolicy(configs);
const merged = simplePolicyMerge(simplePolicy, host, restrictions);
const config = ConfigDB.fromSimplePolicy(merged);
return dispatch(updateConfig(config));
});
export { updateMrf };

2
packages/pl-fe/src/utils/config-db.ts
View File

@ -37,7 +37,7 @@ const toSimplePolicy = (configs: ImmutableList<Config>): MRFSimple => {
};
const fromSimplePolicy = (simplePolicy: Policy)=> {
const mapper = ([key, hosts]: [key: string, hosts: ImmutableList<string>]) => ({ tuple: [`:${key}`, hosts.toJS()] });
const mapper = ([key, hosts]: [key: string, hosts: ImmutableList<string>]) => ({ tuple: [`:${key}`, hosts] });
const value = Object.entries(simplePolicy).map(mapper);