From 415f89f8b02d57eaf4ee4eba152baf65b77bd672 Mon Sep 17 00:00:00 2001 From: Shlomi Shitrit Date: Wed, 6 Nov 2024 13:06:02 +0200 Subject: [PATCH 1/3] feat: add "leave us a comment" button --- src/app/components/Header/Header.tsx | 16 +++++++++++++++- src/app/general/constants.ts | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app/components/Header/Header.tsx b/src/app/components/Header/Header.tsx index 613897a..eb6704e 100644 --- a/src/app/components/Header/Header.tsx +++ b/src/app/components/Header/Header.tsx @@ -1,7 +1,7 @@ "use client"; import { useState } from "react"; import { styles } from "./Header.style"; -import { Box, Typography } from "@mui/material"; +import { Box, Typography, Link } from "@mui/material"; import Table from "@/app/components/Table"; import Dialog from "@/app/components/Dialog"; import CustomButton from "@/app/components/CustomButton"; @@ -16,6 +16,7 @@ import { ATTRIBUTES_BUTTON_TEXT, SAMPLE_BUTTON_TEXT, NO_HELP_DESCRIPTION, + NO_MAIL_PROVIDED, } from "@/app/general/constants"; import { getTableInfo } from "@/app/general/utils"; @@ -23,8 +24,10 @@ export default function Header({ bot }: HeaderProps) { const [openAttribute, setOpenAttribute] = useState(false); const [openData, setOpenData] = useState(false); const [openHelp, setOpenHelp] = useState(false); + const [openMail, setOpenMail] = useState(false); const helpDescription = bot?._details.helpDescription; + const mailInfo = bot?._details.mailInfo; const { botHeaders, botColumns, rows } = getTableInfo(bot); const sampleRows = rows.slice(0, SAMPLE_SIZE); @@ -37,6 +40,7 @@ export default function Header({ bot }: HeaderProps) { { onClick: () => setOpenAttribute(true), text: ATTRIBUTES_BUTTON_TEXT }, { onClick: () => setOpenData(true), text: SAMPLE_BUTTON_TEXT }, { onClick: () => setOpenHelp(true), text: "Help!" }, + { onClick: () => setOpenMail(true), text: "Leave us a comment" }, ]; const dialogs = [ @@ -68,6 +72,16 @@ export default function Header({ bot }: HeaderProps) { title: "Help!", content: helpDescription ?? NO_HELP_DESCRIPTION, }, + { + open: openMail, + setOpen: setOpenMail, + title: "Leave us a comment", + children: ( + + {mailInfo ?? NO_MAIL_PROVIDED} + + ), + }, ]; return ( diff --git a/src/app/general/constants.ts b/src/app/general/constants.ts index d74c247..b2a1fad 100644 --- a/src/app/general/constants.ts +++ b/src/app/general/constants.ts @@ -5,3 +5,4 @@ export const SAMPLE_SIZE = 5; export const ATTRIBUTES_BUTTON_TEXT = "Display Attributes"; export const SAMPLE_BUTTON_TEXT = "Display Data Sample"; export const NO_HELP_DESCRIPTION = "No help description available"; +export const NO_MAIL_PROVIDED = "No mail provided for comments"; From 41104f28811e8390879139246969175fb14401a5 Mon Sep 17 00:00:00 2001 From: Shlomi Shitrit Date: Thu, 14 Nov 2024 15:30:53 +0200 Subject: [PATCH 2/3] fix: move strings to constants --- src/app/components/Header/Header.tsx | 23 +++++++++++++---------- src/app/general/constants.ts | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/app/components/Header/Header.tsx b/src/app/components/Header/Header.tsx index eb6704e..ac144fd 100644 --- a/src/app/components/Header/Header.tsx +++ b/src/app/components/Header/Header.tsx @@ -13,10 +13,10 @@ import { import { strOrNum } from "@/app/general/types"; import { SAMPLE_SIZE, - ATTRIBUTES_BUTTON_TEXT, - SAMPLE_BUTTON_TEXT, + HEADER_BUTTONS_TEXTS, NO_HELP_DESCRIPTION, NO_MAIL_PROVIDED, + HEADER_DIALOGS_TITLES, } from "@/app/general/constants"; import { getTableInfo } from "@/app/general/utils"; @@ -37,17 +37,20 @@ export default function Header({ bot }: HeaderProps) { })); const buttons = [ - { onClick: () => setOpenAttribute(true), text: ATTRIBUTES_BUTTON_TEXT }, - { onClick: () => setOpenData(true), text: SAMPLE_BUTTON_TEXT }, - { onClick: () => setOpenHelp(true), text: "Help!" }, - { onClick: () => setOpenMail(true), text: "Leave us a comment" }, + { + onClick: () => setOpenAttribute(true), + text: HEADER_BUTTONS_TEXTS.attributes, + }, + { onClick: () => setOpenData(true), text: HEADER_BUTTONS_TEXTS.data }, + { onClick: () => setOpenHelp(true), text: HEADER_BUTTONS_TEXTS.help }, + { onClick: () => setOpenMail(true), text: HEADER_BUTTONS_TEXTS.mail }, ]; const dialogs = [ { open: openAttribute, setOpen: setOpenAttribute, - title: "Details of Attributes", + title: HEADER_DIALOGS_TITLES.attributes, children: ( headers={["name", "description"]} @@ -58,7 +61,7 @@ export default function Header({ bot }: HeaderProps) { { open: openData, setOpen: setOpenData, - title: "Sample of Data", + title: HEADER_DIALOGS_TITLES.data, children: ( > headers={botHeaders} @@ -69,13 +72,13 @@ export default function Header({ bot }: HeaderProps) { { open: openHelp, setOpen: setOpenHelp, - title: "Help!", + title: HEADER_DIALOGS_TITLES.help, content: helpDescription ?? NO_HELP_DESCRIPTION, }, { open: openMail, setOpen: setOpenMail, - title: "Leave us a comment", + title: HEADER_DIALOGS_TITLES.mail, children: ( {mailInfo ?? NO_MAIL_PROVIDED} diff --git a/src/app/general/constants.ts b/src/app/general/constants.ts index ce1b3b9..da80f30 100644 --- a/src/app/general/constants.ts +++ b/src/app/general/constants.ts @@ -1,8 +1,20 @@ export const NO_RESULTS_FOUND = "No results found"; export const SAMPLE_SIZE = 5; -export const ATTRIBUTES_BUTTON_TEXT = "Display Attributes"; -export const SAMPLE_BUTTON_TEXT = "Display Data Sample"; export const NO_HELP_DESCRIPTION = "No help description available"; export const NO_MAIL_PROVIDED = "No mail provided for comments"; export const DOWNLOAD_RESULTS = "Download Results"; export const SEND = "Send"; + +export const HEADER_BUTTONS_TEXTS = { + attributes: "Display Attributes", + data: "Display Data Sample", + help: "Help!", + mail: "Leave us a comment", +}; +export const HEADER_DIALOGS_TITLES = { + attributes: "Details of Attributes", + data: "Sample of Data", + help: "Help!", + mail: "Leave us a comment", +}; + From a8ab8577079b306e748811e026e9eb8c780749c7 Mon Sep 17 00:00:00 2001 From: Shlomi Date: Mon, 18 Nov 2024 12:24:20 +0200 Subject: [PATCH 3/3] fix: change name in package-lock --- package-lock.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 14698dd..26d0483 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "elp-query-ui", + "name": "dbbot-ui", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "elp-query-ui", + "name": "dbbot-ui", "version": "0.1.0", "dependencies": { "@emotion/cache": "^11.11.0", @@ -3311,11 +3311,10 @@ "license": "MIT" }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", + "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0",