- {renderBasicFields()}
- {renderCustomFormatConflicts()}
- {renderTagConflicts()}
+ {change.status === 'MODIFY_DELETE' ? (
+ // For modify/delete conflicts, only show the file status
+ renderModifyDeleteConflict()
+ ) : (
+ // For regular conflicts, show all the existing sections
+ <>
+ {renderBasicFields()}
+ {renderCustomFormatConflicts()}
+ {renderTagConflicts()}
+
+ )}
{isMergeConflict && (
diff --git a/frontend/src/components/settings/git/modal/ViewChanges.jsx b/frontend/src/components/settings/git/modal/ViewChanges.jsx
index 9cac0c6..ef24fa5 100644
--- a/frontend/src/components/settings/git/modal/ViewChanges.jsx
+++ b/frontend/src/components/settings/git/modal/ViewChanges.jsx
@@ -93,6 +93,28 @@ const ViewChanges = ({isOpen, onClose, change, isIncoming}) => {
);
};
+ const formatValue = value => {
+ if (value === null || value === undefined) return '-';
+ if (Array.isArray(value)) {
+ return value
+ .map(item => {
+ if (
+ typeof item === 'object' &&
+ item.id !== undefined &&
+ item.score !== undefined
+ ) {
+ return `Format ${item.id}: ${item.score}`;
+ }
+ return String(item);
+ })
+ .join(', ');
+ }
+ if (typeof value === 'object') {
+ return JSON.stringify(value);
+ }
+ return String(value);
+ };
+
const renderChanges = () => {
const isNewFile = change.status === 'New';
@@ -157,15 +179,15 @@ const ViewChanges = ({isOpen, onClose, change, isIncoming}) => {
{isNewFile ? (
- {to ?? value ?? '-'}
+ {formatValue(value)}
|
) : (
<>
- {from ?? '-'}
+ {formatValue(from)}
|
- {to ?? value ?? '-'}
+ {formatValue(to ?? value)}
|
)}
diff --git a/frontend/src/components/settings/git/modal/ViewCommits.jsx b/frontend/src/components/settings/git/modal/ViewCommits.jsx
new file mode 100644
index 0000000..e7bc1f6
--- /dev/null
+++ b/frontend/src/components/settings/git/modal/ViewCommits.jsx
@@ -0,0 +1,295 @@
+import React, {useState, useEffect} from 'react';
+import {
+ GitBranch,
+ GitCommit,
+ ExternalLink,
+ ArrowUpRight,
+ ArrowDownRight,
+ GitMerge,
+ Loader,
+ User,
+ Clock,
+ Hash
+} from 'lucide-react';
+import Modal from '../../../ui/Modal';
+import {getCommitHistory} from '../../../../api/api';
+import Alert from '../../../ui/Alert';
+
+const ViewCommits = ({isOpen, onClose, repoUrl, currentBranch}) => {
+ const [selectedCommit, setSelectedCommit] = useState(null);
+ const [loading, setLoading] = useState(true);
+ const [commits, setCommits] = useState([]);
+ const [aheadCount, setAheadCount] = useState(0);
+ const [behindCount, setBehindCount] = useState(0);
+
+ useEffect(() => {
+ if (isOpen) {
+ fetchCommitHistory();
+ }
+ }, [isOpen, currentBranch]);
+
+ const fetchCommitHistory = async () => {
+ setLoading(true);
+ try {
+ const response = await getCommitHistory(currentBranch);
+ if (response.success) {
+ setCommits(response.data.local_commits);
+ setAheadCount(response.data.ahead_count);
+ setBehindCount(response.data.behind_count);
+ } else {
+ Alert.error(response.error || 'Failed to fetch commit history');
+ }
+ } catch (error) {
+ Alert.error('Failed to fetch commit history');
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const formatDate = dateStr => {
+ const date = new Date(dateStr);
+ return {
+ date: date.toLocaleDateString('en-US', {
+ year: 'numeric',
+ month: 'short',
+ day: 'numeric'
+ }),
+ time: date.toLocaleTimeString('en-US', {
+ hour: '2-digit',
+ minute: '2-digit'
+ })
+ };
+ };
+
+ const getCommitStatus = commit => {
+ if (commit.isMerge) {
+ return {
+ icon:
,
+ text: 'Merge'
+ };
+ }
+
+ const isAheadCommit =
+ aheadCount > 0 && commits.indexOf(commit) < aheadCount;
+ if (isAheadCommit) {
+ return {
+ icon:
,
+ text: 'Outgoing'
+ };
+ }
+
+ return {
+ icon:
,
+ text: 'Synced'
+ };
+ };
+
+ const renderContent = () => {
+ if (loading) {
+ return (
+
+
+
+ );
+ }
+
+ if (commits.length === 0) {
+ return (
+
+
+
No commits found in this branch
+
+ );
+ }
+
+ return (
+
+ {commits.map(commit => {
+ const status = getCommitStatus(commit);
+ const formattedDate = formatDate(commit.date);
+ const isExpanded = selectedCommit === commit.hash;
+
+ return (
+
setSelectedCommit(commit.hash)}>
+
+ {/* Top section: Message and Hash */}
+
+
+ {status.icon}
+
+ {commit.message}
+
+
+
+
+
+ {commit.hash.substring(0, 7)}
+
+
+
+
+ {/* Details section */}
+ {isExpanded && (
+ <>
+
+
+
+
+
+ Files Changed (
+ {
+ commit.details
+ .files_changed
+ .length
+ }
+ ):
+
+
+ {commit.details.files_changed.map(
+ (file, idx) => (
+ -
+ {file}
+
+ )
+ )}
+
+
+
+
+ Changes:
+
+ {commit.details.insertions >
+ 0 && (
+
+ +
+ {
+ commit.details
+ .insertions
+ }{' '}
+ lines added
+
+ )}
+ {commit.details.deletions >
+ 0 && (
+
+ -
+ {
+ commit.details
+ .deletions
+ }{' '}
+ lines removed
+
+ )}
+ {commit.details
+ .insertions === 0 &&
+ commit.details
+ .deletions ===
+ 0 && (
+
+ No line changes
+ detected
+
+ )}
+
+
+
+
+
+ )}
+
+ {/* Bottom section: Author and date */}
+
+
+
+
+ {commit.author}
+
+
+
+
+
+ {formattedDate.date} at{' '}
+ {formattedDate.time}
+
+
+
+
+
+ );
+ })}
+
+ );
+ };
+
+ return (
+
+
+
+
+ Commit History - {currentBranch}
+
+
+ {(aheadCount > 0 || behindCount > 0) && (
+
+ {aheadCount > 0 && (
+
+
+
+ {aheadCount} commit
+ {aheadCount !== 1 ? 's' : ''} ahead
+
+
+ )}
+ {behindCount > 0 && (
+
+
+
+ {behindCount} commit
+ {behindCount !== 1 ? 's' : ''} behind
+
+
+ )}
+
+ }
+ width='screen-xl'
+ height='lg'>
+