contract file changes

Author: ci-bot

apps/remix-ide/src/app.ts

@@ -464,7 +464,7 @@ class AppComponent {
       scriptRunnerUI,
       remixAI,
       remixAiAssistant,
-      templateExplorerModal,
+      // templateExplorerModal,
       walletConnect
     ])
 
@@ -577,6 +577,7 @@ class AppComponent {
       openZeppelinProxy,
       run.recorder
     ])
+    this.engine.register([templateExplorerModal])
 
     this.layout.panels = {
       tabs: { plugin: tabProxy, active: true },

apps/remix-ide/src/app/components/status-bar.tsx

@@ -81,9 +81,17 @@ export class StatusBar extends Plugin<any, CustomRemixApi> implements StatusBarI
     this.on('settings', 'copilotChoiceChanged', (isAiActive: boolean) => {
       this.isAiActive = isAiActive
     })
+
+    this.checkTemplateExplorerModal()
     this.renderComponent()
   }
 
+  async checkTemplateExplorerModal() {
+    const check = await this.call('manager', 'isActive', 'templateexplorermodal')
+    if (!check) await this.call('manager', 'activatePlugin', 'templateexplorermodal')
+    console.log('check complete and template explorer modal is active')
+  }
+
   setDispatch(dispatch: React.Dispatch<any>) {
     this.dispatch = dispatch
   }

apps/remix-ide/src/app/components/top-bar.tsx

@@ -15,18 +15,20 @@ import { UpdateInfo } from 'libs/remix-ui/home-tab/src/lib/components/types/caro
 import { GitPlugin } from '../plugins/git'
 import { createWorkspace, deleteWorkspace, getWorkspaces, renameWorkspace, WorkspaceType } from 'libs/remix-ui/workspace/src/lib/actions'
 import { Registry } from '@remix-project/remix-lib'
+import { ViewPlugin } from '@remixproject/engine-web'
 
 const TopBarProfile = {
   name: 'topbar',
   displayName: 'Top Bar',
   description: '',
   version: packageJson.version,
   icon: '',
+  location: 'mainPanel',
   methods: ['getWorkspaces', 'createWorkspace', 'renameWorkspace', 'deleteWorkspace', 'getCurrentWorkspace', 'setWorkspace'],
   events: ['setWorkspace', 'workspaceRenamed', 'workspaceDeleted', 'workspaceCreated'],
 }
 
