chore: update tags list

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

Cargo.lock

@@ -4,7 +4,7 @@ version="0.0.0"
 edition="2021"
 rust-version="1.80"
 repository="https://github.com/explodingcamera/liwan"
-license="(AGPL-3.0-only AND Apache-2.0 AND MIT) OR LicenseRef-Liwan"
+license="AGPL-3.0-only OR LicenseRef-Liwan"
 
 [lib]
 path="src/lib.rs"

Cargo.toml

@@ -18,23 +18,31 @@ use time::OffsetDateTime;
 
 #[derive(Object)]
 pub struct DateRange {
-    pub start: OffsetDateTime,
-    pub end: OffsetDateTime,
+    pub start: u64,
+    pub end: u64,
 }
 
-impl Display for DateRange {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{} - {}", self.start, self.end)
+impl DateRange {
+    pub fn start(&self) -> OffsetDateTime {
+        OffsetDateTime::from_unix_timestamp(self.start as i64).unwrap_or(OffsetDateTime::UNIX_EPOCH)
+    }
+
+    pub fn end(&self) -> OffsetDateTime {
+        OffsetDateTime::from_unix_timestamp(self.end as i64).unwrap_or(OffsetDateTime::UNIX_EPOCH)
     }
-}
 
-impl DateRange {
     pub fn prev(&self) -> DateRange {
         let duration = self.end - self.start;
         DateRange { start: self.start - duration, end: self.start }
     }
 }
 
+impl Display for DateRange {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{} - {}", self.start, self.end)
+    }
+}
+
 #[derive(Debug, Enum)]
 #[oai(rename_all = "snake_case")]
 pub enum Metric {
@@ -205,7 +213,7 @@ pub fn overall_report(
     ");
 
     let mut stmt = conn.prepare_cached(&query)?;
-    let params = params![range.start, range.end, data_points, data_points, event, range.end];
+    let params = params![range.start(), range.end(), data_points, data_points, event, range.end()];
 
     match metric {
         Metric::Views | Metric::UniqueVisitors | Metric::Sessions => {
@@ -280,7 +288,7 @@ pub fn overall_stats(
     ");
 
     let mut stmt = conn.prepare_cached(&query)?;
-    let params = params![range.start, range.end, event];
+    let params = params![range.start(), range.end(), event];
 
     let result = stmt.query_row(duckdb::params_from_iter(params), |row| {
         Ok(ReportStats {
@@ -365,7 +373,7 @@ pub fn dimension_report(
     );
 
     let mut stmt = conn.prepare_cached(&query)?;
-    let params = params![range.start, range.end, event];
+    let params = params![range.start(), range.end(), event];
 
     match metric {
         Metric::Views | Metric::UniqueVisitors | Metric::Sessions => {

src/app/core/reports.rs

@@ -28,6 +28,7 @@
 
 .title {
   white-space: preserve-breaks;
+  font-size: 1.6rem;
 }
 
 .content {

web/src/api/dashboard.ts

@@ -8,6 +8,11 @@
   transform: translateY(-100%);
 }
 
+.new {
+  padding: 0.4rem 0.5rem;
+  height: fit-content;
+}
+
 .danger {
   --pico-background-color: var(--pico-del-color);
   --pico-border-color: var(--pico-del-color);

web/src/components/dialog.module.css

@@ -19,6 +19,7 @@ import {
 	useProjects,
 } from "../../api";
 import { createToast } from "../toast";
+import { cls } from "../../utils";
 
 const toTitleCase = (str: string) => str[0].toUpperCase() + str.slice(1);
 
@@ -97,90 +98,14 @@ export const DeleteDialog = ({
 	);
 };
 
-export const EditProjectEntities = ({ project, trigger }: { project: ProjectResponse; trigger: JSX.Element }) => {
+export const EditProject = ({ project, trigger }: { project: ProjectResponse; trigger: JSX.Element }) => {
 	const closeRef = useRef<HTMLButtonElement>(null);
 	const { role } = useMe();
 
 	const { entities } = useEntities();
 	const entityTags = useMemo(() => entities.map((p) => ({ value: p.id, label: p.displayName })), [entities]);
 	const [selectedEntities, setSelectedEntities] = useState<Tag[]>([]);
 
-	useEffect(() => {
-		setSelectedEntities(
-			project.entities.map((entity) => ({
-				value: entity.id,
-				label: entity.displayName,
-			})),
-		);
-	}, [project.entities]);
-
-	const { mutate, error, reset } = useMutation({
-		mutationFn: api["/api/dashboard/project/{project_id}"].put,
-		onSuccess: () => {
-			closeRef?.current?.click();
-			createToast("Entities updated successfully", "success");
-			invalidateProjects();
-		},
-		onError: console.error,
-	});
-
-	const handleSubmit = (e: React.FormEvent) => {
-		e.preventDefault();
-		e.stopPropagation();
-		const submitEntities = selectedEntities.map((tag) => tag.value as string);
-		const updateEntities =
-			project.entities
-				.map((p) => p.id)
-				.sort()
-				.join() === submitEntities.sort().join();
-
-		mutate({
-			params: { project_id: project.id },
-			json: { entities: updateEntities ? undefined : submitEntities },
-		});
-	};
-
-	return (
-		<Dialog
-			onOpenChange={() => reset()}
-			title={`Edit Entities: ${project.displayName}`}
-			description="Edit the entities associated with this project."
-			hideDescription
-			trigger={role === "admin" && trigger}
-		>
-			<form onSubmit={handleSubmit}>
-				<Tags
-					labelText="Associated Entities"
-					selected={selectedEntities}
-					suggestions={entityTags}
-					onAdd={(tag) => setSelectedEntities((rest) => [...rest, tag])}
-					onDelete={(i) => setSelectedEntities(selectedEntities.filter((_, index) => index !== i))}
-					noOptionsText="No matching entities"
-				/>
-				<div className="grid">
-					<Dialog.Close asChild>
-						<button className="secondary outline" type="button" ref={closeRef}>
-							Cancel
-						</button>
-					</Dialog.Close>
-					<button type="submit">Save Changes</button>
-				</div>
-				{error && (
-					<article role="alert" className={styles.error}>
-						{"An error occurred while editing the project's entities:"}
-						<br />
-						{error?.message ?? "Unknown error"}
-					</article>
-				)}
-			</form>
-		</Dialog>
-	);
-};
-
-export const EditProject = ({ project, trigger }: { project: ProjectResponse; trigger: JSX.Element }) => {
-	const closeRef = useRef<HTMLButtonElement>(null);
-	const { role } = useMe();
-
 	const { mutate, error, reset } = useMutation({
 		mutationFn: api["/api/dashboard/project/{project_id}"].put,
 		onSuccess: () => {
@@ -191,6 +116,15 @@ export const EditProject = ({ project, trigger }: { project: ProjectResponse; tr
 		onError: console.error,
 	});
 
+	useEffect(() => {
+		setSelectedEntities(
+			project.entities.map((entity) => ({
+				value: entity.id,
+				label: entity.displayName,
+			})),
+		);
+	}, [project.entities]);
+
 	const handleSubmit = (e: React.FormEvent) => {
 		e.preventDefault();
 		e.stopPropagation();
@@ -207,6 +141,7 @@ export const EditProject = ({ project, trigger }: { project: ProjectResponse; tr
 					displayName,
 					public: isPublic === "on",
 				},
+				entities: selectedEntities.map((tag) => tag.value as string),
 			},
 		});
 	};
@@ -224,6 +159,14 @@ export const EditProject = ({ project, trigger }: { project: ProjectResponse; tr
 					Project Name <small>(Used in the dashboard)</small>
 					<input required name="displayName" type="text" defaultValue={project.displayName} />
 				</label>
+				<Tags
+					labelText="Associated Entities"
+					selected={selectedEntities}
+					suggestions={entityTags}
+					onAdd={(tag) => setSelectedEntities((rest) => [...rest, tag])}
+					onDelete={(i) => setSelectedEntities(selectedEntities.filter((_, index) => index !== i))}
+					noOptionsText="No matching entities"
+				/>
 				<label>
 					{/* biome-ignore lint/a11y/useAriaPropsForRole: this is an uncontrolled component */}
 					<input type="checkbox" role="switch" name="isPublic" defaultChecked={project.public} />
@@ -289,8 +232,8 @@ export const CreateProject = () => {
 					sources together."
 			trigger={
 				role === "admin" && (
-					<button type="button" className="contrast">
-						New
+					<button type="button" className={cls("contrast", styles.new)}>
+						Create
 					</button>
 				)
 			}
@@ -452,8 +395,8 @@ export const CreateEntity = () => {
 			description="Entities are individual clients or services that you want to track, like distinct websites or mobile apps. The entity id is used in the tracking snippet to identify the source of the data."
 			trigger={
 				role === "admin" && (
-					<button type="button" className="contrast">
-						New
+					<button type="button" className={cls("contrast", styles.new)}>
+						Create
 					</button>
 				)
 			}
@@ -657,8 +600,8 @@ export const CreateUser = () => {
 			description="Non-admin users can only view data of projects they are members of, and cannot create or edit projects, entities, or users."
 			trigger={
 				role === "admin" && (
-					<button type="button" className="contrast">
-						New
+					<button type="button" className={cls("contrast", styles.new)}>
+						Create
 					</button>
 				)
 			}