Merge branch 'master' into multiselect-dragdrop

pull/5370/head
Joseph Izang 8 months ago committed by GitHub
commit 31ca9889de
  1. 19
      libs/remix-ui/statusbar/src/lib/components/gitStatus.tsx

@ -1,4 +1,4 @@
import React, { useEffect, Dispatch } from 'react' import React, { useEffect, Dispatch, useState } from 'react'
// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
import { StatusBar } from 'apps/remix-ide/src/app/components/status-bar' import { StatusBar } from 'apps/remix-ide/src/app/components/status-bar'
import '../../css/statusbar.css' import '../../css/statusbar.css'
@ -11,10 +11,12 @@ export interface GitStatusProps {
} }
export default function GitStatus({ plugin, gitBranchName, setGitBranchName }: GitStatusProps) { export default function GitStatus({ plugin, gitBranchName, setGitBranchName }: GitStatusProps) {
const [isLocalHost, setIsLocalHost] = useState(false)
useEffect(() => { useEffect(() => {
plugin.on('filePanel', 'setWorkspace', async (workspace) => { plugin.on('filePanel', 'setWorkspace', async (workspace) => {
const isGit = await plugin.call('fileManager', 'isGitRepo') const isGit = await plugin.call('fileManager', 'isGitRepo')
setIsLocalHost(workspace.isLocalhost)
if (isGit) { if (isGit) {
setGitBranchName(workspace.name) setGitBranchName(workspace.name)
} else { } else {
@ -37,6 +39,7 @@ export default function GitStatus({ plugin, gitBranchName, setGitBranchName }: G
setGitBranchName(workspace) setGitBranchName(workspace)
} }
}) })
}, []) }, [])
const lightDgitUp = async () => { const lightDgitUp = async () => {
@ -51,10 +54,14 @@ export default function GitStatus({ plugin, gitBranchName, setGitBranchName }: G
const initializeNewGitRepo = async () => { const initializeNewGitRepo = async () => {
await plugin.call('dGitProvider', 'init') await plugin.call('dGitProvider', 'init')
const isActive = await plugin.call('manager', 'isActive', 'dgit') const isActive = await plugin.call('manager', 'isActive', 'dgit')
if (!isActive) await plugin.call('manager', 'activatePlugin', 'dgit') if (isLocalHost === false) {
// plugin.verticalIcons.select('dgit') if (!isActive) await plugin.call('manager', 'activatePlugin', 'dgit')
}
} }
const checkBranchName = ()=> {
return gitBranchName && gitBranchName !== 'Not a git repo' && gitBranchName.length > 0
}
return ( return (
<CustomTooltip <CustomTooltip
tooltipText={`${gitBranchName === 'Not a git repo' ? 'Initialize as a git repo' : gitBranchName} (Git)`} tooltipText={`${gitBranchName === 'Not a git repo' ? 'Initialize as a git repo' : gitBranchName} (Git)`}
@ -63,10 +70,10 @@ export default function GitStatus({ plugin, gitBranchName, setGitBranchName }: G
className="d-flex flex-row pl-3 text-white justify-content-center align-items-center remixui_statusbar_gitstatus" className="d-flex flex-row pl-3 text-white justify-content-center align-items-center remixui_statusbar_gitstatus"
onClick={async () => await lightDgitUp()} onClick={async () => await lightDgitUp()}
> >
{gitBranchName.length > 0 && gitBranchName !== 'Not a git repo' ? <span className="fa-regular fa-code-branch ml-1"></span> {checkBranchName() && isLocalHost === false ? <span className="fa-regular fa-code-branch ml-1"></span>
: <span className=" ml-1" onClick={initializeNewGitRepo}> Initialize as git repo</span>} : <span className=" ml-1" onClick={initializeNewGitRepo}> Initialize as git repo</span>}
{gitBranchName.length > 0 && gitBranchName !== 'Not a git repo' && <span className="ml-1">{gitBranchName}</span>} {checkBranchName() && isLocalHost === false && <span className="ml-1">{gitBranchName}</span>}
{gitBranchName.length > 0 && gitBranchName !== 'Not a git repo' && <span className="fa-solid fa-arrows-rotate fa-1 ml-1"></span>} {checkBranchName() && isLocalHost === false && <span className="fa-solid fa-arrows-rotate fa-1 ml-1"></span>}
</div> </div>
</CustomTooltip> </CustomTooltip>
) )

Loading…
Cancel
Save