Merge branch 'main' into DAP-986-consumer

.github/workflows/desktop-release.yaml

@@ -45,7 +45,7 @@ jobs:
         run: |
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
-          git add package.json
+          git add desktop/package.json
           git commit -m "Bumped version to ${{ steps.package_version.outputs.VERSION }}"
           git remote set-url origin https://x-access-token:${{ secrets.GIT_PAT }}@github.com/${{ github.repository }}
           git push origin main

desktop/package.json

@@ -1,76 +1,76 @@
 {
-	"name": "dats",
-	"version": "0.0.0",
-	"description": "Digital Archives Transfer Service",
-	"author": "CITZ IMB/CIRMO",
-	"main": "./out/main/index.js",
-	"type": "module",
-	"build": {
-		"extraFiles": [
-			{
-				"from": "out/cjs-workers/copyWorker.cjs",
-				"to": "resources/copyWorker.cjs"
-			},
-			{
-				"from": "out/cjs-workers/metadataWorker.cjs",
-				"to": "resources/metadataWorker.cjs"
-			}
-		],
-		"publish": [
-			{
-				"provider": "github",
-				"owner": "bcgov",
-				"repo": "citz-grs-dats"
-			}
-		],
-		"productName": "DATS"
-	},
-	"scripts": {
-		"typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
-		"typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
-		"typecheck": "npm run typecheck:node && npm run typecheck:web",
-		"dev": "electron-vite dev",
-		"build": "npm run typecheck && electron-vite build && npm run build:workers",
-		"build:workers": "vite build --config es.workers.vite.config.ts && vite build --config cjs.workers.vite.config.ts",
-		"postinstall": "electron-builder install-app-deps",
-		"build:unpack": "npm run build && electron-builder --dir",
-		"build:win": "npm run build && electron-builder --win",
-		"build:mac": "electron-vite build && electron-builder --mac",
-		"build:linux": "electron-vite build && electron-builder --linux",
-		"bump:patch": "node bump-version patch",
-		"bump:minor": "node bump-version minor",
-		"bump:major": "node bump-version major"
-	},
-	"dependencies": {
-		"@bcgov/bc-sans": "2.1.0",
-		"@bcgov/citz-imb-sso-js-core": "1.0.0",
-		"@bcgov/design-system-react-components": "0.4.0",
-		"@electron-toolkit/preload": "3.0.1",
-		"@electron-toolkit/utils": "3.0.0",
-		"electron-cookies": "1.1.0",
-		"electron-updater": "6.3.9",
-		"@emotion/react": "11.13.3",
-		"@emotion/styled": "11.13.0",
-		"@mui/icons-material": "6.1.6",
-		"@mui/material": "6.1.6",
-		"@mui/x-data-grid": "7.22.1",
-		"@mui/x-date-pickers": "7.22.2",
-		"dayjs": "1.11.13",
-		"react-router-dom": "6.27.0"
-	},
-	"devDependencies": {
-		"@biomejs/biome": "1.9.3",
-		"@electron-toolkit/tsconfig": "1.0.1",
-		"@types/node": "20.14.8",
-		"@types/react": "18.3.3",
-		"@types/react-dom": "18.3.0",
-		"@vitejs/plugin-react": "4.3.1",
-		"electron": "31.0.2",
-		"electron-builder": "24.13.3",
-		"electron-vite": "2.3.0",
-		"react": "18.3.1",
-		"react-dom": "18.3.1",
-		"typescript": "5.5.2",
-		"vite": "5.3.1"
-	}
+  "name": "dats",
+  "version": "0.0.1",
+  "description": "Digital Archives Transfer Service",
+  "author": "CITZ IMB/CIRMO",
+  "main": "./out/main/index.js",
+  "type": "module",
+  "build": {
+    "extraFiles": [
+      {
+        "from": "out/cjs-workers/copyWorker.cjs",
+        "to": "resources/copyWorker.cjs"
+      },
+      {
+        "from": "out/cjs-workers/metadataWorker.cjs",
+        "to": "resources/metadataWorker.cjs"
+      }
+    ],
+    "publish": [
+      {
+        "provider": "github",
+        "owner": "bcgov",
+        "repo": "citz-grs-dats"
+      }
+    ],
+    "productName": "DATS"
+  },
+  "scripts": {
+    "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
+    "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
+    "typecheck": "npm run typecheck:node && npm run typecheck:web",
+    "dev": "electron-vite dev",
+    "build": "npm run typecheck && electron-vite build && npm run build:workers",
+    "build:workers": "vite build --config es.workers.vite.config.ts && vite build --config cjs.workers.vite.config.ts",
+    "postinstall": "electron-builder install-app-deps",
+    "build:unpack": "npm run build && electron-builder --dir",
+    "build:win": "npm run build && electron-builder --win",
+    "build:mac": "electron-vite build && electron-builder --mac",
+    "build:linux": "electron-vite build && electron-builder --linux",
+    "bump:patch": "node bump-version patch",
+    "bump:minor": "node bump-version minor",
+    "bump:major": "node bump-version major"
+  },
+  "dependencies": {
+    "@bcgov/bc-sans": "2.1.0",
+    "@bcgov/citz-imb-sso-js-core": "1.0.0",
+    "@bcgov/design-system-react-components": "0.4.0",
+    "@electron-toolkit/preload": "3.0.1",
+    "@electron-toolkit/utils": "3.0.0",
+    "electron-cookies": "1.1.0",
+    "electron-updater": "6.3.9",
+    "@emotion/react": "11.13.3",
+    "@emotion/styled": "11.13.0",
+    "@mui/icons-material": "6.1.6",
+    "@mui/material": "6.1.6",
+    "@mui/x-data-grid": "7.22.1",
+    "@mui/x-date-pickers": "7.22.2",
+    "dayjs": "1.11.13",
+    "react-router-dom": "6.27.0"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "1.9.3",
+    "@electron-toolkit/tsconfig": "1.0.1",
+    "@types/node": "20.14.8",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "@vitejs/plugin-react": "4.3.1",
+    "electron": "31.0.2",
+    "electron-builder": "24.13.3",
+    "electron-vite": "2.3.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "typescript": "5.5.2",
+    "vite": "5.3.1"
+  }
 }

