Skip to content

83 users should not see detail button in project page #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ma-mirzaei merged 2 commits into from
Oct 22, 2025
Merged

83 users should not see detail button in project page #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2ecea4
removed the wronged code
ma-mirzaei Oct 22, 2025
69c4a3b
clean unused code
ma-mirzaei Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 3 additions & 29 deletions src/components/ui/VsumTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ export const VsumTabs: React.FC<VsumTabsProps> = ({ openVsums, activeVsumId, onA
const edit = edits[id];
const details = detailsById[id];
if (!edit || !details) { map[id] = false; return; }
const detailsSourceIds = (details.metaModels || [])
.map(m => (typeof m.sourceId === 'number' ? m.sourceId : undefined))
.filter((v): v is number => typeof v === 'number');
map[id] = !areIdArraysEqual(edit.metaModelSourceIds, detailsSourceIds);
map[id] = !areIdArraysEqual(edit.metaModelSourceIds);
});
return map;
}, [openVsums, edits, detailsById]);
Expand All @@ -48,13 +45,6 @@ export const VsumTabs: React.FC<VsumTabsProps> = ({ openVsums, activeVsumId, onA
try {
const res = await apiService.getVsumDetails(id);
setDetailsById(prev => ({ ...prev, [id]: res.data }));
const seededSourceIds = (res.data.metaModels || [])
.map(m => (typeof m.sourceId === 'number' ? m.sourceId : undefined))
.filter((v): v is number => typeof v === 'number');
setEdits(prev => ({
...prev,
[id]: { metaModelSourceIds: seededSourceIds }
}));
} catch (e) {
setError(e instanceof Error ? e.message : 'Failed to load VSUM details');
}
Expand All @@ -72,9 +62,7 @@ export const VsumTabs: React.FC<VsumTabsProps> = ({ openVsums, activeVsumId, onA
const edit = edits[id];

// fallback from details using sourceId
const fallbackSourceIds = (detailsById[id]?.metaModels || [])
.map(m => (typeof m.sourceId === 'number' ? m.sourceId : undefined))
.filter((v): v is number => typeof v === 'number');
const fallbackSourceIds = (detailsById[id]?.metaModels);

const metaModelSourceIds =
override?.metaModelSourceIds ?? edit?.metaModelSourceIds ?? fallbackSourceIds;
Expand All @@ -96,16 +84,6 @@ export const VsumTabs: React.FC<VsumTabsProps> = ({ openVsums, activeVsumId, onA
const res = await apiService.getVsumDetails(id);
setDetailsById(prev => ({ ...prev, [id]: res.data }));

// sync local edits with server (by sourceId again)
const serverSourceIds = (res.data.metaModels || [])
.map(m => (typeof m.sourceId === 'number' ? m.sourceId : undefined))
.filter((v): v is number => typeof v === 'number');

setEdits(prev => ({
...prev,
[id]: { metaModelSourceIds: serverSourceIds },
}));

window.dispatchEvent(new CustomEvent('vitruv.refreshVsums'));
} catch (e) {
setError(e instanceof Error ? e.message : 'Failed to save VSUM');
Expand Down Expand Up @@ -133,11 +111,7 @@ export const VsumTabs: React.FC<VsumTabsProps> = ({ openVsums, activeVsumId, onA

if (typeof sourceId !== 'number') return;

const current = edits[activeVsumId] || {
metaModelSourceIds: (detailsById[activeVsumId!]?.metaModels || [])
.map(m => (typeof m.sourceId === 'number' ? m.sourceId : undefined))
.filter((v): v is number => typeof v === 'number')
};
const current = edits[activeVsumId];

if (current.metaModelSourceIds.includes(sourceId)) return;

Expand Down
78 changes: 50 additions & 28 deletions src/components/ui/VsumsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,37 +223,59 @@ export const VsumsPanel: React.FC = () => {

<div style={sectionStyle}>All</div>

{items.map((item) => (
<div
key={item.id}
style={cardStyle}
onDoubleClick={() =>
window.dispatchEvent(new CustomEvent('vitruv.openVsum', { detail: { id: item.id } }))
}
>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 8 }}>
<div style={{ display: 'flex', flexDirection: 'column' }}>
<div style={{ fontWeight: 700, color: '#2c3e50' }}>{item.name}</div>
<div style={{ fontSize: 12, color: '#5a6c7d' }}>
Created: {formatDateTime(item.createdAt)}
{items.map((item) => {
const role = (item as any).role as string | undefined;
const canManage = role === 'OWNER';
return (
<div
key={item.id}
style={cardStyle}
onDoubleClick={() =>
window.dispatchEvent(new CustomEvent('vitruv.openVsum', { detail: { id: item.id } }))
}
>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 8 }}>
<div style={{ display: 'flex', flexDirection: 'column' }}>
<div style={{ fontWeight: 700, color: '#2c3e50', display: 'flex', alignItems: 'center', gap: 8 }}>
{item.name}
{role && (
<span
style={{
padding: '2px 6px',
borderRadius: 6,
fontSize: 11,
fontWeight: 700,
border: '1px solid #e5e7eb',
background: role === 'OWNER' ? '#ecfdf5' : '#f3f4f6',
color: role === 'OWNER' ? '#065f46' : '#374151',
}}
>
{role}
</span>
)}
</div>
<div style={{ fontSize: 12, color: '#5a6c7d' }}>Created: {formatDateTime(item.createdAt)}</div>
</div>

{canManage && (
<button
onClick={() => setDetailsId(item.id)}
style={{
padding: '6px 10px',
border: '1px solid #dee2e6',
borderRadius: 6,
background: '#ffffff',
cursor: 'pointer',
fontWeight: 600,
}}
>
Details
</button>
)}
</div>
<button
onClick={() => setDetailsId(item.id)}
style={{
padding: '6px 10px',
border: '1px solid #dee2e6',
borderRadius: 6,
background: '#ffffff',
cursor: 'pointer',
fontWeight: 600,
}}
>
Details
</button>
</div>
</div>
))}
);
})}

{!loading && items.length === 0 && (
<div style={{ textAlign: 'center', color: '#6b7280', marginTop: 40, fontStyle: 'italic' }}>
Expand Down
7 changes: 1 addition & 6 deletions src/types/vsum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@ export interface Vsum {

export interface VsumMetaModelRef {
id: number;
sourceId: number;
name: string;
description: string;
domain: string;
keyword: string[];
role: string;
createdAt: string;
updatedAt: string;
removedAt?: string | null;
ecoreFileId: number;
genModelFileId: number;
}

export interface VsumDetails extends Vsum {
Expand Down
Loading