From bce85ef018837a8e3000cd7825fdb886300438b4 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Thu, 9 Sep 2021 19:02:38 +0200 Subject: [PATCH] rm whitespace and store canactivate --- .../plugin-manager/src/lib/components/LocalPluginForm.tsx | 5 +++-- libs/remix-ui/plugin-manager/src/types.d.ts | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx index ebd95c025c..d7cfe920ff 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx @@ -51,6 +51,7 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor setMethods(storagePlugin.methods) setType(storagePlugin.type) setDisplayName(storagePlugin.displayName) + setCanactivate(storagePlugin.canActivate) }, []) const handleModalOkClick = async () => { @@ -61,7 +62,7 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor } if (!location) throw new Error('Plugin should have a location') if (!url) throw new Error('Plugin should have an URL') - const newMethods = typeof methods === 'string' ? methods.split(',').filter(val => val) : [] + const newMethods = typeof methods === 'string' ? methods.split(',').filter(val => val).map(val => { return val.trim() }) : [] const targetPlugin = { name: name, displayName: displayName, @@ -75,7 +76,7 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor type: type, location: location, icon: 'assets/img/localPlugin.webp', - canActivate: typeof canactivate === 'string' ? canactivate.split(',').filter(val => val) : [] + canActivate: typeof canactivate === 'string' ? canactivate.split(',').filter(val => val).map(val => { return val.trim() }) : [] } const localPlugin = type === 'iframe' ? new IframePlugin(initialState) : new WebsocketPlugin(initialState) localPlugin.profile.hash = `local-${name}` diff --git a/libs/remix-ui/plugin-manager/src/types.d.ts b/libs/remix-ui/plugin-manager/src/types.d.ts index 4e8326832e..37ce6f659c 100644 --- a/libs/remix-ui/plugin-manager/src/types.d.ts +++ b/libs/remix-ui/plugin-manager/src/types.d.ts @@ -180,6 +180,7 @@ export interface FormStateProps { hash: string methods: any location: string + canActivate?: any } export type PluginManagerProfile = Profile & {