Skip to content
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

Jump to bottom

Showed both row and column level context menu options in the cell level #2728 #2803

Merged
merged 16 commits into from
Apr 17, 2023
Merged

Showed both row and column level context menu options in the cell level #2728 #2803

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d14da1f
made my branch back to as it was before
TafreedAhmad Apr 10, 2023
e1ecc4e
removed all the errors
TafreedAhmad Apr 10, 2023
341b0df
removed all the errors but recordid is not defined as string because …
TafreedAhmad Apr 10, 2023
28e7fdd
done
TafreedAhmad Apr 11, 2023
8831b8c
Merge branch 'develop' into update
pavish Apr 11, 2023
fabfbd3
changed String to string.
TafreedAhmad Apr 11, 2023
b5e6c6e
removed the errors
TafreedAhmad Apr 12, 2023
bbe9b6e
..
TafreedAhmad Apr 12, 2023
482a554
resolving errors
TafreedAhmad Apr 12, 2023
69aa81d
formatting errors not going away even after formatting several times
TafreedAhmad Apr 13, 2023
9da84b1
checked formatting locally and it passed
TafreedAhmad Apr 13, 2023
e189a7c
Merge branch 'develop' into update
pavish Apr 14, 2023
c88341f
Merge branch 'develop' into update
pavish Apr 17, 2023
4e1af61
Pass rowKey directly to RowCell
pavish Apr 17, 2023
9b78059
Move 'Go To Linked Record' option to cell options section
pavish Apr 17, 2023
06a69c8
Rename recordId prop to recordPk in RowContextOptions
pavish Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion mathesar_ui/src/systems/table-view/row/Row.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
hasErrors={hasAnyErrors}
/>
<ContextMenu>
<RowContextOptions recordId={Number(rowKey)} {recordsData} {row} />
<RowContextOptions recordId={String(rowKey)} {recordsData} {row} />
</ContextMenu>
{/if}
</div>
Expand Down Expand Up @@ -136,6 +136,7 @@
bind:value={row.record[columnId]}
{processedColumn}
{recordsData}
{primaryKeyColumnId}
/>
{/each}
{/if}
Expand Down
17 changes: 14 additions & 3 deletions mathesar_ui/src/systems/table-view/row/RowCell.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
ButtonMenuItem,
LinkMenuItem,
WritableMap,
MenuDivider,
} from '@mathesar-component-library';
import {
rowHasNewRecord,
Expand All @@ -13,6 +14,7 @@
type CellKey,
type ProcessedColumn,
type TabularDataSelection,
getRowKey,
} from '@mathesar/stores/table-data';
import {
isCellActive,
Expand All @@ -32,6 +34,8 @@
import { currentDatabase } from '@mathesar/stores/databases';
import { currentSchema } from '@mathesar/stores/schemas';
import CellErrors from './CellErrors.svelte';
import ColumnHeaderContextMenu from '../header/header-cell/ColumnHeaderContextMenu.svelte';
import RowContextOptions from './RowContextOptions.svelte';

export let recordsData: RecordsData;
export let selection: TabularDataSelection;
Expand All @@ -42,6 +46,7 @@
export let processedColumn: ProcessedColumn;
export let clientSideErrorMap: WritableMap<CellKey, string[]>;
export let value: unknown = undefined;
export let primaryKeyColumnId: number | undefined;

const userProfile = getUserProfileStoreFromContext();

Expand All @@ -58,6 +63,7 @@
$: columnId = column.id;
$: ({ activeCell, selectedCells } = selection);
$: isActive = $activeCell && isCellActive($activeCell, row, processedColumn);
$: rowKey = getRowKey(row, primaryKeyColumnId);

/**
* The name indicates that this boolean is only true when more than one cell
Expand Down Expand Up @@ -107,7 +113,6 @@
if (type) {
originalEvent.stopPropagation();
originalEvent.preventDefault();

await checkTypeAndScroll(type);
}
}
Expand Down Expand Up @@ -191,6 +196,14 @@
>
Set to <Null />
</ButtonMenuItem>
<MenuDivider />
<!-- Column Attributes -->
<ColumnHeaderContextMenu {processedColumn} />
<!-- Column Attributes end -->
<MenuDivider />
<!-- Row -->
<RowContextOptions recordId={String(rowKey)} {recordsData} {row} />
<!-- Row end -->
{#if linkedRecordHref}
<LinkMenuItem icon={iconLinkToRecordPage} href={linkedRecordHref}>
Go To Linked Record
Expand All @@ -207,14 +220,12 @@
.editable-cell.cell {
user-select: none;
background: var(--cell-bg-color-base);

&.is-active {
z-index: var(--z-index__sheet__active-cell);
border-color: transparent;
min-height: 100%;
height: auto !important;
}

&.error,
&.is-processing {
color: var(--cell-text-color-processing);
Expand Down
2 changes: 1 addition & 1 deletion mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { currentSchema } from '@mathesar/stores/schemas';

export let row: RecordRow;
export let recordId: number;
export let recordId: string;
export let recordsData: RecordsData;

const userProfile = getUserProfileStoreFromContext();
Expand Down