diff --git a/web/src/components/CommitModalButton/CommitModalButton.tsx b/web/src/components/CommitModalButton/CommitModalButton.tsx index 20d2056f0..1d8306a57 100644 --- a/web/src/components/CommitModalButton/CommitModalButton.tsx +++ b/web/src/components/CommitModalButton/CommitModalButton.tsx @@ -52,6 +52,7 @@ interface CommitModalButtonProps extends Omit void } @@ -63,6 +64,7 @@ export const CommitModalButton: React.FC = ({ commitTitlePlaceHolder, oldResourcePath, payload = '', + sha, onSuccess, ...props }) => { @@ -82,7 +84,8 @@ export const CommitModalButton: React.FC = ({ { action: commitAction, path: oldResourcePath || resourcePath, - payload: `${oldResourcePath ? `file://${resourcePath}\n` : ''}${payload}` + payload: `${oldResourcePath ? `file://${resourcePath}\n` : ''}${payload}`, + sha // encoding: 'base64', // payload: window.btoa(payload || '') } diff --git a/web/src/pages/RepositoryFileEdit/FileEditor/FileEditor.tsx b/web/src/pages/RepositoryFileEdit/FileEditor/FileEditor.tsx index 40be7ce33..07681a5cf 100644 --- a/web/src/pages/RepositoryFileEdit/FileEditor/FileEditor.tsx +++ b/web/src/pages/RepositoryFileEdit/FileEditor/FileEditor.tsx @@ -179,9 +179,10 @@ function Editor({ oldResourcePath={commitAction === GitCommitAction.MOVE ? resourcePath : undefined} resourcePath={fileResourcePath} payload={content} + sha={resourceContent.sha} onSuccess={(_data, newBranch) => { history.replace( - routes.toCODERepositoryFileEdit({ + routes.toCODERepository({ repoPath: repoMetadata.path as string, resourcePath: fileResourcePath, gitRef: newBranch || gitRef