Loading...
: null}
{!toggleExpander && !loading ? (
- {state.replaceEnabled?
replace()} className='btn btn-secondary btn-block mb-2 btn-sm'>Replace all
:null}
+ {state.replaceEnabled?
+
+
replace()} className='btn btn-secondary mb-2 btn-sm'>Replace all
+
+ :null}
{lines.map((line, index) => (
index < state.maxLines ?
{
+ dispatch({
+ type: 'SET_CURRENT_FILE',
+ payload: file
+ })
+ },
+ setCurrentWorkspace: (workspace: any) => {
+ dispatch({
+ type: 'SET_CURRENT_WORKSPACE',
+ payload: workspace
+ })
+ },
updateCount: (count: number, file: string) => {
dispatch({
type: 'UPDATE_COUNT',
@@ -212,6 +224,16 @@ export const SearchProvider = ({
)
setUndoState(content, replaced, result.path)
},
+ setUndoEnabled: (path:string, workspace: string, content: string) => {
+ dispatch({
+ type: 'SET_UNDO_ENABLED',
+ payload: {
+ path,
+ workspace,
+ content
+ }
+ })
+ },
undoReplace: async (buffer: undoBufferRecord) => {
const content = await plugin.call(
'fileManager',
@@ -219,9 +241,7 @@ export const SearchProvider = ({
buffer.path
)
if (buffer.newContent !== content) {
- value.clearUndo()
throw new Error('Can not undo replace, file has been changed.')
-
}
await plugin.call(
'fileManager',
@@ -234,7 +254,6 @@ export const SearchProvider = ({
'open',
buffer.path
)
- value.clearUndo()
},
clearUndo: () => {
dispatch ({
@@ -251,13 +270,20 @@ export const SearchProvider = ({
}
useEffect(() => {
- plugin.on('filePanel', 'setWorkspace', () => {
+ plugin.on('filePanel', 'setWorkspace', async (workspace) => {
value.setSearchResults(null)
value.clearUndo()
+ value.setCurrentWorkspace(workspace.name)
})
plugin.on('fileManager', 'fileSaved', async file => {
await reloadStateForFile(file)
+ await checkUndoState(file)
+ })
+ plugin.on('fileManager', 'currentFileChanged', async file => {
+ value.setCurrentFile(file)
+ await checkUndoState(file)
})
+
return () => {
plugin.off('fileManager', 'fileChanged')
plugin.off('filePanel', 'setWorkspace')
@@ -276,13 +302,28 @@ export const SearchProvider = ({
return results
}
+ const checkUndoState = async (path: string) => {
+ if (!plugin) return
+ try {
+ const content = await plugin.call(
+ 'fileManager',
+ 'readFile',
+ path
+ )
+ const workspace = await plugin.call('filePanel', 'getCurrentWorkspace')
+ value.setUndoEnabled(path, workspace.name, content)
+ } catch (e) {
+ console.log(e)
+ }
+ }
+
const setUndoState = async (oldContent: string, newContent: string, path: string) => {
const workspace = await plugin.call('filePanel', 'getCurrentWorkspace')
const undo = {
oldContent,
newContent,
path,
- workspace
+ workspace: workspace.name
}
dispatch({
type: 'SET_UNDO',
diff --git a/libs/remix-ui/search/src/lib/reducers/Reducer.ts b/libs/remix-ui/search/src/lib/reducers/Reducer.ts
index b40d8ab4c6..3e188f61fb 100644
--- a/libs/remix-ui/search/src/lib/reducers/Reducer.ts
+++ b/libs/remix-ui/search/src/lib/reducers/Reducer.ts
@@ -41,15 +41,25 @@ export const SearchReducer = (state: SearchState = SearchingInitialState, action
searchResults: action.payload,
count: 0
}
+ case 'SET_UNDO_ENABLED':
+ if(state.undoBuffer[`${action.payload.workspace}/${action.payload.path}`]){
+ state.undoBuffer[`${action.payload.workspace}/${action.payload.path}`].enabled = (action.payload.content === state.undoBuffer[`${action.payload.workspace}/${action.payload.path}`].newContent)
+ state.undoBuffer[`${action.payload.workspace}/${action.payload.path}`].visible = (action.payload.content !== state.undoBuffer[`${action.payload.workspace}/${action.payload.path}`].oldContent)
+ }
+ return {
+ ...state,
+ }
case 'SET_UNDO': {
const undoState = {
newContent : action.payload.newContent,
oldContent: action.payload.oldContent,
path: action.payload.path,
workspace: action.payload.workspace,
- timeStamp: Date.now()
+ timeStamp: Date.now(),
+ enabled: true,
+ visible: true
}
- state.undoBuffer = [undoState]
+ state.undoBuffer[`${undoState.workspace}/${undoState.path}`] = undoState
return {
...state,
}
@@ -120,6 +130,16 @@ export const SearchReducer = (state: SearchState = SearchingInitialState, action
return {
...state,
}
+ case 'SET_CURRENT_FILE':
+ return {
+ ...state,
+ currentFile: action.payload,
+ }
+ case 'SET_CURRENT_WORKSPACE':
+ return {
+ ...state,
+ workspace: action.payload,
+ }
case 'RELOAD_FILE':
if (state.searchResults) {
const findFile = state.searchResults.find(file => file.filename === action.payload)
diff --git a/libs/remix-ui/search/src/lib/search.css b/libs/remix-ui/search/src/lib/search.css
index 1b88368bc8..acc789d51c 100644
--- a/libs/remix-ui/search/src/lib/search.css
+++ b/libs/remix-ui/search/src/lib/search.css
@@ -121,4 +121,16 @@
display: flex !important;
align-items: center;
cursor: pointer !important;
+}
+
+.search_plugin_wrap_summary_replace {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-end;
+}
+
+.undo-button {
+ white-space: pre;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
\ No newline at end of file
diff --git a/libs/remix-ui/search/src/lib/types/index.ts b/libs/remix-ui/search/src/lib/types/index.ts
index aa11435099..231c4ebf93 100644
--- a/libs/remix-ui/search/src/lib/types/index.ts
+++ b/libs/remix-ui/search/src/lib/types/index.ts
@@ -40,9 +40,10 @@ export interface undoBufferRecord {
path: string,
newContent: string,
timeStamp: number,
- oldContent: string
+ oldContent: string,
+ enabled: boolean,
+ visible: boolean
}
-
export interface SearchState {
find: string,
searchResults: SearchResult[],
@@ -60,7 +61,9 @@ export interface SearchState {
maxFiles: number,
maxLines: number
clipped: boolean,
- undoBuffer: undoBufferRecord[],
+ undoBuffer: Record[],
+ currentFile: string,
+ workspace: string
}
export const SearchingInitialState: SearchState = {
@@ -80,5 +83,7 @@ export const SearchingInitialState: SearchState = {
maxFiles: 5000,
maxLines: 5000,
clipped: false,
- undoBuffer: null
+ undoBuffer: null,
+ currentFile: '',
+ workspace: ''
}
\ No newline at end of file