fixed .deps unfolded when AI generation is done or when resolving a contract's imports

Author: STetsing

apps/remix-ide/src/app/plugins/remixAIPlugin.tsx

@@ -187,7 +187,6 @@ export class RemixAIPlugin extends Plugin {
     params.stream_result = false // enforce no stream result
     params.threadId = newThreadID
     params.provider = this.assistantProvider
-    userPrompt = userPrompt + " while specifying the library github tag in the imports"
     _paq.push(['trackEvent', 'ai', 'remixAI', 'GenerateNewAIWorkspace'])
 
     if (useRag) {

libs/remix-ui/workspace/src/lib/reducers/workspace.ts

@@ -337,8 +337,8 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
 
     const check = checkCurrentParentPathInView(payload, state.mode === 'browser' ? state.browser.expandPath : state.localhost.expandPath)
     const fd = fileAdded(state, payload)
-    const browserExpandPath = state.mode === 'browser' && !isElectron() && check.inView ? [...new Set([...state.browser.expandPath, payload])] : state.browser.expandPath
-    const localhostExpandPath = state.mode === 'localhost' && check.inView ? [...new Set([...state.localhost.expandPath, payload])] : state.localhost.expandPath
+    const browserExpandPath = state.mode === 'browser' && !isElectron() && check.inView && !payload.includes('.deps') ? [...new Set([...state.browser.expandPath, payload])] : state.browser.expandPath
+    const localhostExpandPath = state.mode === 'localhost' && check.inView && !payload.includes('.deps') ? [...new Set([...state.localhost.expandPath, payload])] : state.localhost.expandPath
     const flatTree = flattenTree(fd, state.mode === 'browser'? browserExpandPath : localhostExpandPath)
     return {
       ...state,
@@ -373,8 +373,8 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
     const inView = check.inView || check.rootViewToAdd
     payload.folderPath = check.inView ? payload.folderPath : check.rootViewToAdd ? check.rootFolder : ''
 
-    const browserExpandPath = state.mode === 'browser' && !isElectron() && inView ? [...new Set([...state.browser.expandPath, payload.folderPath])] : state.browser.expandPath
-    const localhostExpandPath = state.mode === 'localhost' && inView ? [...new Set([...state.localhost.expandPath, payload.folderPath])] : state.localhost.expandPath
+    const browserExpandPath = state.mode === 'browser' && !isElectron() && inView && !payload.folderPath.includes('.deps') ? [...new Set([...state.browser.expandPath, payload.folderPath])] : state.browser.expandPath
+    const localhostExpandPath = state.mode === 'localhost' && inView && !payload.folderPath.includes('.deps') ? [...new Set([...state.localhost.expandPath, payload.folderPath])] : state.localhost.expandPath
     const flatTree = flattenTree(fd, state.mode === 'browser'? browserExpandPath : localhostExpandPath)
     return {
       ...state,

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

@@ -659,15 +659,15 @@ export function Workspace() {
 
   const uploadFile = (target) => {
     const parentFolder = getFocusedFolder()
-    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder])]
+    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder].filter(path => !path.includes('.deps')))]
 
     global.dispatchHandleExpandPath(expandPath)
     global.dispatchUploadFile(target, parentFolder)
   }
 
   const uploadFolder = (target) => {
     const parentFolder = getFocusedFolder()
-    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder])]
+    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder].filter(path => !path.includes('.deps')))]
 
     global.dispatchHandleExpandPath(expandPath)
     global.dispatchUploadFolder(target, parentFolder)
@@ -810,7 +810,7 @@ export function Workspace() {
 
   const handleNewFileInput = async (parentFolder?: string) => {
     if (!parentFolder) parentFolder = getFocusedFolder()
-    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder])]
+    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder].filter(path => !path.includes('.deps')))]
 
     await global.dispatchAddInputField(parentFolder, 'file')
     global.dispatchHandleExpandPath(expandPath)
@@ -820,7 +820,7 @@ export function Workspace() {
   const handleNewFolderInput = async (parentFolder?: string) => {
     if (!parentFolder) parentFolder = getFocusedFolder()
     else if (parentFolder.indexOf('.sol') !== -1 || parentFolder.indexOf('.js') !== -1) parentFolder = extractParentFromKey(parentFolder)
-    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder])]
+    const expandPath = [...new Set([...global.fs.browser.expandPath, parentFolder].filter(path => !path.includes('.deps')))]
 
     await global.dispatchAddInputField(parentFolder, 'folder')
     global.dispatchHandleExpandPath(expandPath)