Forker/fluxscape
1
0
Fork 0
mirror of https://github.com/fluxscape/fluxscape.git synced 2026-01-11 14:52:54 +01:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

feat: Version control commit, View on GitHub (#17)

Browse Source 
* feat: Version control commit, View on GitHub

* fix: MenuDialog allow undefined menu item

This makes it a lot easier to create conditional menu items
This commit is contained in:
Eric Tuvesson
2024-05-14 14:00:43 +02:00
committed by GitHub
parent 13c92779b2
commit 4e09a70a24
4 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/noodl-core-ui/src/components/popups/MenuDialog/MenuDialog.tsx
View File

@@ -72,7 +72,7 @@ export function MenuDialog({
hasArrow
>
<div className={classNames(css['Root'], css[width])} style={{ maxHeight: UNSAFE_maxHeight }}>
{items.map((item, i) => {
{items.filter(Boolean).map((item, i) => {
if (item === 'divider') return <div className={css['Divider']} key={i} />;
if (item?.isHidden) return null;

20
packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/VersionControlPanel.tsx
View File

@@ -33,6 +33,7 @@ import { History } from './components/History';
import { LocalChanges } from './components/LocalChanges';
import { MergeConflicts } from './components/MergeConflicts';
import { useVersionControlContext, VersionControlProvider } from './context';
import { convertGitRemoteUrlToRepoUrl } from './github';
enum ViewState {
Default,
@@ -40,25 +41,6 @@ enum ViewState {
BranchMerge
}
function convertGitRemoteUrlToRepoUrl(gitRemoteUrl) {
// Remove the .git extension if present
gitRemoteUrl = gitRemoteUrl.replace(/\.git$/, '');
// Extract the repository name and owner from the URL
const regex = /^(?:https?:\/\/)?github\.com\/([^/]+)\/([^/]+)$/;
const match = gitRemoteUrl.match(regex);
if (match) {
const owner = match[1];
const repo = match[2];
// Construct the GitHub repository URL
const repoUrl = `https://github.com/${owner}/${repo}`;
return repoUrl;
} else {
throw new Error('Invalid GitHub Git remote URL');
}
}
function BaseVersionControlPanel() {
const { git, activeTabId, setActiveTabId, localChangesCount, branchStatus, fetch, updateLocalDiff } =
useVersionControlContext();

11
packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/HistoryCommitDiff.tsx
View File

@@ -13,13 +13,15 @@ import { EventDispatcher } from '../../../../../../shared/utils/EventDispatcher'
import { ToastLayer } from '../../../ToastLayer/ToastLayer';
import { useVersionControlContext } from '../context';
import { CommitChangesDiff } from './CommitChangesDiff';
import { convertGitRemoteUrlToCommitUrl } from '../github';
import { platform } from '@noodl/platform';
export interface HistoryCommitDiffProps {
commit: Commit;
}
export function HistoryCommitDiff({ commit }: HistoryCommitDiffProps) {
const { repositoryPath, localChangesCount, fetch } = useVersionControlContext();
const { git, repositoryPath, localChangesCount, fetch } = useVersionControlContext();
const [HaveLocalChangesDialog, showHaveLocalChangesDialog] = useConfirmationDialog({
isCancelButtonHidden: true,
@@ -71,6 +73,13 @@ export function HistoryCommitDiff({ commit }: HistoryCommitDiffProps) {
copyValueToClipboard({
value: commit.sha
})
},
git.Provider === 'github' && {
label: 'View on GitHub',
onClick: () => {
const commitLink = convertGitRemoteUrlToCommitUrl(git.OriginUrl, commit.sha);
platform.openExternal(commitLink);
}
}
]}
/>

23
packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/github.ts Normal file
View File

@@ -0,0 +1,23 @@
export function convertGitRemoteUrlToRepoUrl(gitRemoteUrl: string): string {
// Remove the .git extension if present
gitRemoteUrl = gitRemoteUrl.replace(/\.git$/, '');
// Extract the repository name and owner from the URL
const regex = /^(?:https?:\/\/)?github\.com\/([^/]+)\/([^/]+)$/;
const match = gitRemoteUrl.match(regex);
if (match) {
const owner = match[1];
const repo = match[2];
// Construct the GitHub repository URL
const repoUrl = `https://github.com/${owner}/${repo}`;
return repoUrl;
} else {
throw new Error('Invalid GitHub Git remote URL');
}
}
export function convertGitRemoteUrlToCommitUrl(gitRemoteUrl: string, commitSha: string): string {
const githubLink = convertGitRemoteUrlToRepoUrl(gitRemoteUrl);
return `${githubLink}/commit/${commitSha}`;
}