feat(notification): reprint added

can now sub to a notification and user can remove them selfs plus an admin can remove,updates to add
new emails are good as well

.changeset/README.md

@@ -1,8 +0,0 @@
-# Changesets
-
-Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
-with multi-package repos, or single-package repos to help you version and publish your code. You can
-find the full documentation for it [in our repository](https://github.com/changesets/changesets)
-
-We have a quick list of common questions to get you started engaging with this project in
-[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/config/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "restricted",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch",
-  "ignore": []
-}

.changeset/neat-years-unite.md

@@ -1,5 +0,0 @@
----
-"lst_v3": patch
----
-
-build stuff

.changeset/pre.json

@@ -1,11 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "alpha",
-  "initialVersions": {
-    "lst_v3": "1.0.1"
-  },
-  "changesets": [
-    "neat-years-unite",
-    "soft-onions-appear"
-  ]
-}

.changeset/soft-onions-appear.md

@@ -1,5 +0,0 @@
----
-"lst_v3": patch
----
-
-external url added for docker

.gitea/workflows/release.yml

@@ -0,0 +1,157 @@
+name: Release and Build Image
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Prepare release metadata
+        shell: bash
+        run: |
+          TAG="${GITHUB_REF_NAME:-${GITHUB_REF##refs/tags/}}"
+          VERSION="${TAG#v}"
+          IMAGE_REGISTRY="${{ gitea.server_url }}"
+          IMAGE_REGISTRY="${IMAGE_REGISTRY#http://}"
+          IMAGE_REGISTRY="${IMAGE_REGISTRY#https://}"
+          IMAGE_NAME="${IMAGE_REGISTRY}/${{ gitea.repository }}"
+
+          echo "TAG=$TAG" >> "$GITHUB_ENV"
+          echo "VERSION=$VERSION" >> "$GITHUB_ENV"
+          echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITHUB_ENV"
+
+          if [[ "$TAG" == *-* ]]; then
+            echo "PRERELEASE=true" >> "$GITHUB_ENV"
+          else
+            echo "PRERELEASE=false" >> "$GITHUB_ENV"
+          fi
+
+      - name: Log in to Gitea container registry
+        shell: bash
+        env:
+          REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+          REGISTRY_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        run: |
+          echo "$REGISTRY_TOKEN" | docker login "${IMAGE_NAME%%/*}" -u "$REGISTRY_USERNAME" --password-stdin
+
+      - name: Build Docker image
+        shell: bash
+        run: |
+          docker build \
+            -t "$IMAGE_NAME:$TAG" \
+            -t "$IMAGE_NAME:latest" \
+            .
+
+      - name: Push version tag
+        shell: bash
+        run: |
+          docker push "$IMAGE_NAME:$TAG"
+
+      - name: Push latest tag
+        if: ${{ !contains(env.TAG, '-') }}
+        shell: bash
+        run: |
+          docker push "$IMAGE_NAME:latest"
+
+      - name: Push prerelease channel tag
+        if: ${{ contains(env.TAG, '-') }}
+        shell: bash
+        run: |
+          CHANNEL="${TAG#*-}"
+          CHANNEL="${CHANNEL%%.*}"
+          docker tag "$IMAGE_NAME:$TAG" "$IMAGE_NAME:$CHANNEL"
+          docker push "$IMAGE_NAME:$CHANNEL"
+
+      - name: Extract matching CHANGELOG section
+        shell: bash
+        run: |
+          python3 - <<'PY'
+          import os
+          import re
+          from pathlib import Path
+
+          version = os.environ["VERSION"]
+          changelog_path = Path("CHANGELOG.md")
+
+          if not changelog_path.exists():
+              Path("release_body.md").write_text(f"Release {version}\n", encoding="utf-8")
+              raise SystemExit(0)
+
+          text = changelog_path.read_text(encoding="utf-8")
+
+          pattern = re.compile(
+              rf"^##\s+\[?{re.escape(version)}\]?[^\n]*\n(.*?)(?=^##\s+\[?[0-9]|\Z)",
+              re.MULTILINE | re.DOTALL,
+          )
+
+          match = pattern.search(text)
+          if match:
+              body = match.group(1).strip()
+          else:
+              body = f"Release {version}"
+
+          if not body:
+              body = f"Release {version}"
+
+          Path("release_body.md").write_text(body + "\n", encoding="utf-8")
+          print(body)
+          PY
+
+      - name: Create Gitea release
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GITEA_SERVER_URL: ${{ gitea.server_url }}
+          GITEA_REPOSITORY: ${{ gitea.repository }}
+        shell: bash
+        run: |
+          python3 - <<'PY'
+          import json
+          import os
+          import urllib.request
+          import urllib.error
+          from pathlib import Path
+
+          tag = os.environ["TAG"]
+          prerelease = os.environ["PRERELEASE"].lower() == "true"
+          server_url = os.environ["GITEA_SERVER_URL"].rstrip("/")
+          repo = os.environ["GITEA_REPOSITORY"]
+          token = os.environ["RELEASE_TOKEN"]
+
+          body = Path("release_body.md").read_text(encoding="utf-8").strip()
+
+          url = f"{server_url}/api/v1/repos/{repo}/releases"
+          payload = {
+              "tag_name": tag,
+              "name": tag,
+              "body": body,
+              "draft": False,
+              "prerelease": prerelease,
+          }
+
+          data = json.dumps(payload).encode("utf-8")
+          req = urllib.request.Request(
+              url,
+              data=data,
+              method="POST",
+              headers={
+                  "Authorization": f"token {token}",
+                  "Content-Type": "application/json",
+                  "Accept": "application/json",
+              },
+          )
+
+          try:
+              with urllib.request.urlopen(req) as resp:
+                  print(resp.read().decode("utf-8"))
+          except urllib.error.HTTPError as e:
+              details = e.read().decode("utf-8", errors="replace")
+              print(details)
+              raise
+          PY

.gitignore