-export class Topbar extends Plugin {
+export class Topbar extends ViewPlugin {
   dispatch: React.Dispatch<any> = () => { }
   appStateDispatch: React.Dispatch<AppAction> = () => { }
   htmlElement: HTMLDivElement

apps/remix-ide/src/app/plugins/remix-template-explorer-modal.tsx

@@ -5,16 +5,25 @@ import { PluginViewWrapper } from '@remix-ui/helper'
 import { Plugin } from '@remixproject/engine'
 import { EventEmitter } from 'events'
 import { ThemeModule } from '../tabs/theme-module'
+import * as packageJson from '../../../../../package.json'
 import { TemplateExplorerProvider } from 'libs/remix-ui/template-explorer-modal/context/template-explorer-context'
+import { ViewPlugin } from '@remixproject/engine-web'
 
 const pluginProfile = {
-  name: 'remix-template-explorer-modal',
-  displayName: 'Remix Generic Modal',
-  description: 'Remix Generic Modal for every type of content meant for a modal',
-  methods: ['openModal']
+  name: 'templateexplorermodal',
+  displayName: 'Template Explorer Modal',
+  description: 'Template Explorer Modal',
+  methods: ['openModal'],
+  events: [],
+  maintainedBy: 'Remix',
+  kind: 'templateexplorermodal',
+  location: 'mainPanel',
+  version: packageJson.version,
+  permission: true,
+  documentation: 'https://remix-ide.readthedocs.io/en/latest/template-explorer-modal.html'
 }
 
-export class TemplateExplorerModalPlugin extends Plugin {
+export class TemplateExplorerModalPlugin extends ViewPlugin {
   element: HTMLDivElement
   dispatch: React.Dispatch<any> = () => { }
   event: any
@@ -30,13 +39,18 @@ export class TemplateExplorerModalPlugin extends Plugin {
   }
 
   async onActivation(): Promise<void> {
+    console.trace()
     this.on('theme', 'themeChanged', (theme: any) => {
       this.theme = theme
     })
   }
 
+  openModal() {
+    console.log('This is openModal')
+  }
+
   onDeactivation(): void {
-    this.element.remove()
+
   }
 
   setDispatch(dispatch: React.Dispatch<any>) {
@@ -58,13 +72,14 @@ export class TemplateExplorerModalPlugin extends Plugin {
 
   renderComponent(): void {
     this.dispatch({
-      plugins: this,
+      ...this
     })
   }
 
-  updateComponent() {
+  updateComponent(state: any) {
+    console.log('what is state', state)
     return (
-      <TemplateExplorerProvider plugin={this} />
+      <TemplateExplorerProvider plugin={state} />
     )
   }
 }

libs/remix-ui/app/src/lib/remix-app/remix-app.tsx

@@ -55,7 +55,7 @@ const RemixApp = (props: IRemixAppUi) => {
       cancelFn: () => { },
       width: '720px',
       height: '720px',
-      showModal: true
+      showModal: false
     }
   })
 
@@ -228,7 +228,8 @@ const RemixApp = (props: IRemixAppUi) => {
             <AppDialogs></AppDialogs>
             <DialogViewPlugin></DialogViewPlugin>
             {appState.genericModalState.showModal &&
-              <TemplateExplorerProvider plugin={props.app.templateExplorerModal}></TemplateExplorerProvider>
+              // <TemplateExplorerProvider plugin={props.app.templateExplorerModal}></TemplateExplorerProvider>
+              props.app.templateExplorerModal.render()
             }
           </AppProvider>
         </onLineContext.Provider>

libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx

@@ -83,7 +83,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     })
   }
 
-  function openGenericModal(event): void {
+  async function openGenericModal(event): Promise<void> {
     appContext.appStateDispatch({
       type: appActionTypes.showGenericModal,
       payload: true

libs/remix-ui/template-explorer-modal/src/lib/remix-ui-template-explorer-modal.tsx

@@ -25,7 +25,7 @@ export function RemixUiTemplateExplorerModal (props: RemixUiTemplateExplorerModa
       <section className="template-explorer-modal-background" style={{ zIndex: 8888 }}>
         <div className="template-explorer-modal-container border bg-dark p-2" style={{ width: props.appState.genericModalState.width, height: props.appState.genericModalState.height }}>
           <div className="template-explorer-modal-close-container bg-dark mb-3 w-100 d-flex flex-row justify-content-between align-items-center">
-            {state.wizardStep === 'template' ? <div className="d-flex flex-row gap-2 w-100 mx-3 my-2">
+            {state.wizardStep === 'template' || state.wizardStep === 'reset' ? <div className="d-flex flex-row gap-2 w-100 mx-3 my-2">
               <input
                 type="text"
                 placeholder="Search"
@@ -49,6 +49,12 @@ export function RemixUiTemplateExplorerModal (props: RemixUiTemplateExplorerModa
             <button className="template-explorer-modal-close-button" onClick={() => props.dispatch({ type: appActionTypes.showGenericModal, payload: false })}>
               <i className="fa-solid fa-xmark text-dark"></i>
             </button>
+            <button className="template-explorer-modal-close-button" onClick={async () => {
+              const result = await props.plugin.call('remix-templates', 'getTemplate', 'remixDefault')
+              console.log('what is result', result)
+            }}>
+              <i className="fa-solid fa-plus text-dark"></i>
+            </button>
           </div>
           {state.wizardStep === 'template' || state.wizardStep === 'reset' ? <TemplateExplorerBody plugin={props.plugin} /> : null}
           {state.wizardStep === 'generic' ? <GenericWorkspaceTemplate /> : null}