From ceb5496f4d6a6d14e2e330b9ba2edf910a5a187c Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Thu, 9 Sep 2021 19:05:02 +0200 Subject: [PATCH 1/6] fix whitespaces and canactivate --- .../plugin-manager/src/lib/components/LocalPluginForm.tsx | 7 ++++--- libs/remix-ui/plugin-manager/src/types.d.ts | 1 + 2 files changed, 5 insertions(+), 3 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 6e768a935e..d7cfe920ff 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx @@ -5,7 +5,7 @@ import { Toaster } from '@remix-ui/toaster' import { IframePlugin, WebsocketPlugin } from '@remixproject/engine-web' import { localPluginReducerActionType, localPluginToastReducer } from '../reducers/pluginManagerReducer' -import { FormStateProps, PluginManagerComponent } from '../../types' +import { canActivate, FormStateProps, PluginManagerComponent } from '../../types' interface LocalPluginFormProps { closeModal: () => void @@ -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..ffe425c473 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 & { From b2d25148dbe1656f35d0395497d9d381e7572c4f Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Thu, 9 Sep 2021 19:06:58 +0200 Subject: [PATCH 2/6] lint --- .../plugin-manager/src/lib/components/LocalPluginForm.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d7cfe920ff..428402d266 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx @@ -20,7 +20,8 @@ const initialState: FormStateProps = { type: 'iframe', hash: '', methods: [], - location: 'sidePanel' + location: 'sidePanel', + canActivate: [] } const defaultProfile = { From 04a121a3652994f24f257d2c787f4ba221988b7a Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Thu, 9 Sep 2021 19:07:53 +0200 Subject: [PATCH 3/6] rm type --- .../plugin-manager/src/lib/components/LocalPluginForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 428402d266..c6762a5161 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx @@ -5,7 +5,7 @@ import { Toaster } from '@remix-ui/toaster' import { IframePlugin, WebsocketPlugin } from '@remixproject/engine-web' import { localPluginReducerActionType, localPluginToastReducer } from '../reducers/pluginManagerReducer' -import { canActivate, FormStateProps, PluginManagerComponent } from '../../types' +import { FormStateProps, PluginManagerComponent } from '../../types' interface LocalPluginFormProps { closeModal: () => void From cb86d9b5ad2123c2707c7fd8685d1d5ae213ebd8 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 13 Sep 2021 11:00:27 +0200 Subject: [PATCH 4/6] Update types.d.ts --- libs/remix-ui/plugin-manager/src/types.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/remix-ui/plugin-manager/src/types.d.ts b/libs/remix-ui/plugin-manager/src/types.d.ts index ffe425c473..e907c41f71 100644 --- a/libs/remix-ui/plugin-manager/src/types.d.ts +++ b/libs/remix-ui/plugin-manager/src/types.d.ts @@ -178,9 +178,9 @@ export interface FormStateProps { url: string type: 'iframe' | 'ws' hash: string - methods: any + methods: string[] location: string - canActivate: any + canActivate: string[] } export type PluginManagerProfile = Profile & { From 09a73eaabb6ccff928e6f3233c9c97731fd26e04 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 13 Sep 2021 14:31:31 +0200 Subject: [PATCH 5/6] fix arrays --- .../plugin-manager/src/lib/components/LocalPluginForm.tsx | 5 +++-- 1 file changed, 3 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 c6762a5161..89c220e3f3 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx @@ -6,6 +6,7 @@ import { IframePlugin, WebsocketPlugin } from '@remixproject/engine-web' import { localPluginReducerActionType, localPluginToastReducer } from '../reducers/pluginManagerReducer' import { FormStateProps, PluginManagerComponent } from '../../types' +import { isArray } from 'util' interface LocalPluginFormProps { closeModal: () => void @@ -49,10 +50,10 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor setName(storagePlugin.name) setUrl(storagePlugin.url) setLocation(storagePlugin.location as 'sidePanel' | 'mainPanel' | 'none') - setMethods(storagePlugin.methods) + setMethods(isArray(storagePlugin.methods) ? storagePlugin.methods.join(',') : storagePlugin.methods) setType(storagePlugin.type) setDisplayName(storagePlugin.displayName) - setCanactivate(storagePlugin.canActivate) + setCanactivate(isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate) }, []) const handleModalOkClick = async () => { From a69a392c39d8f1d9edd44b373fd26d604dd5400f Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 13 Sep 2021 14:59:52 +0200 Subject: [PATCH 6/6] fix using isArray --- .../plugin-manager/src/lib/components/LocalPluginForm.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 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 89c220e3f3..44ba3de3c2 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx @@ -6,7 +6,6 @@ import { IframePlugin, WebsocketPlugin } from '@remixproject/engine-web' import { localPluginReducerActionType, localPluginToastReducer } from '../reducers/pluginManagerReducer' import { FormStateProps, PluginManagerComponent } from '../../types' -import { isArray } from 'util' interface LocalPluginFormProps { closeModal: () => void @@ -50,10 +49,10 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor setName(storagePlugin.name) setUrl(storagePlugin.url) setLocation(storagePlugin.location as 'sidePanel' | 'mainPanel' | 'none') - setMethods(isArray(storagePlugin.methods) ? storagePlugin.methods.join(',') : storagePlugin.methods) + setMethods(Array.isArray(storagePlugin.methods) ? storagePlugin.methods.join(',') : storagePlugin.methods) setType(storagePlugin.type) setDisplayName(storagePlugin.displayName) - setCanactivate(isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate) + setCanactivate(Array.isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate) }, []) const handleModalOkClick = async () => {