@@ -4,6 +4,7 @@ builds
 .includes
 .buildNumber
 temp
+brunoApi
 .scriptCreds
 node-v24.14.0-x64.msi
 postgresql-17.9-2-windows-x64.exe

.versionrc.json

@@ -11,7 +11,7 @@
         { "type": "ci", "hidden": false, "section": "📈 Project changes" },
         { "type": "build", "hidden": false, "section": "📈 Project Builds" }
     ],
-    "commitUrlFormat": "https://git.tuffraid.net/cowch/lst/commits/{{hash}}",
+    "commitUrlFormat": "https://git.tuffraid.net/cowch/lst_v3/commits/{{hash}}",
-    "compareUrlFormat": "https://git.tuffraid.net/cowch/lst/compare/{{previousTag}}...{{currentTag}}",
+    "compareUrlFormat": "https://git.tuffraid.net/cowch/lst_v3/compare/{{previousTag}}...{{currentTag}}",
     "header": "# All Changes to LST can be found below.\n"
 }

.vscode/settings.json

@@ -56,6 +56,7 @@
 		"alplaprod",
 		"bookin",
 		"Datamart",
+		"dotenvx",
 		"dyco",
 		"intiallally",
 		"manadatory",

CHANGELOG.md

@@ -1,14 +0,0 @@
-# lst_v3
-
-## 1.0.2-alpha.0
-
-### Patch Changes
-
-- build stuff
-- external url added for docker
-
-## 1.0.1
-
-### Patch Changes
-
-- cf18e94: core stuff

README.md

@@ -7,7 +7,7 @@
 Quick summary of current rewrite/migration goal.
 
 - **Phase:** Backend rewrite
-- **Last updated:** 2024-05-01
+- **Last updated:** 2026-04-06
 
 ---
 
@@ -16,9 +16,9 @@ Quick summary of current rewrite/migration goal.
 | Feature | Description | Status |
 |----------|--------------|--------|
 | User Authentication | ~~Login~~, ~~Signup~~, API Key | 🟨 In Progress |
-| User Profile | Edit profile, upload avatar | ⏳ Not Started |
+| User Profile | ~~Edit profile~~, upload avatar | 🟨 In Progress |
 | User Admin | Edit user, create user, remove user, alplaprod user integration | ⏳ Not Started |
-| Notifications | Subscribe, Create, Update, Remove, Manual Trigger | ⏳ Not Started |
+| Notifications | ~~Subscribe~~, ~~Create~~, ~~Update~~, ~~~~Remove~~, Manual Trigger | 🟨 In Progress |
 | Datamart | Create, Update, Run, Deactivate | 🔧 In Progress |
 | Frontend | Analytics and charts | ⏳ Not Started |
 | Docs | Instructions and trouble shooting | ⏳ Not Started |
