fixes for localplugin toast

pull/1344/head
joseph izang 3 years ago
parent 90cb475aef
commit 74a9a43a8c
  1. 2
      apps/remix-ide-e2e/src/tests/pluginManager.spec.ts
  2. 20
      libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx
  3. 12
      libs/remix-ui/plugin-manager/src/pluginManagerReducer.ts

@ -131,7 +131,7 @@ module.exports = {
.clearValue('*[data-id="localPluginUrl"]').setValue('*[data-id="localPluginUrl"]', testData.pluginUrl)
.click('*[data-id="localPluginRadioButtoniframe"]')
.click('*[data-id="localPluginRadioButtonsidePanel"]')
.click('*[data-id="pluginManagerLocalPluginModalDialogModalDialogModalFooter-react"]')
.click('*[data-id="pluginManagerLocalPluginModalDialog-modal-footer-ok-react"]')
// .modalFooterOKClick()
.pause(5000)
.waitForElementVisible('*[data-shared="tooltipPopup"]')

@ -1,9 +1,10 @@
/* eslint-disable no-debugger */
import React, { useState } from 'react'
import React, { Dispatch, useReducer } from 'react'
import { ModalDialog } from '@remix-ui/modal-dialog'
import { Toaster } from '@remix-ui/toaster'
import { IframePlugin, WebsocketPlugin } from '@remixproject/engine-web'
import { FormStateProps, PluginManagerComponent } from '../../types'
import { localPluginReducerActionType, localPluginToastReducer } from '../../pluginManagerReducer'
interface LocalPluginFormProps {
changeHandler: (propertyName: string, value: any) => void
@ -13,7 +14,8 @@ interface LocalPluginFormProps {
pluginManager: PluginManagerComponent
}
const handleModalOkClick = async (pluginManager: PluginManagerComponent, plugin: FormStateProps, setErrorMsg: React.Dispatch<React.SetStateAction<string>>) => {
const handleModalOkClick = async (pluginManager: PluginManagerComponent, plugin: FormStateProps,
toastDispatcher: Dispatch<localPluginReducerActionType>) => {
try {
const profile = JSON.parse(localStorage.getItem('plugins/local'))
if (profile && profile.profile && Object.keys(profile).length > 0) {
@ -28,7 +30,6 @@ const handleModalOkClick = async (pluginManager: PluginManagerComponent, plugin:
const localPlugin = plugin.type === 'iframe' ? new IframePlugin(plugin) : new WebsocketPlugin(plugin)
localPlugin.profile.hash = `local-${plugin.name}`
// <-------------------------------- Plumbing starts here --------------------------------------->
const targetPlugin = {
name: localPlugin.profile.name,
displayName: localPlugin.profile.displayName,
@ -45,13 +46,14 @@ const handleModalOkClick = async (pluginManager: PluginManagerComponent, plugin:
localPlugin.profile = { ...localPlugin.profile, ...targetPlugin }
pluginManager.activateAndRegisterLocalPlugin(localPlugin)
} catch (error) {
console.error(error)
console.log(error)
// setErrorMsg(error.message)
setErrorMsg(error.message)
const action: localPluginReducerActionType = { type: 'show', payload: `${error.message}` }
toastDispatcher(action)
}
}
function LocalPluginForm ({ changeHandler, plugin, closeModal, visible, pluginManager }: LocalPluginFormProps) {
const [errorMsg, setErrorMsg] = useState('')
const [errorMsg, dispatchToastMsg] = useReducer(localPluginToastReducer, '')
return (
<><ModalDialog
@ -60,7 +62,7 @@ function LocalPluginForm ({ changeHandler, plugin, closeModal, visible, pluginMa
hide={visible}
title="Local Plugin"
okLabel="OK"
okFn={() => handleModalOkClick(pluginManager, plugin, setErrorMsg) }
okFn={() => handleModalOkClick(pluginManager, plugin, dispatchToastMsg) }
cancelLabel="Cancel"
cancelFn={closeModal}
>
@ -173,7 +175,9 @@ function LocalPluginForm ({ changeHandler, plugin, closeModal, visible, pluginMa
</div>
</div>
</form>
</ModalDialog><Toaster message={`Cannot create Plugin : ${errorMsg}`} timeOut={10000} /></>
</ModalDialog>
{errorMsg ? <Toaster message={errorMsg} timeOut={3000} /> : null}
</>
)
}

@ -0,0 +1,12 @@
export type localPluginReducerActionType = {
type: 'show' | 'close',
payload?: any
}
export function localPluginToastReducer (currentState: string, toastAction: localPluginReducerActionType) {
switch (toastAction.type) {
case 'show':
return `Cannot create Plugin : ${toastAction.payload!}`
}
}
Loading…
Cancel
Save