Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Allow partial Locker entries on web

AmanRajSinghMourya82d10821ca9a
diff --git a/web/apps/locker/src/components/create-item/ItemFormFields.tsx b/web/apps/locker/src/components/create-item/ItemFormFields.tsx
index 3c6cfaea1e..742abbadc4 100644
--- a/web/apps/locker/src/components/create-item/ItemFormFields.tsx
+++ b/web/apps/locker/src/components/create-item/ItemFormFields.tsx
@@ -31,7 +31,6 @@ export const ItemFormFields: React.FC<{
onChange={(event) =>
onChange("title", event.target.value)
}
- required
autoFocus
/>
<FormField
@@ -66,7 +65,6 @@ export const ItemFormFields: React.FC<{
onChange={(event) =>
onChange("username", event.target.value)
}
- required
/>
<FormField
label={t("password")}
@@ -74,7 +72,6 @@ export const ItemFormFields: React.FC<{
onChange={(event) =>
onChange("password", event.target.value)
}
- required
type={showPassword ? "text" : "password"}
slotProps={{
input: {
@@ -128,7 +125,6 @@ export const ItemFormFields: React.FC<{
onChange={(event) =>
onChange("location", event.target.value)
}
- required
/>
<FormField
label={t("recordNotes")}
diff --git a/web/apps/locker/src/components/create-item/item-form-fields-utils.ts b/web/apps/locker/src/components/create-item/item-form-fields-utils.ts
index 1ec7561f24..83fca0f719 100644
--- a/web/apps/locker/src/components/create-item/item-form-fields-utils.ts
+++ b/web/apps/locker/src/components/create-item/item-form-fields-utils.ts
@@ -4,11 +4,11 @@ import { t } from "i18next";
export const getRequiredFields = (type: LockerItemType): string[] => {
switch (type) {
case "note":
- return ["title", "content"];
+ return ["content"];
case "accountCredential":
- return ["name", "username", "password"];
+ return ["name"];
case "physicalRecord":
- return ["name", "location"];
+ return ["name"];
case "emergencyContact":
return ["name", "contactDetails"];
case "file":
@@ -18,6 +18,26 @@ export const getRequiredFields = (type: LockerItemType): string[] => {
}
};
+export const itemFormDataForSave = (
+ type: LockerItemType,
+ formData: Record<string, string>,
+): Record<string, string> => {
+ const data: Record<string, string> = Object.fromEntries(
+ Object.entries(formData)
+ .filter(([, value]) => value.trim())
+ .map(([key, value]) => [key, value.trim()]),
+ );
+
+ if (type === "note" && !data.title) {
+ const firstLine = data.content?.split("\n", 1)[0]?.trim() ?? "";
+ const title = firstLine.split(/\s+/).slice(0, 5).join(" ");
+ data.title =
+ title.length <= 40 ? title : `${title.slice(0, 40).trimEnd()}...`;
+ }
+
+ return data;
+};
+
export const typeDisplayName = (type: LockerItemType): string => {
switch (type) {
case "note":
diff --git a/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts b/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts
index 0b21a8afea..1c2f178e45 100644
--- a/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts
+++ b/web/apps/locker/src/components/create-item/use-create-item-dialog-state.ts
@@ -24,7 +24,10 @@ import {
filterNonEmptyUploadItems,
uploadQueueItemKey,
} from "./file-upload-helpers";
-import { getRequiredFields } from "./item-form-fields-utils";
+import {
+ getRequiredFields,
+ itemFormDataForSave,
+} from "./item-form-fields-utils";
import { useUploadQueue, type LockerUploadCallbacks } from "./use-upload-queue";
export type CreateOption = LockerItemType;
@@ -402,14 +405,7 @@ export const useCreateItemDialogState = ({
setError(null);
setUpgradeCTAType(null);
try {
- const cleanData = Object.fromEntries(
- Object.entries(formData)
- .filter(
- ([, value]) =>
- typeof value === "string" && value.trim(),
- )
- .map(([key, value]) => [key, value.trim()]),
- );
+ const cleanData = itemFormDataForSave(formType, formData);
await onSave(formType, cleanData, selectedCollectionIDs);
handleClose();
} catch (error) {
diff --git a/web/apps/locker/src/components/items/ItemDetailView.tsx b/web/apps/locker/src/components/items/ItemDetailView.tsx
index 3a8a6fc4dd..d4ae48a5a3 100644
--- a/web/apps/locker/src/components/items/ItemDetailView.tsx
+++ b/web/apps/locker/src/components/items/ItemDetailView.tsx
@@ -456,7 +456,7 @@ export const ItemDetailView: React.FC<ItemDetailViewProps> = ({
interface FieldRowProps {
label: string;
- value: string;
+ value?: string;
onCopy: (value: string, field: string) => void;
secret?: boolean;
multiline?: boolean;
diff --git a/web/apps/locker/src/types.ts b/web/apps/locker/src/types.ts
index cc512c0d86..ac2803cdc6 100644
--- a/web/apps/locker/src/types.ts
+++ b/web/apps/locker/src/types.ts
@@ -26,14 +26,14 @@ export interface PersonalNoteData {
export interface AccountCredentialData {
name: string;
- username: string;
- password: string;
+ username?: string;
+ password?: string;
notes?: string;
}
export interface PhysicalRecordData {
name: string;
- location: string;
+ location?: string;
notes?: string;
}
diff --git a/web/apps/locker/tests/item-metadata.test.ts b/web/apps/locker/tests/item-metadata.test.ts
index 66dbd177ed..3ea90bcf6e 100644
--- a/web/apps/locker/tests/item-metadata.test.ts
+++ b/web/apps/locker/tests/item-metadata.test.ts
@@ -146,3 +146,22 @@ test("a rejected metadata update leaves the cache unchanged", async () => {
originalMetadata,
);
});
+
+test("clearing optional credential fields replaces the saved info data", async () => {
+ decryptMetadataJSON.mockResolvedValue({
+ info: {
+ type: "accountCredential",
+ data: { name: "Netflix", username: "old", password: "old" },
+ },
+ });
+
+ await updateInfoItem(1, "accountCredential", { name: "Netflix" });
+
+ const metadata = JSON.parse(
+ new TextDecoder().decode(encryptBlob.mock.calls[0]![0] as Uint8Array),
+ ) as Record<string, unknown>;
+ expect(metadata.info).toEqual({
+ type: "accountCredential",
+ data: { name: "Netflix" },
+ });
+});
diff --git a/web/apps/locker/tests/required-fields.test.ts b/web/apps/locker/tests/required-fields.test.ts
new file mode 100644
index 0000000000..0d710bfbe8
--- /dev/null
+++ b/web/apps/locker/tests/required-fields.test.ts
@@ -0,0 +1,66 @@
+import { expect, test } from "vitest";
+import {
+ getRequiredFields,
+ itemFormDataForSave,
+} from "../src/components/create-item/item-form-fields-utils";
+
+test.each([
+ ["note", ["content"]],
+ ["accountCredential", ["name"]],
+ ["physicalRecord", ["name"]],
+ ["emergencyContact", ["name", "contactDetails"]],
+ ["file", ["name"]],
+] as const)("required fields for %s", (type, expected) => {
+ expect(getRequiredFields(type)).toEqual(expected);
+});
+
+test("content-only notes derive a title from the first five words", () => {
+ expect(
+ itemFormDataForSave("note", {
+ title: " ",
+ content: " Remember where the spare key lives\nMore details ",
+ }),
+ ).toEqual({
+ title: "Remember where the spare key",
+ content: "Remember where the spare key lives\nMore details",
+ });
+});
+
+test("long generated note titles use mobile's 40-character limit", () => {
+ expect(
+ itemFormDataForSave("note", {
+ content: "Antidisestablishmentarianism and several other details",
+ }).title,
+ ).toBe("Antidisestablishmentarianism and several...");
+});
+
+test("an explicit note title is kept, and clearing it regenerates the title", () => {
+ expect(
+ itemFormDataForSave("note", {
+ title: " My own title ",
+ content: "New content",
+ }).title,
+ ).toBe("My own title");
+ expect(
+ itemFormDataForSave("note", { title: "", content: "New content" })
+ .title,
+ ).toBe("New content");
+});
+
+test("cleared Thing and Secret fields are omitted on save", () => {
+ expect(
+ itemFormDataForSave("physicalRecord", {
+ name: " Spare key ",
+ location: " ",
+ notes: "",
+ }),
+ ).toEqual({ name: "Spare key" });
+ expect(
+ itemFormDataForSave("accountCredential", {
+ name: " Netflix ",
+ username: "",
+ password: " ",
+ notes: "",
+ }),
+ ).toEqual({ name: "Netflix" });
+});