desktop/src/main/fileProcessing/actions/index.ts

@@ -1,2 +1,3 @@
 export * from "./copyFolderAndMetadata";
 export * from "./getFolderMetadata";
+export * from "./selectDirectory";

desktop/src/main/fileProcessing/actions/selectDirectory.ts

@@ -0,0 +1,23 @@
+import { dialog, type BrowserWindow } from "electron";
+
+let selectedDir: string[] | undefined;
+let dirPathArray: string[];
+
+/**
+ * Opens a (modal) dialog window off the main window for a user to select a directory.
+ *
+ * @param win - the main process window.
+ * @returns A string[] if a directory is selected or undefined if the dialog is closed with no selection.
+ */
+export const selectDirectory = (win: BrowserWindow): string[] => {
+	// open a dialog and allow a user to select multiple folders
+	selectedDir = dialog.showOpenDialogSync(win, {
+		properties: ["openDirectory", "multiSelections"],
+	});
+
+	// if selectedDir is undefined we have no selected path so return an empty array
+	// otherwise return the array of selected paths
+	dirPathArray = selectedDir ?? [""];
+
+	return dirPathArray;
+};

desktop/src/main/index.ts

@@ -12,7 +12,11 @@ import { is } from "@electron-toolkit/utils";
 import icon from "../../resources/icon.png?asset";
 import electronUpdater, { type AppUpdater } from "electron-updater";
 import { createWorkerPool } from "./fileProcessing";
-import { copyFolderAndMetadata, getFolderMetadata } from "./fileProcessing/actions";
+import {
+	copyFolderAndMetadata,
+	getFolderMetadata,
+	selectDirectory,
+} from "./fileProcessing/actions";
 
 app.setName("Digital Archives Transfer Service");
 
