Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

chore: cell options write to backend

ascarbeka8a35dcbec1c
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptions.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptions.tsx
index 9aa2f9d38c..63aeeab62a 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptions.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptions.tsx
@@ -23,11 +23,11 @@ export const CellOptions = ({
onClick={() => onClick()}
className={'flex flex-wrap items-center gap-2 px-4 py-2 text-xs text-black'}
>
- {data?.select_options.map((option, index) => (
+ {data?.select_options?.map((option, index) => (
<div className={`${getBgColor(option.color)} rounded px-2 py-0.5`} key={index}>
{option?.name || ''}
</div>
- ))}
+ )) || ''}
&nbsp;
</div>
);
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptionsPopup.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptionsPopup.tsx
index a28765a281..9e35481a00 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptionsPopup.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/CellOptionsPopup.tsx
@@ -1,15 +1,17 @@
-import { useEffect, useRef, useState } from 'react';
+import { KeyboardEventHandler, useEffect, useRef, useState } from 'react';
import { CellIdentifier } from '$app/stores/effects/database/cell/cell_bd_svc';
import { useCell } from '$app/components/_shared/database-hooks/useCell';
import { CellCache } from '$app/stores/effects/database/cell/cell_cache';
import { FieldController } from '$app/stores/effects/database/field/field_controller';
-import { SelectOptionCellDataPB } from '@/services/backend';
+import { SelectOptionCellDataPB, SelectOptionPB } from '@/services/backend';
import { getBgColor } from '$app/components/_shared/getColor';
import { useTranslation } from 'react-i18next';
import { Details2Svg } from '$app/components/_shared/svg/Details2Svg';
import { CheckmarkSvg } from '$app/components/_shared/svg/CheckmarkSvg';
import { CloseSvg } from '$app/components/_shared/svg/CloseSvg';
import useOutsideClick from '$app/components/_shared/useOutsideClick';
+import { SelectOptionCellBackendService } from '$app/stores/effects/database/cell/select_option_bd_svc';
+import { CellController } from '$app/stores/effects/database/cell/cell_controller';
export const CellOptionsPopup = ({
top,
@@ -46,6 +48,31 @@ export const CellOptionsPopup = ({
onOutsideClick();
});
+ const onKeyDown: KeyboardEventHandler = async (e) => {
+ if (e.key === 'Enter' && value.length > 0) {
+ await new SelectOptionCellBackendService(cellIdentifier).createOption({ name: value });
+ setValue('');
+ }
+ };
+
+ const onUnselectOptionClick = async (option: SelectOptionPB) => {
+ await new SelectOptionCellBackendService(cellIdentifier).unselectOption([option.id]);
+ setValue('');
+ };
+
+ const onToggleOptionClick = async (option: SelectOptionPB) => {
+ if (
+ (data as SelectOptionCellDataPB | undefined)?.select_options?.find(
+ (selectedOption) => selectedOption.id === option.id
+ )
+ ) {
+ await new SelectOptionCellBackendService(cellIdentifier).unselectOption([option.id]);
+ } else {
+ await new SelectOptionCellBackendService(cellIdentifier).selectOption([option.id]);
+ }
+ setValue('');
+ };
+
return (
<div
ref={ref}
@@ -60,9 +87,9 @@ export const CellOptionsPopup = ({
{(data as SelectOptionCellDataPB | undefined)?.select_options?.map((option, index) => (
<div className={`${getBgColor(option.color)} flex items-center gap-0.5 rounded px-1 py-0.5`} key={index}>
<span>{option?.name || ''}</span>
- <i className={'h-5 w-5 cursor-pointer'}>
+ <button onClick={() => onUnselectOptionClick(option)} className={'h-5 w-5 cursor-pointer'}>
<CloseSvg></CloseSvg>{' '}
- </i>
+ </button>
</div>
)) || ''}
</div>
@@ -71,6 +98,7 @@ export const CellOptionsPopup = ({
value={value}
onChange={(e) => setValue(e.target.value)}
placeholder={t('grid.selectOption.searchOption') || ''}
+ onKeyDown={onKeyDown}
/>
<div className={'font-mono text-shade-3'}>{value.length}/30</div>
</div>
@@ -80,6 +108,7 @@ export const CellOptionsPopup = ({
{(data as SelectOptionCellDataPB | undefined)?.options.map((option, index) => (
<div
key={index}
+ onClick={() => onToggleOptionClick(option)}
className={
'flex cursor-pointer items-center justify-between rounded-lg px-2 py-1.5 hover:bg-main-secondary'
}
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/EditFieldPopup.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/EditFieldPopup.tsx
index da6c2f922d..4231aac264 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/EditFieldPopup.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/EditRow/EditFieldPopup.tsx
@@ -68,6 +68,15 @@ export const EditFieldPopup = ({
changeFieldTypeClick(buttonTop, buttonRight);
};
+ // this is causing an error right now
+ const onDeleteFieldClick = async () => {
+ if (!fieldInfo) return;
+ const controller = new TypeOptionController(viewId, Some(fieldInfo));
+ await controller.initialize();
+ await controller.deleteField();
+ onOutsideClick();
+ };
+
return (
<div
ref={ref}
@@ -85,6 +94,7 @@ export const EditFieldPopup = ({
/>
<button
+ onClick={() => onDeleteFieldClick()}
className={
'flex cursor-pointer items-center gap-2 rounded-lg px-2 py-2 text-main-alert hover:bg-main-secondary'
}
diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/useCell.ts b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/useCell.ts
index 2fde53c206..4932ddec64 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/useCell.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/_shared/database-hooks/useCell.ts
@@ -16,6 +16,14 @@ export const useCell = (cellIdentifier: CellIdentifier, cellCache: CellCache, fi
const c = builder.build();
setCellController(c);
+ c.subscribeChanged({
+ onCellChanged: (cellData) => {
+ if (cellData.some) {
+ setData(cellData.val);
+ }
+ },
+ });
+
void (async () => {
const cellData = await c.getCellData();
if (cellData.some) {