Skip to content

Minor change to data model view sections and groups #45

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
Lucki2g merged 2 commits into from
Jul 28, 2025
Merged

Minor change to data model view sections and groups #45

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
759966e
chore: ui adjustments to section and group selection
Lucki2g Jul 28, 2025
9fd4e94
chore: tiny padding added to scroll, to ensure correct section is fou…
Lucki2g Jul 28, 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
4 changes: 2 additions & 2 deletions Website/components/datamodelview/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ export const List = ({ }: IListProps) => {
const virtualItems = rowVirtualizer.getVirtualItems();

// Find the first visible item
const padding = 16;
const firstVisibleItem = virtualItems.find(v => {
return v.start <= scrollOffset && v.end >= scrollOffset;
return v.start <= scrollOffset && (v.end - padding) >= scrollOffset;
});

if (firstVisibleItem) {
Expand Down Expand Up @@ -202,7 +203,6 @@ export const List = ({ }: IListProps) => {
return item.type === 'entity' && item.entity.SchemaName === datamodelView.currentSection;
});
if (isInView) {
console.log("List: setting loading false");
dispatch({ type: 'SET_LOADING', payload: false });
}
}
Expand Down
14 changes: 10 additions & 4 deletions Website/components/datamodelview/SidebarDatamodelView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const SidebarDatamodelView = ({ }: ISidebarDatamodelViewProps) => {
const isTouch = useTouch();
const dispatch = useSidebarDispatch();
const { currentSection, currentGroup, scrollToSection } = useDatamodelView();

const dataModelDispatch = useDatamodelViewDispatch();

const { groups } = useDatamodelData();
Expand Down Expand Up @@ -81,8 +82,8 @@ export const SidebarDatamodelView = ({ }: ISidebarDatamodelViewProps) => {
};

const handleSectionClick = (sectionId: string) => {
console.log("Loading true for section click");
dataModelDispatch({ type: 'SET_LOADING', payload: true });
dataModelDispatch({ type: 'SET_CURRENT_SECTION', payload: sectionId });
if (scrollToSection) {
scrollToSection(sectionId);
}
Expand Down Expand Up @@ -136,14 +137,16 @@ export const SidebarDatamodelView = ({ }: ISidebarDatamodelViewProps) => {
)}
onClick={e => {
e.stopPropagation();
handleGroupClick(group.Name);
if (group.Entities.length > 0) handleSectionClick(group.Entities[0].SchemaName);
}}
aria-label={`Link to first entity in ${group.Name}`}
tabIndex={0}
>
<ExternalLink className="w-4 h-4" onClick={e => {
e.stopPropagation();
if (group.Entities.length > 0) handleGroupClick(group.Name);
e.preventDefault();
handleGroupClick(group.Name);
if (group.Entities.length > 0) handleSectionClick(group.Entities[0].SchemaName);
}} />
</a>
</CollapsibleTrigger>
Expand All @@ -168,7 +171,10 @@ export const SidebarDatamodelView = ({ }: ISidebarDatamodelViewProps) => {
isMatch ? "ring-1 ring-yellow-300" : ""
)}
key={entity.SchemaName}
onClick={() => handleSectionClick(entity.SchemaName)}
onClick={() => {
handleGroupClick(group.Name)
handleSectionClick(entity.SchemaName)
}}
>
{entity.IconBase64 ? <img className="h-4 w-4" src={`data:image/svg+xml;base64,${entity.IconBase64}`} alt="icon" /> : <Puzzle className="w-4 h-4" />}
<span className="truncate">
Expand Down
Loading