@@ -44,7 +44,7 @@ _Status legend:_
 How to run the current version of the app.
 
 ```bash
-git clone https://github.com/youruser/yourrepo.git
+git clone https://git.tuffraid.net/cowch/lst_v3.git
-cd yourrepo
+cd lst_v3
 npm install
 npm run dev

backend/notification/notification.reprintLabels.ts

@@ -1,8 +1,108 @@
-const reprint = (data: any, emails: string) => {
+import { eq } from "drizzle-orm";
-	// TODO: do the actual logic for the notification.
+import { db } from "../db/db.controller.js";
-	console.log(data);
+import { notifications } from "../db/schema/notifications.schema.js";
-	console.log(emails);
+import { prodQuery } from "../prodSql/prodSqlQuery.controller.js";
+import {
+	type SqlQuery,
+	sqlQuerySelector,
+} from "../prodSql/prodSqlQuerySelector.utils.js";
+import { returnFunc } from "../utils/returnHelper.utils.js";
+import { sendEmail } from "../utils/sendEmail.utils.js";
+import { tryCatch } from "../utils/trycatch.utils.js";
 
+const reprint = async (data: any, emails: string) => {
+	// TODO: do the actual logic for the notification.
+	const { data: l, error: le } = (await tryCatch(
+		db.select().from(notifications).where(eq(notifications.id, data.id)),
+	)) as any;
+
+	if (le) {
+		return returnFunc({
+			success: false,
+			level: "error",
+			module: "notification",
+			subModule: "query",
+			message: `${data.name} encountered an error while trying to get initial info`,
+			data: [le],
+			notify: true,
+		});
+	}
+
+	// search the query db for the query by name
+	const sqlQuery = sqlQuerySelector(`${data.name}`) as SqlQuery;
+	// create the ignore audit logs ids
+	const ignoreIds = l[0].options[0]?.auditId
+		? `${l[0].options[0]?.auditId}`
+		: "0";
+
+	// run the check
+	const { data: queryRun, error } = await tryCatch(
+		prodQuery(
+			sqlQuery.query
+				.replace("[intervalCheck]", l[0].interval)
+				.replace("[ignoreList]", ignoreIds),
+			`Running notification query: ${l[0].name}`,
+		),
+	);
+
+	if (error) {
+		return returnFunc({
+			success: false,
+			level: "error",
+			module: "notification",
+			subModule: "query",
+			message: `Data for: ${l[0].name} encountered an error while trying to get it`,
+			data: [error],
+			notify: true,
+		});
+	}
+
+	if (queryRun.data.length > 0) {
+		// update the latest audit id
+		const { error: dbe } = await tryCatch(
+			db
+				.update(notifications)
+				.set({ options: [{ auditId: `${queryRun.data[0].id}` }] })
+				.where(eq(notifications.id, data.id)),
+		);
+
+		if (dbe) {
+			return returnFunc({
+				success: false,
+				level: "error",
+				module: "notification",
+				subModule: "query",
+				message: `Data for: ${l[0].name} encountered an error while trying to get it`,
+				data: [dbe],
+				notify: true,
+			});
+		}
+
+		// send the email
+
+		const sentEmail = await sendEmail({
+			email: emails,
+			subject: "Alert! Label Reprinted",
+			template: "reprintLabels",
+			context: {
+				items: queryRun.data,
+			},
+		});
+
+		if (!sentEmail?.success) {
+			return returnFunc({
+				success: false,
+				level: "error",
+				module: "email",
+				subModule: "notification",
+				message: `${l[0].name} failed to send the email`,
+				data: [sentEmail],
+				notify: true,
+			});
+		}
+	} else {
+		console.log("doing nothing as there is nothing to do.");
+	}
 	// TODO send the error to systemAdmin users so they do not always need to be on the notifications.
 	// these errors are defined per notification.
 };

backend/notification/notificationSub.delete.route.ts

@@ -3,12 +3,12 @@ import { type Response, Router } from "express";
 import z from "zod";
 import { db } from "../db/db.controller.js";
 import { notificationSub } from "../db/schema/notifications.sub.schema.js";
+import { auth } from "../utils/auth.utils.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 import { modifiedNotification } from "./notification.controller.js";
 
 const newSubscribe = z.object({
-	emails: z.email().array().describe("An array of emails"),
 	userId: z.string().describe("User id."),
 	notificationId: z.string().describe("Notification id"),
 });
@@ -16,14 +16,29 @@ const newSubscribe = z.object({
 const r = Router();
 
 r.delete("/", async (req, res: Response) => {
+	const hasPermissions = await auth.api.userHasPermission({
+		body: {
+			//userId: req?.user?.id,
+			role: req.user?.roles as any,
+			permissions: {
+				notifications: ["readAll"], // This must match the structure in your access control
+			},
+		},
+	});
+
 	try {
 		const validated = newSubscribe.parse(req.body);
+
 		const { data, error } = await tryCatch(
 			db
 				.delete(notificationSub)
 				.where(
 					and(
-						eq(notificationSub.userId, validated.userId),
+						eq(
+							notificationSub.userId,
+							hasPermissions ? validated.userId : (req?.user?.id ?? ""),
+						), // allows the admin to delete this
+						//eq(notificationSub.userId, req?.user?.id ?? ""),
 						eq(notificationSub.notificationId, validated.notificationId),
 					),
 				)
@@ -44,6 +59,18 @@ r.delete("/", async (req, res: Response) => {
 			});
 		}
 
+		if (data.length <= 0) {
+			return apiReturn(res, {
+				success: false,
+				level: "info",
+				module: "notification",
+				subModule: "post",
+				message: `Subscription was not deleted invalid data sent over`,
+				data: data ?? [],
+				status: 200,
+			});
+		}
+
 		return apiReturn(res, {
 			success: true,
 			level: "info",

backend/notification/notificationSub.get.route.ts

@@ -21,12 +21,16 @@ r.get("/", async (req, res: Response) => {
 		},
 	});
 
+	if (userId) {
+		hasPermissions.success = false;
+	}
+
 	const { data, error } = await tryCatch(
 		db
 			.select()
 			.from(notificationSub)
 			.where(
-				userId || !hasPermissions.success
+				!hasPermissions.success
 					? eq(notificationSub.userId, `${req?.user?.id ?? ""}`)
 					: undefined,
 			),

backend/notification/notificationSub.post.route.ts

@@ -25,8 +25,25 @@ r.post("/", async (req, res: Response) => {
 	try {
 		const validated = newSubscribe.parse(req.body);
 
+		const emails = validated.emails
+			.map((e) => e.trim().toLowerCase())
+			.filter(Boolean);
+
+		const uniqueEmails = [...new Set(emails)];
+
 		const { data, error } = await tryCatch(
-			db.insert(notificationSub).values(validated).returning(),
+			db
+				.insert(notificationSub)
+				.values({
+					userId: req?.user?.id ?? "",
+					notificationId: validated.notificationId,
+					emails: uniqueEmails,
+				})
+				.onConflictDoUpdate({
+					target: [notificationSub.userId, notificationSub.notificationId],
+					set: { emails: uniqueEmails },
+				})
+				.returning(),
 		);
 
 		await modifiedNotification(validated.notificationId);

backend/notification/notifications.master.ts

@@ -14,7 +14,7 @@ const note: NewNotification[] = [
 			"Monitors the labels that are printed and returns a there data, if one falls withing the time frame.",
 		active: false,
 		interval: "10",
-		options: [{ prodID: 1 }],
+		options: [{ auditId: [0] }],
 	},
 ];
 

backend/prodSql/queries/reprintLabels.sql

@@ -0,0 +1,28 @@
+use [test1_AlplaPROD2.0_Read]
+
+SELECT
+	--JSON_VALUE(content, '$.EntityId') as labelId
+	a.id
+	,ActorName
+	,FORMAT(PrintDate, 'yyyy-MM-dd HH:mm') as printDate
+	,FORMAT(CreatedDateTime, 'yyyy-MM-dd HH:mm') createdDateTime
+    ,l.ArticleHumanReadableId as av
+	,l.ArticleDescription as alias
+	,PrintedCopies
+	,p.name as printerName
+	,RunningNumber
+	--,*
+FROM [support].[AuditLog] (nolock) as a
+
+left join
+	[labelling].[InternalLabel] (nolock)  as l on 
+	l.id = JSON_VALUE(content, '$.EntityId')
+
+left join
+	[masterData].[printer] (nolock) as p on
+	p.id = l.PrinterId
+
+where message like '%reprint%'
+	and CreatedDateTime > DATEADD(minute, -[intervalCheck], SYSDATETIMEOFFSET())
+	and a.id > [ignoreList]
+order by CreatedDateTime desc

backend/utils/mailViews/reprintLabels.hbs

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    {{!-- <link rel="stylesheet" href="styles/styles.css" /> --}}
+    {{> styles}}
+</head>
+<body>
+        <p>All,</p> 
+        <p>The below labels have been reprinted.</p>        
+        <table > 
+        <thead> 
+            <tr> 
+            <th>AV</th> 
+            <th>Description</th> 
+            <th>Label Number</th> 
+            <th>Date Added</th> 
+            <th>Date Reprinted</th> 
+            <th>Who printed/Updated</th> 
+            <th>What printer it came from</th> 
+ 
+            </tr> 
+        </thead> 
+
+        <tbody>
+            {{#each items}}
+                    <tr>
+                        <td>{{av}}</td>
+                        <td>{{alias}}</td>
+                        <td>{{RunningNumber}}</td>
+                        <td>{{printDate}}</td>
+                        <td>{{createdDateTime}}</td>
+                        <td>{{ActorName}}</td>
+                        <td>{{printerName}}</td>
+
+                    </tr>
+                {{/each}}
+        </tbody>
+        </table>
+
+        <div>
+        <p>Thank you,</p>
+        <p>LST Team</p> 
+        </div>
+</body>
+</html>

backend/utils/returnHelper.utils.ts

@@ -10,7 +10,8 @@ interface Data<T = unknown[]> {
 		| "datamart"
 		| "utils"
 		| "opendock"
-		| "notification";
+		| "notification"
+		| "email";
 	subModule:
 		| "db"
 		| "labeling"

brunoApi/environments/lstv3.bru

@@ -1,5 +1,5 @@
 vars {
-  url: http://localhost:3000/lst
+  url: http://localhost:3600/lst
   readerIp: 10.44.14.215
 }
 vars:secret [

docker-compose.yml

@@ -14,7 +14,7 @@ services:
         environment:
             - NODE_ENV=production
             - LOG_LEVEL=info
-            - EXTERNAL_URL=192.168.8.222:3600
+            - EXTERNAL_URL=http://192.168.8.222:3600
             - DATABASE_HOST=host.docker.internal # if running on the same docker then do this
             - DATABASE_PORT=5433
             - DATABASE_USER=${DATABASE_USER}

frontend/src/components/Sidebar/AdminBar.tsx

@@ -1,5 +1,5 @@
 import { Link } from "@tanstack/react-router";
-import { Logs } from "lucide-react";
+import { Bell, Logs, Settings } from "lucide-react";
 
 import {
 	SidebarGroup,
@@ -24,10 +24,18 @@ import {
 export default function AdminSidebar({ session }: any) {
 	const { setOpen } = useSidebar();
 	const items = [
+		{
+			title: "Notifications",
+			url: "/admin/notifications",
+			icon: Bell,
+			role: ["systemAdmin", "admin"],
+			module: "admin",
+			active: true,
+		},
 		{
 			title: "Settings",
 			url: "/admin/settings",
-			icon: Logs,
+			icon: Settings,
 			role: ["systemAdmin"],
 			module: "admin",
 			active: true,

frontend/src/lib/formSutff/Select.Field.tsx

@@ -42,7 +42,7 @@ export const SelectField = ({
 					>
 						<SelectValue placeholder={placeholder} />
 					</SelectTrigger>
-					<SelectContent>
+					<SelectContent position={"popper"}>
 						{options.map((option) => (
 							<SelectItem key={option.value} value={option.value}>
 								{option.label}

frontend/src/lib/queries/getSettings.ts

@@ -13,7 +13,7 @@ export function getSettings() {
 
 const fetch = async () => {
 	if (window.location.hostname === "localhost") {
-		await new Promise((res) => setTimeout(res, 5000));
+		await new Promise((res) => setTimeout(res, 1500));
 	}
 
 	const { data } = await axios.get("/lst/api/settings");

frontend/src/lib/queries/notificationSubs.ts

@@ -13,7 +13,7 @@ export function notificationSubs(userId?: string) {
 
 const fetch = async (userId?: string) => {
 	if (window.location.hostname === "localhost") {
-		await new Promise((res) => setTimeout(res, 5000));
+		await new Promise((res) => setTimeout(res, 1500));
 	}
 
 	const { data } = await axios.get(

frontend/src/lib/queries/notifications.ts

@@ -13,7 +13,7 @@ export function notifications() {
 
 const fetch = async () => {
 	if (window.location.hostname === "localhost") {
-		await new Promise((res) => setTimeout(res, 5000));
+		await new Promise((res) => setTimeout(res, 1500));
 	}
 
 	const { data } = await axios.get("/lst/api/notification");

frontend/src/routeTree.gen.ts

@@ -12,6 +12,7 @@ import { Route as rootRouteImport } from './routes/__root'
 import { Route as AboutRouteImport } from './routes/about'
 import { Route as IndexRouteImport } from './routes/index'
 import { Route as AdminSettingsRouteImport } from './routes/admin/settings'
+import { Route as AdminNotificationsRouteImport } from './routes/admin/notifications'
 import { Route as AdminLogsRouteImport } from './routes/admin/logs'
 import { Route as authLoginRouteImport } from './routes/(auth)/login'
 import { Route as authUserSignupRouteImport } from './routes/(auth)/user.signup'
@@ -33,6 +34,11 @@ const AdminSettingsRoute = AdminSettingsRouteImport.update({
   path: '/admin/settings',
   getParentRoute: () => rootRouteImport,
 } as any)
+const AdminNotificationsRoute = AdminNotificationsRouteImport.update({
+  id: '/admin/notifications',
+  path: '/admin/notifications',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const AdminLogsRoute = AdminLogsRouteImport.update({
   id: '/admin/logs',
   path: '/admin/logs',
@@ -64,6 +70,7 @@ export interface FileRoutesByFullPath {
   '/about': typeof AboutRoute
   '/login': typeof authLoginRoute
   '/admin/logs': typeof AdminLogsRoute
+  '/admin/notifications': typeof AdminNotificationsRoute
   '/admin/settings': typeof AdminSettingsRoute
   '/user/profile': typeof authUserProfileRoute
   '/user/resetpassword': typeof authUserResetpasswordRoute
@@ -74,6 +81,7 @@ export interface FileRoutesByTo {
   '/about': typeof AboutRoute
   '/login': typeof authLoginRoute
   '/admin/logs': typeof AdminLogsRoute
+  '/admin/notifications': typeof AdminNotificationsRoute
   '/admin/settings': typeof AdminSettingsRoute
   '/user/profile': typeof authUserProfileRoute
   '/user/resetpassword': typeof authUserResetpasswordRoute
@@ -85,6 +93,7 @@ export interface FileRoutesById {
   '/about': typeof AboutRoute
   '/(auth)/login': typeof authLoginRoute
   '/admin/logs': typeof AdminLogsRoute
+  '/admin/notifications': typeof AdminNotificationsRoute
   '/admin/settings': typeof AdminSettingsRoute
   '/(auth)/user/profile': typeof authUserProfileRoute
   '/(auth)/user/resetpassword': typeof authUserResetpasswordRoute
@@ -97,6 +106,7 @@ export interface FileRouteTypes {
     | '/about'
     | '/login'
     | '/admin/logs'
+    | '/admin/notifications'
     | '/admin/settings'
     | '/user/profile'
     | '/user/resetpassword'
@@ -107,6 +117,7 @@ export interface FileRouteTypes {
     | '/about'
     | '/login'
     | '/admin/logs'
+    | '/admin/notifications'
     | '/admin/settings'
     | '/user/profile'
     | '/user/resetpassword'
@@ -117,6 +128,7 @@ export interface FileRouteTypes {
     | '/about'
     | '/(auth)/login'
     | '/admin/logs'
+    | '/admin/notifications'
     | '/admin/settings'
     | '/(auth)/user/profile'
     | '/(auth)/user/resetpassword'
@@ -128,6 +140,7 @@ export interface RootRouteChildren {
   AboutRoute: typeof AboutRoute
   authLoginRoute: typeof authLoginRoute
   AdminLogsRoute: typeof AdminLogsRoute
+  AdminNotificationsRoute: typeof AdminNotificationsRoute
   AdminSettingsRoute: typeof AdminSettingsRoute
   authUserProfileRoute: typeof authUserProfileRoute
   authUserResetpasswordRoute: typeof authUserResetpasswordRoute
@@ -157,6 +170,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AdminSettingsRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/admin/notifications': {
+      id: '/admin/notifications'
+      path: '/admin/notifications'
+      fullPath: '/admin/notifications'
+      preLoaderRoute: typeof AdminNotificationsRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/admin/logs': {
       id: '/admin/logs'
       path: '/admin/logs'
@@ -200,6 +220,7 @@ const rootRouteChildren: RootRouteChildren = {
   AboutRoute: AboutRoute,
   authLoginRoute: authLoginRoute,
   AdminLogsRoute: AdminLogsRoute,
+  AdminNotificationsRoute: AdminNotificationsRoute,
   AdminSettingsRoute: AdminSettingsRoute,
   authUserProfileRoute: authUserProfileRoute,
   authUserResetpasswordRoute: authUserResetpasswordRoute,

frontend/src/routes/(auth)/-components/NotificationsSubCard.tsx

@@ -1,4 +1,6 @@
 import { useSuspenseQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { toast } from "sonner";
 import {
 	Card,
 	CardContent,
@@ -12,15 +14,32 @@ import { notifications } from "../../../lib/queries/notifications";
 
 export default function NotificationsSubCard({ user }: any) {
 	const { data } = useSuspenseQuery(notifications());
-	const { data: ns } = useSuspenseQuery(notificationSubs(user.id));
+	const { refetch } = useSuspenseQuery(notificationSubs(user.id));
 	const form = useAppForm({
 		defaultValues: {
 			notificationId: "",
 			emails: [user.email],
 		},
 		onSubmit: async ({ value }) => {
+			if (value.notificationId === "") {
+				toast.error("Please select a notification before trying to subscribe.");
+				return;
+			}
 			const postD = { ...value, userId: user.id };
-			console.log(postD);
+
+			try {
+				const res = await axios.post("/lst/api/notification/sub", postD, {
+					withCredentials: true,
+				});
+
+				if (res.status === 200) {
+					toast.success("Notification Subbed");
+					refetch();
+					form.reset();
+				}
+			} catch (error) {
+				console.error(error);
+			}
 		},
 	});
 
@@ -32,11 +51,9 @@ export default function NotificationsSubCard({ user }: any) {
 		}));
 	}
 
-	console.log(ns);
-
 	return (
 		<div>
-			<Card className="p-3 w-128">
+			<Card className="p-3 w-lg">
 				<CardHeader>
 					<CardTitle>Notifications</CardTitle>
 					<CardDescription>

frontend/src/routes/(auth)/-components/NotificationsTable.tsx

@@ -0,0 +1,114 @@
+import { useSuspenseQuery } from "@tanstack/react-query";
+import { createColumnHelper } from "@tanstack/react-table";
+import axios from "axios";
+import { Trash } from "lucide-react";
+import { toast } from "sonner";
+import type { Notifications } from "../../../../types/notifications";
+import { Button } from "../../../components/ui/button";
+import { Card, CardContent, CardHeader } from "../../../components/ui/card";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "../../../components/ui/tooltip";
+import { notificationSubs } from "../../../lib/queries/notificationSubs";
+import { notifications } from "../../../lib/queries/notifications";
+import LstTable from "../../../lib/tableStuff/LstTable";
+import SearchableHeader from "../../../lib/tableStuff/SearchableHeader";
+
+export default function NotificationsTable({ userId }: any) {
+	const { data: subs, refetch } = useSuspenseQuery(notificationSubs(userId));
+	const { data: note } = useSuspenseQuery(notifications());
+	const columnHelper = createColumnHelper<Notifications>();
+
+	// filter out the current
+	const notificationMap = Object.fromEntries(note.map((n: any) => [n.id, n]));
+
+	const data = subs.map((sub: any) => ({
+		...sub,
+		name: notificationMap[sub.notificationId].name || null,
+		description: notificationMap[sub.notificationId].description || null,
+		emails: sub.emails ? sub.emails.join(",") : null,
+	}));
+
+	const removeNotification = async (ns: any) => {
+		try {
+			const res = await axios.delete(`/lst/api/notification/sub`, {
+				withCredentials: true,
+				data: {
+					userId: ns.userId,
+					notificationId: ns.notificationId,
+				},
+			});
+
+			if (res.data.success) {
+				toast.success(`Subscription removed`);
+				refetch();
+			} else {
+				console.info(res);
+				toast.error(res.data.message);
+			}
+		} catch {
+			toast.error(`There was an error removing subscription.`);
+		}
+	};
+
+	const column = [
+		columnHelper.accessor("name", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Name" searchable={true} />
+			),
+			filterFn: "includesString",
+			cell: (i) => i.getValue(),
+		}),
+		columnHelper.accessor("description", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Description" />
+			),
+			cell: (i) => (
+				<Tooltip>
+					<TooltipTrigger>
+						{i.getValue()?.length > 25 ? (
+							<span>{i.getValue().slice(0, 25)}...</span>
+						) : (
+							<span>{i.getValue()}</span>
+						)}
+					</TooltipTrigger>
+					<TooltipContent>{i.getValue()}</TooltipContent>
+				</Tooltip>
+			),
+		}),
+		columnHelper.accessor("emails", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Emails" searchable={true} />
+			),
+			filterFn: "includesString",
+			cell: (i) => i.getValue(),
+		}),
+		columnHelper.accessor("remove", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Remove" searchable={false} />
+			),
+			filterFn: "includesString",
+			cell: (i) => {
+				return (
+					<Button
+						size="icon"
+						variant={"destructive"}
+						onClick={() => removeNotification(i.row.original)}
+					>
+						<Trash />
+					</Button>
+				);
+			},
+		}),
+	];
+	return (
+		<Card>
+			<CardHeader className="text-center">Subscriptions</CardHeader>
+			<CardContent>
+				<LstTable data={data} columns={column} />
+			</CardContent>
+		</Card>
+	);
+}

frontend/src/routes/(auth)/user.profile.tsx

@@ -13,6 +13,7 @@ import { useAppForm } from "@/lib/formSutff";
 import { Spinner } from "../../components/ui/spinner";
 import ChangePassword from "./-components/ChangePassword";
 import NotificationsSubCard from "./-components/NotificationsSubCard";
+import NotificationsTable from "./-components/NotificationsTable";
 
 export const Route = createFileRoute("/(auth)/user/profile")({
 	beforeLoad: async () => {
@@ -57,51 +58,73 @@ function RouteComponent() {
 		},
 	});
 	return (
-		<div className="flex justify-center flex-col pt-4 gap-2 lg:flex-row">
+		<div className="flex justify-center flex-col pt-4 gap-2">
-			<div>
+			<div className="flex justify-center flex-col pt-4 gap-2 lg:flex-row">
-				<Card className="p-6 w-96">
+				<div>
-					<CardHeader>
+					<Card className="p-6 w-96">
-						<CardTitle>Profile</CardTitle>
+						<CardHeader>
-						<CardDescription>
+							<CardTitle>Profile</CardTitle>
-							Change your profile and password below
+							<CardDescription>
-						</CardDescription>
+								Change your profile and password below
-					</CardHeader>
+							</CardDescription>
+						</CardHeader>
 
-					<CardContent>
+						<CardContent>
-						<form
+							<form
-							onSubmit={(e) => {
+								onSubmit={(e) => {
-								e.preventDefault();
+									e.preventDefault();
-								form.handleSubmit();
+									form.handleSubmit();
-							}}
+								}}
-						>
+							>
-							<form.AppField name="name">
+								<form.AppField name="name">
-								{(field) => (
+									{(field) => (
-									<field.InputField
+										<field.InputField
-										label="Name"
+											label="Name"
-										inputType="string"
+											inputType="string"
-										required={true}
+											required={true}
-									/>
+										/>
-								)}
+									)}
-							</form.AppField>
+								</form.AppField>
 
-							<div className="flex justify-end mt-6">
+								<div className="flex justify-end mt-6">
-								<form.AppForm>
+									<form.AppForm>
-									<form.SubmitButton>Update Profile</form.SubmitButton>
+										<form.SubmitButton>Update Profile</form.SubmitButton>
-								</form.AppForm>
+									</form.AppForm>
-							</div>
+								</div>
-						</form>
+							</form>
-					</CardContent>
+						</CardContent>
-				</Card>
+					</Card>
+				</div>
+				<div>
+					<ChangePassword />
+				</div>
+				<div>
+					<Suspense
+						fallback={
+							<Card className="p-3 w-lg">
+								<CardHeader>
+									<CardTitle>Notifications</CardTitle>
+								</CardHeader>
+								<CardContent>
+									<div className="flex justify-center m-auto">
+										<div>
+											<Spinner className="size-32" />
+										</div>
+									</div>
+								</CardContent>
+							</Card>
+						}
+					>
+						{session && <NotificationsSubCard user={session.user} />}
+					</Suspense>
+				</div>
 			</div>
-			<div>
+			<div className="w-fill">
-				<ChangePassword />
-			</div>
-			<div>
 				<Suspense
 					fallback={
-						<Card className="p-3 w-96">
+						<Card className="p-3">
 							<CardHeader>
-								<CardTitle>Notifications</CardTitle>
+								<CardTitle className="text-center">Subscriptions</CardTitle>
 							</CardHeader>
 							<CardContent>
 								<div className="flex justify-center m-auto">
@@ -113,7 +136,7 @@ function RouteComponent() {
 						</Card>
 					}
 				>
-					{session && <NotificationsSubCard user={session.user} />}
+					{session && <NotificationsTable userId={`${session.user.id}`} />}
 				</Suspense>
 			</div>
 		</div>

frontend/src/routes/admin/notifications.tsx

@@ -0,0 +1,324 @@
+import { useMutation, useSuspenseQuery } from "@tanstack/react-query";
+import { createFileRoute, redirect } from "@tanstack/react-router";
+import { createColumnHelper } from "@tanstack/react-table";
+import axios from "axios";
+import { Trash } from "lucide-react";
+import { Suspense, useState } from "react";
+import { toast } from "sonner";
+import type { Notifications } from "../../../types/notifications";
+import { Button } from "../../components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardHeader,
+	CardTitle,
+} from "../../components/ui/card";
+import { Label } from "../../components/ui/label";
+import { Switch } from "../../components/ui/switch";
+import {
+	Tabs,
+	TabsContent,
+	TabsList,
+	TabsTrigger,
+} from "../../components/ui/tabs";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+} from "../../components/ui/tooltip";
+import { authClient } from "../../lib/auth-client";
+import { notificationSubs } from "../../lib/queries/notificationSubs";
+import { notifications } from "../../lib/queries/notifications";
+import EditableCellInput from "../../lib/tableStuff/EditableCellInput";
+import LstTable from "../../lib/tableStuff/LstTable";
+import SearchableHeader from "../../lib/tableStuff/SearchableHeader";
+import SkellyTable from "../../lib/tableStuff/SkellyTable";
+
+const updateNotifications = async (
+	id: string,
+	data: Record<string, string | number | boolean | null>,
+) => {
+	//console.log(id, data);
+	try {
+		const res = await axios.patch(
+			`/lst/api/notification/${id}`,
+			{ interval: data.interval },
+			{
+				withCredentials: true,
+			},
+		);
+		toast.success(`Notification was just updated`);
+		return res;
+	} catch (err) {
+		toast.error("Error in updating the settings");
+		return err;
+	}
+};
+
+export const Route = createFileRoute("/admin/notifications")({
+	beforeLoad: async ({ location }) => {
+		const { data: session } = await authClient.getSession();
+		const allowedRole = ["systemAdmin", "admin"];
+
+		if (!session?.user) {
+			throw redirect({
+				to: "/",
+				search: {
+					redirect: location.href,
+				},
+			});
+		}
+
+		if (!allowedRole.includes(session.user.role as string)) {
+			throw redirect({
+				to: "/",
+			});
+		}
+
+		return { user: session.user };
+	},
+	component: RouteComponent,
+});
+
+const NotificationTable = () => {
+	const { data, refetch } = useSuspenseQuery(notifications());
+	const { data: subs, refetch: subRefetch } = useSuspenseQuery(
+		notificationSubs(),
+	);
+	const columnHelper = createColumnHelper<Notifications>();
+
+	const notificationMap = Object.fromEntries(data.map((n: any) => [n.id, n]));
+
+	const subData = subs.map((sub: any) => ({
+		...sub,
+		name: notificationMap[sub.notificationId].name || null,
+		description: notificationMap[sub.notificationId].description || null,
+		emails: sub.emails ? sub.emails.join(",") : null,
+	}));
+
+	const updateNotification = useMutation({
+		mutationFn: ({
+			id,
+			field,
+			value,
+		}: {
+			id: string;
+			field: string;
+			value: string | number | boolean | null;
+		}) => updateNotifications(id, { [field]: value }),
+
+		onSuccess: () => {
+			// refetch or update cache
+			refetch();
+		},
+	});
+
+	const removeNotification = async (ns: any) => {
+		try {
+			const res = await axios.delete(`/lst/api/notification/sub`, {
+				withCredentials: true,
+				data: {
+					userId: ns.userId,
+					notificationId: ns.notificationId,
+				},
+			});
+
+			if (res.data.success) {
+				toast.success(`Subscription removed`);
+				subRefetch();
+			} else {
+				console.info(res);
+				toast.error(res.data.message);
+			}
+		} catch {
+			toast.error(`There was an error removing subscription.`);
+		}
+	};
+
+	const column = [
+		columnHelper.accessor("name", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Name" searchable={true} />
+			),
+			filterFn: "includesString",
+			cell: (i) => i.getValue(),
+		}),
+		columnHelper.accessor("description", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Description" />
+			),
+			cell: (i) => (
+				<Tooltip>
+					<TooltipTrigger>
+						{i.getValue()?.length > 25 ? (
+							<span>{i.getValue().slice(0, 25)}...</span>
+						) : (
+							<span>{i.getValue()}</span>
+						)}
+					</TooltipTrigger>
+					<TooltipContent>{i.getValue()}</TooltipContent>
+				</Tooltip>
+			),
+		}),
+		columnHelper.accessor("active", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Active" searchable={false} />
+			),
+			filterFn: "includesString",
+			cell: (i) => {
+				// biome-ignore lint: just removing the lint for now to get this going will maybe fix later
+				const [activeToggle, setActiveToggle] = useState(i.getValue());
+
+				const onToggle = async (e: boolean) => {
+					setActiveToggle(e);
+
+					try {
+						const res = await axios.patch(
+							`/lst/api/notification/${i.row.original.id}`,
+							{
+								active: !activeToggle,
+							},
+							{ withCredentials: true },
+						);
+
+						if (res.data.success) {
+							toast.success(
+								`${i.row.original.name} was set to ${activeToggle ? "Inactive" : "Active"}`,
+							);
+							refetch();
+						}
+					} catch (error) {
+						console.error(error);
+					}
+				};
+
+				return (
+					<div className="w-48">
+						<div className="flex items-center space-x-2">
+							<Switch
+								id={i.row.original.id}
+								checked={activeToggle}
+								onCheckedChange={(e) => onToggle(e)}
+								//onBlur={field.handleBlur}
+							/>
+							<Label htmlFor={i.row.original.id}>
+								{activeToggle ? "Active" : "Deactivated"}
+							</Label>
+						</div>
+					</div>
+				);
+			},
+		}),
+		columnHelper.accessor("interval", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Interval" />
+			),
+
+			filterFn: "includesString",
+			cell: ({ row, getValue }) => {
+				return (
+					<EditableCellInput
+						value={getValue()}
+						id={row.original.id}
+						field="interval"
+						onSubmit={({ id, field, value }) => {
+							updateNotification.mutate({ id, field, value });
+						}}
+					/>
+				);
+			},
+		}),
+	];
+
+	const subsColumn = [
+		columnHelper.accessor("name", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Name" searchable={true} />
+			),
+			filterFn: "includesString",
+			cell: (i) => i.getValue(),
+		}),
+		columnHelper.accessor("description", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Description" />
+			),
+			cell: (i) => (
+				<Tooltip>
+					<TooltipTrigger>
+						{i.getValue()?.length > 25 ? (
+							<span>{i.getValue().slice(0, 25)}...</span>
+						) : (
+							<span>{i.getValue()}</span>
+						)}
+					</TooltipTrigger>
+					<TooltipContent>{i.getValue()}</TooltipContent>
+				</Tooltip>
+			),
+		}),
+		columnHelper.accessor("emails", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Emails" searchable={true} />
+			),
+			filterFn: "includesString",
+			cell: (i) => i.getValue(),
+		}),
+		columnHelper.accessor("remove", {
+			header: ({ column }) => (
+				<SearchableHeader column={column} title="Remove" searchable={false} />
+			),
+			filterFn: "includesString",
+			cell: (i) => {
+				return (
+					<Button
+						size="icon"
+						variant={"destructive"}
+						onClick={() => removeNotification(i.row.original)}
+					>
+						<Trash />
+					</Button>
+				);
+			},
+		}),
+	];
+
+	return (
+		<>
+			<TabsContent value="notifications">
+				<LstTable data={data} columns={column} />
+			</TabsContent>
+			<TabsContent value="subscriptions">
+				<LstTable data={subData} columns={subsColumn} />
+			</TabsContent>
+		</>
+	);
+};
+
+function RouteComponent() {
+	return (
+		<div className="space-y-6">
+			<div className="space-y-2">
+				<h1 className="text-2xl font-semibold">Settings</h1>
+				<p className="text-sm text-muted-foreground">
+					Manage you settings and related data.
+				</p>
+			</div>
+
+			<Card>
+				<CardHeader>
+					<CardTitle>System Settings</CardTitle>
+				</CardHeader>
+				<CardContent>
+					<Tabs defaultValue="notifications" className="w-full">
+						<TabsList>
+							<TabsTrigger value="notifications">Notifications</TabsTrigger>
+							<TabsTrigger value="subscriptions">Subscriptions</TabsTrigger>
+						</TabsList>
+						<Suspense fallback={<SkellyTable />}>
+							<NotificationTable />
+						</Suspense>
+					</Tabs>
+				</CardContent>
+			</Card>
+		</div>
+	);
+}

frontend/src/routes/admin/settings.tsx

@@ -46,7 +46,7 @@ const updateSettings = async (
 	id: string,
 	data: Record<string, string | number | boolean | null>,
 ) => {
-	console.log(id, data);
+	//console.log(id, data);
 	try {
 		const res = await axios.patch(`/lst/api/settings/${id}`, data, {
 			withCredentials: true,

frontend/src/routes/index.tsx

@@ -34,7 +34,7 @@ function Index() {
 			<p>
 				This is active in your plant today due to having warehousing activated
 				and new functions needed to be introduced, you should be still using LST
-				as you were before
+				as you were before.
 			</p>
 			<br></br>
 			<p>

frontend/types/notifications.ts

@@ -0,0 +1,10 @@
+export type Notifications = {
+	id: string;
+	name: string;
+	emails: string;
+	description: string;
+	remove?: unknown;
+	active?: boolean;
+	interval: number;
+	options: unknown[];
+};

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "lst_v3",
-	"version": "1.0.2-alpha.0",
+	"version": "0.0.1-alpha.0",
 	"description": "The tool that supports us in our everyday alplaprod",
 	"main": "index.js",
 	"scripts": {
@@ -20,13 +20,9 @@
 		"start:server": "dotenvx run -f .env -- node dist/server.js",
 		"start:docker": "node dist/server.js",
 		"version": "changeset version",
-		"release": "dotenvx run -f .env -- npm run version && git push --follow-tags && node scripts/create-release.js",
 		"specCheck": "node scripts/check-route-specs.mjs",
 		"commit": "cz",
-		"changeset": "changeset",
+		"release": "commit-and-tag-version"
-		"changeset:add": "changeset",
-		"changeset:version": "changeset version",
-		"changeset:status": "changeset status --verbose"
 	},
 	"repository": {
 		"type": "git",
@@ -38,7 +34,6 @@
 	"type": "module",
 	"devDependencies": {
 		"@biomejs/biome": "2.4.8",
-		"@changesets/cli": "^2.30.0",
 		"@commitlint/cli": "^20.5.0",
 		"@commitlint/config-conventional": "^20.5.0",
 		"@types/cors": "^2.8.19",
@@ -54,6 +49,7 @@
 		"@types/supertest": "^7.2.0",
 		"@types/swagger-jsdoc": "^6.0.4",
 		"@types/swagger-ui-express": "^4.1.8",
+		"commit-and-tag-version": "^12.7.1",
 		"commitizen": "^4.3.1",
 		"cpy-cli": "^7.0.0",
 		"cz-conventional-changelog": "^3.3.0",

scripts/dockerscripts.md

@@ -74,7 +74,7 @@ stage the change log file
 
 git commit -m "chore(release): version packages"
 
-git tag v1.0.1 this will be the new version 
+git tag v0.0.1-alpha.0 change this to the same version thats in the pkg.json
 
 then push it 
 
@@ -111,3 +111,22 @@ Release flow
 7. git tag vX.X.X
 8. git push
 9. git push --tags
+
+
+# normal work
+stage files
+npm run commit
+
+# if releasing
+npm run commit
+npm run release -- --prerelease alpha
+git push
+git push --tags
+
+
+git add .
+git commit -m "chore(release): version packages"
+git tag v0.0.1-alpha.0
+git push
+git push --tags
+