@@ -193,6 +197,12 @@ ipcMain.handle("get-folder-metadata", async (_, { filePath }: { filePath: string
 	await getFolderMetadata(pool, filePath, is.dev);
 });
 
+ipcMain.handle("select-directory", () => {
+	debug('Beginning "select-directory" of main process.');
+	// returns selected folder or undefined if no folder was selected
+	return selectDirectory(mainWindow);
+});
+
 const clearAuthState = () => {
 	debug("Beginning clearAuthState function of main process.");
 

desktop/src/preload/index.d.ts

@@ -9,6 +9,7 @@ declare global {
 			checkApiStatus: (url: string) => Promise<boolean>;
 			checkIpRange: () => Promise<boolean>;
 			getCurrentApiUrl: () => Promise<string>;
+			selectDirectory: () => Promise<string[]>;
 
 			sso: {
 				startLoginProcess: () => Promise<void>;

desktop/src/preload/index.ts

@@ -9,6 +9,7 @@ const api = {
 	checkApiStatus,
 	checkIpRange,
 	getCurrentApiUrl: () => ipcRenderer.invoke("get-current-api-url"),
+	selectDirectory: () => ipcRenderer.invoke("select-directory"),
 	sso: {
 		getUser,
 		fetchProtectedRoute,

desktop/src/renderer/src/assets/base.css

@@ -48,7 +48,6 @@ ul {
 body {
 	width: 100%;
 	height: 100%;
-	overflow: hidden;
 	user-select: none;
 	border-top: 1px solid #e3e3e3;
 	min-height: 100vh;

desktop/src/renderer/src/assets/main.css

@@ -5,7 +5,7 @@ body {
 	height: 100%;
 	min-width: 100vh;
 	min-height: 100vh;
-	overflow: hidden;
+	overflow: scroll;
 	user-select: none;
 }
 

desktop/src/renderer/src/components/file-list/ContinueButton.tsx

@@ -0,0 +1,17 @@
+import { Button } from "@bcgov/design-system-react-components";
+
+export const ContinueButton = (): JSX.Element => {
+	const handleClick = async () => {
+		console.log("TODO: THIS");
+	};
+
+	return (
+		<Button
+			variant="primary"
+			style={{ justifyContent: "center", width: "15%" }}
+			onPress={handleClick}
+		>
+			Continue
+		</Button>
+	);
+};

desktop/src/renderer/src/components/file-list/FolderDisplayGrid.tsx

@@ -3,6 +3,7 @@ import {
 	type GridColDef,
 	useGridApiContext,
 	type GridRenderEditCellParams,
+	type useGridApiRef,
 } from "@mui/x-data-grid";
 import {
 	HighlightOff as DeleteIcon,
@@ -72,9 +73,10 @@ const GridEditDateCell = ({
 type Props = {
 	rows: FolderRow[];
 	onFolderDelete: (folder: string) => Promise<void> | void;
+	apiRef: ReturnType<typeof useGridApiRef>;
 };
 
-export const FolderDisplayGrid = ({ rows, onFolderDelete }: Props) => {
+export const FolderDisplayGrid = ({ rows, onFolderDelete, apiRef }: Props) => {
 	const theme = useTheme();
 	const columns: GridColDef<(typeof rows)[number]>[] = [
 		{
@@ -94,22 +96,22 @@ export const FolderDisplayGrid = ({ rows, onFolderDelete }: Props) => {
 				</Box>
 			),
 		},
-		{ field: "folder", headerName: "Folder", width: 150 },
-		{ field: "schedule", headerName: "Schedule", width: 90, editable: true },
+		{ field: "folder", headerName: "Folder", width: 200 },
+		{ field: "schedule", headerName: "Schedule", width: 110, editable: true },
 		{ field: "classification", headerName: "Primary/Secondary", width: 150, editable: true },
-		{ field: "file", headerName: "FILE", width: 100, editable: true },
+		{ field: "file", headerName: "FILE ID", width: 90, editable: true },
 		{
 			field: "opr",
 			headerName: "OPR",
 			type: "boolean",
 			description: "Office of Primary Responsibility",
-			width: 80,
+			width: 60,
 			editable: true,
 		},
 		{
 			field: "startDate",
 			headerName: "Start Date",
-			width: 135,
+			width: 125,
 			editable: true,
 			renderEditCell: (params) => <GridEditDateCell {...params} />,
 			valueFormatter: (value) => {
@@ -122,7 +124,7 @@ export const FolderDisplayGrid = ({ rows, onFolderDelete }: Props) => {
 		{
 			field: "endDate",
 			headerName: "End Date",
-			width: 135,
+			width: 125,
 			editable: true,
 			renderEditCell: (params) => <GridEditDateCell {...params} />,
 			valueFormatter: (value) => {
@@ -135,7 +137,7 @@ export const FolderDisplayGrid = ({ rows, onFolderDelete }: Props) => {
 		{
 			field: "soDate",
 			headerName: "SO Date",
-			width: 135,
+			width: 125,
 			editable: true,
 			renderEditCell: (params) => <GridEditDateCell {...params} />,
 			valueFormatter: (value) => {
@@ -148,7 +150,7 @@ export const FolderDisplayGrid = ({ rows, onFolderDelete }: Props) => {
 		{
 			field: "fdDate",
 			headerName: "FD Date",
-			width: 135,
+			width: 125,
 			editable: true,
 			renderEditCell: (params) => <GridEditDateCell {...params} />,
 			valueFormatter: (value) => {
@@ -182,6 +184,7 @@ export const FolderDisplayGrid = ({ rows, onFolderDelete }: Props) => {
 				<DataGrid
 					rows={rows}
 					columns={columns}
+					apiRef={apiRef}
 					disableRowSelectionOnClick
 					disableColumnFilter
 					disableColumnMenu

desktop/src/renderer/src/components/file-list/SelectFolderButton.tsx

@@ -0,0 +1,23 @@
+import { useState } from "react";
+import { Button } from "@bcgov/design-system-react-components";
+
+export const SelectFolderButton = ({ onRowChange }): JSX.Element => {
+	const [api] = useState(window.api); // preload scripts
+
+	const handleClick = async () => {
+		const result = await api.selectDirectory();
+
+		onRowChange(result);
+		return result;
+	};
+
+	return (
+		<Button
+			variant="primary"
+			style={{ justifyContent: "center", width: "15%" }}
+			onPress={handleClick}
+		>
+			Select Folder(s)
+		</Button>
+	);
+};

desktop/src/renderer/src/components/file-list/index.ts

@@ -1 +1,3 @@
 export * from "./FolderDisplayGrid";
+export * from "./SelectFolderButton";
+export * from "./ContinueButton";