Mirrors/colanode
1
0
Fork 0
mirror of https://github.com/colanode/colanode.git synced 2025-12-16 11:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes and improvements for tabs

Browse Source
This commit is contained in:
Hakan Shehu
2025-01-27 13:10:57 +01:00
parent d02e2061ec
commit 5c23bea5fa
6 changed files with 32 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/src/main/lib/utils.ts
View File

@@ -168,7 +168,7 @@ export const fetchEntryBreadcrumb = async (
.selectFrom('entry_paths')
.select('ancestor_id')
.where('descendant_id', '=', entryId)
.orderBy('level', 'asc')
.orderBy('level', 'desc')
.execute();
return rows.map((row) => row.ancestor_id);

120
apps/desktop/src/main/queries/entries/entry-tree-get.ts
View File

@@ -1,120 +0,0 @@
import { Entry } from '@colanode/core';
import { SelectEntry } from '@/main/databases/workspace';
import { ChangeCheckResult, QueryHandler } from '@/main/lib/types';
import { fetchEntryAncestors } from '@/main/lib/utils';
import { mapEntry } from '@/main/lib/mappers';
import { EntryTreeGetQueryInput } from '@/shared/queries/entries/entry-tree-get';
import { Event } from '@/shared/types/events';
import { WorkspaceQueryHandlerBase } from '@/main/queries/workspace-query-handler-base';
export class EntryTreeGetQueryHandler
extends WorkspaceQueryHandlerBase
implements QueryHandler<EntryTreeGetQueryInput>
{
public async handleQuery(input: EntryTreeGetQueryInput): Promise<Entry[]> {
const rows = await this.fetchEntries(input);
return rows.map(mapEntry);
}
public async checkForChanges(
event: Event,
input: EntryTreeGetQueryInput,
output: Entry[]
): Promise<ChangeCheckResult<EntryTreeGetQueryInput>> {
if (
event.type === 'workspace_deleted' &&
event.workspace.accountId === input.accountId &&
event.workspace.id === input.workspaceId
) {
return {
hasChanges: true,
result: [],
};
}
if (
event.type === 'entry_created' &&
event.accountId === input.accountId &&
event.workspaceId === input.workspaceId &&
event.entry.id === input.entryId
) {
const newResult = await this.handleQuery(input);
return {
hasChanges: true,
result: newResult,
};
}
if (
event.type === 'entry_updated' &&
event.accountId === input.accountId &&
event.workspaceId === input.workspaceId
) {
const entry = output.find((entry) => entry.id === event.entry.id);
if (entry) {
const newEntries = output.map((entry) => {
if (entry.id === event.entry.id) {
return event.entry;
}
return entry;
});
return {
hasChanges: true,
result: newEntries,
};
}
}
if (
event.type === 'entry_deleted' &&
event.accountId === input.accountId &&
event.workspaceId === input.workspaceId
) {
const entry = output.find((entry) => entry.id === event.entry.id);
if (entry) {
const newResult = await this.handleQuery(input);
return {
hasChanges: true,
result: newResult,
};
}
}
return {
hasChanges: false,
};
}
private async fetchEntries(
input: EntryTreeGetQueryInput
): Promise<SelectEntry[]> {
const workspace = this.getWorkspace(input.accountId, input.workspaceId);
const rows = await fetchEntryAncestors(workspace.database, input.entryId);
if (rows.length === 0) {
return [];
}
const result: SelectEntry[] = [];
let entry = rows.find((row) => row.id === input.entryId);
if (!entry) {
return [];
}
while (entry) {
result.unshift(entry);
entry = rows.find(
(row) => row.id !== entry?.id && row.id === entry?.parent_id
);
if (!entry) {
break;
}
}
return result;
}
}

2
apps/desktop/src/main/queries/index.ts
View File

@@ -19,7 +19,6 @@ import { MessageReactionsAggregateQueryHandler } from '@/main/queries/messages/m
import { MessageBreadcrumbGetQueryHandler } from '@/main/queries/messages/message-breadcrumb-get';
import { EntryChildrenGetQueryHandler } from '@/main/queries/entries/entry-children-get';
import { EntryGetQueryHandler } from '@/main/queries/entries/entry-get';
import { EntryTreeGetQueryHandler } from '@/main/queries/entries/entry-tree-get';
import { EntryBreadcrumbGetQueryHandler } from '@/main/queries/entries/entry-breadcrumb-get';
import { RadarDataGetQueryHandler } from '@/main/queries/interactions/radar-data-get';
import { RecordListQueryHandler } from '@/main/queries/records/record-list';
@@ -64,7 +63,6 @@ export const queryHandlerMap: QueryHandlerMap = {
icon_list: new IconListQueryHandler(),
icon_search: new IconSearchQueryHandler(),
icon_category_list: new IconCategoryListQueryHandler(),
entry_tree_get: new EntryTreeGetQueryHandler(),
entry_children_get: new EntryChildrenGetQueryHandler(),
radar_data_get: new RadarDataGetQueryHandler(),
file_metadata_get: new FileMetadataGetQueryHandler(),

10
apps/desktop/src/renderer/components/layouts/layout-tabs.tsx
View File

@@ -56,7 +56,7 @@ export const LayoutTabs = ({
value={tab.id}
key={tab.id}
className={cn(
'overflow-hidden rounded-b-none bg-muted py-2 data-[state=active]:z-10 data-[state=active]:shadow-none h-10 group/tab app-no-drag-region',
'overflow-hidden rounded-b-none bg-muted py-2 data-[state=active]:z-10 data-[state=active]:shadow-none h-10 group/tab app-no-drag-region flex items-center justify-between gap-2',
tab.preview && 'italic'
)}
onAuxClick={(e) => {
@@ -66,6 +66,7 @@ export const LayoutTabs = ({
}
}}
>
<div className="overflow-hidden truncate">
{match(getIdType(tab.id))
.with(IdType.Channel, () => (
<ChannelContainerTab channelId={tab.id} />
@@ -83,16 +84,17 @@ export const LayoutTabs = ({
))
.with(IdType.File, () => <FileContainerTab fileId={tab.id} />)
.otherwise(() => null)}
</div>
<div
className="opacity-0 group-hover/tab:opacity-100 group-data-[state=active]/tab:opacity-100 transition-opacity duration-200"
className="opacity-0 group-hover/tab:opacity-100 group-data-[state=active]/tab:opacity-100 transition-opacity duration-200 flex-shrink-0"
onClick={() => onClose(tab.id)}
>
<X className="size-4 text-muted-foreground ml-2 hover:text-primary" />
<X className="size-4 text-muted-foreground hover:text-primary" />
</div>
</TabsTrigger>
))}
</TabsList>
<ScrollBar orientation="horizontal" />
</ScrollArea>
<div className="flex-grow overflow-hidden">

8
apps/desktop/src/renderer/hooks/user-layout-state.tsx
View File

@@ -274,9 +274,7 @@ export const useLayoutState = () => {
if (!existingTab.active) {
replaceLeftContainerMetadata({
...leftContainerMetadata,
tabs: leftContainerMetadata.tabs
.filter((t) => keepCurrent || !t.preview)
.map((t) => ({
tabs: leftContainerMetadata.tabs.map((t) => ({
...t,
active: t.id === tab ? true : undefined,
})),
@@ -310,9 +308,7 @@ export const useLayoutState = () => {
if (!existingTab.active) {
replaceRightContainerMetadata({
...rightContainerMetadata,
tabs: rightContainerMetadata.tabs
.filter((t) => keepCurrent || !t.preview)
.map((t) => ({
tabs: rightContainerMetadata.tabs.map((t) => ({
...t,
active: t.id === tab ? true : undefined,
})),

17
apps/desktop/src/shared/queries/entries/entry-tree-get.ts
View File

@@ -1,17 +0,0 @@
import { Entry } from '@colanode/core';
export type EntryTreeGetQueryInput = {
type: 'entry_tree_get';
entryId: string;
accountId: string;
workspaceId: string;
};
declare module '@/shared/queries' {
interface QueryMap {
entry_tree_get: {
input: EntryTreeGetQueryInput;
output: Entry[];
};
}
}