Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f712dba23 | |||
| 1abeab6e46 | |||
| fe9eb915e1 | |||
| 86cdffdd1c | |||
| 3a909e6265 |
18 changed files with 3092 additions and 527 deletions
2180
docs/Ai-converstion.md
Normal file
2180
docs/Ai-converstion.md
Normal file
File diff suppressed because it is too large
Load diff
BIN
docs/Ai-converstion.pdf
Normal file
BIN
docs/Ai-converstion.pdf
Normal file
Binary file not shown.
|
|
@ -352,3 +352,21 @@ Project-1 ID c8eebe0e-6e90-4cfb-8e44-c05f7064f3b1 parentID 0371
|
|||
AS-NZS3000-2018.pdf parentID c8eebe0e-6e90-4cfb-8e44-c05f7064f3b1
|
||||
|
||||
Now we will go now and add metadata
|
||||
|
||||
Now we have the metadata along with some great filters on the data board page
|
||||
|
||||
Now we are going to implement an an update of a file or folder stored. 12/1/2026
|
||||
|
||||
For download there 2 function we need to implement
|
||||
|
||||
1) down load the file to ~/user/Downloads, this should work for any file type including pdf
|
||||
|
||||
2) if the file is a pdf open the file in another tab in the browser as most browser support reading a pdf
|
||||
|
||||
For download there 2 function we need to implement
|
||||
|
||||
1) down load the file to ~/user/Downloads, this should work for any file type including pdf
|
||||
|
||||
2) if the file is a pdf open the file in another tab in the browser as most browser support reading a pdf
|
||||
|
||||
So we need to implement 2 new actions, downLoad file and open pdf to read. Does this make sense ?
|
||||
BIN
docs/notes.pdf
BIN
docs/notes.pdf
Binary file not shown.
102
package-lock.json
generated
102
package-lock.json
generated
|
|
@ -13,9 +13,9 @@
|
|||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.1",
|
||||
"@mui/icons-material": "^7.3.6",
|
||||
"@mui/material": "^7.3.6",
|
||||
"@mui/material": "^7.3.7",
|
||||
"@mui/material-nextjs": "^7.3.6",
|
||||
"@mui/x-data-grid": "^8.23.0",
|
||||
"@mui/x-data-grid": "^8.24.0",
|
||||
"@prisma/adapter-pg": "^7.2.0",
|
||||
"@prisma/client": "^7.2.0",
|
||||
"next": "16.1.1",
|
||||
|
|
@ -1333,9 +1333,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/core-downloads-tracker": {
|
||||
"version": "7.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.6.tgz",
|
||||
"integrity": "sha512-QaYtTHlr8kDFN5mE1wbvVARRKH7Fdw1ZuOjBJcFdVpfNfRYKF3QLT4rt+WaB6CKJvpqxRsmEo0kpYinhH5GeHg==",
|
||||
"version": "7.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.7.tgz",
|
||||
"integrity": "sha512-8jWwS6FweMkpyRkrJooamUGe1CQfO1yJ+lM43IyUJbrhHW/ObES+6ry4vfGi8EKaldHL3t3BG1bcLcERuJPcjg==",
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
|
@ -1369,22 +1369,22 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/material": {
|
||||
"version": "7.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.6.tgz",
|
||||
"integrity": "sha512-R4DaYF3dgCQCUAkr4wW1w26GHXcf5rCmBRHVBuuvJvaGLmZdD8EjatP80Nz5JCw0KxORAzwftnHzXVnjR8HnFw==",
|
||||
"version": "7.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.7.tgz",
|
||||
"integrity": "sha512-6bdIxqzeOtBAj2wAsfhWCYyMKPLkRO9u/2o5yexcL0C3APqyy91iGSWgT3H7hg+zR2XgE61+WAu12wXPON8b6A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"@mui/core-downloads-tracker": "^7.3.6",
|
||||
"@mui/system": "^7.3.6",
|
||||
"@mui/types": "^7.4.9",
|
||||
"@mui/utils": "^7.3.6",
|
||||
"@mui/core-downloads-tracker": "^7.3.7",
|
||||
"@mui/system": "^7.3.7",
|
||||
"@mui/types": "^7.4.10",
|
||||
"@mui/utils": "^7.3.7",
|
||||
"@popperjs/core": "^2.11.8",
|
||||
"@types/react-transition-group": "^4.4.12",
|
||||
"clsx": "^2.1.1",
|
||||
"csstype": "^3.1.3",
|
||||
"csstype": "^3.2.3",
|
||||
"prop-types": "^15.8.1",
|
||||
"react-is": "^19.2.0",
|
||||
"react-is": "^19.2.3",
|
||||
"react-transition-group": "^4.4.5"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1397,7 +1397,7 @@
|
|||
"peerDependencies": {
|
||||
"@emotion/react": "^11.5.0",
|
||||
"@emotion/styled": "^11.3.0",
|
||||
"@mui/material-pigment-css": "^7.3.6",
|
||||
"@mui/material-pigment-css": "^7.3.7",
|
||||
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
|
||||
|
|
@ -1459,13 +1459,13 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@mui/private-theming": {
|
||||
"version": "7.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.3.6.tgz",
|
||||
"integrity": "sha512-Ws9wZpqM+FlnbZXaY/7yvyvWQo1+02Tbx50mVdNmzWEi51C51y56KAbaDCYyulOOBL6BJxuaqG8rNNuj7ivVyw==",
|
||||
"version": "7.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.3.7.tgz",
|
||||
"integrity": "sha512-w7r1+CYhG0syCAQUWAuV5zSaU2/67WA9JXUderdb7DzCIJdp/5RmJv6L85wRjgKCMsxFF0Kfn0kPgPbPgw/jdw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"@mui/utils": "^7.3.6",
|
||||
"@mui/utils": "^7.3.7",
|
||||
"prop-types": "^15.8.1"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1486,16 +1486,16 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/styled-engine": {
|
||||
"version": "7.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.3.6.tgz",
|
||||
"integrity": "sha512-+wiYbtvj+zyUkmDB+ysH6zRjuQIJ+CM56w0fEXV+VDNdvOuSywG+/8kpjddvvlfMLsaWdQe5oTuYGBcodmqGzQ==",
|
||||
"version": "7.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.3.7.tgz",
|
||||
"integrity": "sha512-y/QkNXv6cF6dZ5APztd/dFWfQ6LHKPx3skyYO38YhQD4+Cxd6sFAL3Z38WMSSC8LQz145Mpp3CcLrSCLKPwYAg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"@emotion/cache": "^11.14.0",
|
||||
"@emotion/serialize": "^1.3.3",
|
||||
"@emotion/sheet": "^1.4.0",
|
||||
"csstype": "^3.1.3",
|
||||
"csstype": "^3.2.3",
|
||||
"prop-types": "^15.8.1"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1520,18 +1520,18 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/system": {
|
||||
"version": "7.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.6.tgz",
|
||||
"integrity": "sha512-8fehAazkHNP1imMrdD2m2hbA9sl7Ur6jfuNweh5o4l9YPty4iaZzRXqYvBCWQNwFaSHmMEj2KPbyXGp7Bt73Rg==",
|
||||
"version": "7.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.7.tgz",
|
||||
"integrity": "sha512-DovL3k+FBRKnhmatzUMyO5bKkhMLlQ9L7Qw5qHrre3m8zCZmE+31NDVBFfqrbrA7sq681qaEIHdkWD5nmiAjyQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"@mui/private-theming": "^7.3.6",
|
||||
"@mui/styled-engine": "^7.3.6",
|
||||
"@mui/types": "^7.4.9",
|
||||
"@mui/utils": "^7.3.6",
|
||||
"@mui/private-theming": "^7.3.7",
|
||||
"@mui/styled-engine": "^7.3.7",
|
||||
"@mui/types": "^7.4.10",
|
||||
"@mui/utils": "^7.3.7",
|
||||
"clsx": "^2.1.1",
|
||||
"csstype": "^3.1.3",
|
||||
"csstype": "^3.2.3",
|
||||
"prop-types": "^15.8.1"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1560,9 +1560,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/types": {
|
||||
"version": "7.4.9",
|
||||
"resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.9.tgz",
|
||||
"integrity": "sha512-dNO8Z9T2cujkSIaCnWwprfeKmTWh97cnjkgmpFJ2sbfXLx8SMZijCYHOtP/y5nnUb/Rm2omxbDMmtUoSaUtKaw==",
|
||||
"version": "7.4.10",
|
||||
"resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.10.tgz",
|
||||
"integrity": "sha512-0+4mSjknSu218GW3isRqoxKRTOrTLd/vHi/7UC4+wZcUrOAqD9kRk7UQRL1mcrzqRoe7s3UT6rsRpbLkW5mHpQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4"
|
||||
|
|
@ -1577,17 +1577,17 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/utils": {
|
||||
"version": "7.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.6.tgz",
|
||||
"integrity": "sha512-jn+Ba02O6PiFs7nKva8R2aJJ9kJC+3kQ2R0BbKNY3KQQ36Qng98GnPRFTlbwYTdMD6hLEBKaMLUktyg/rTfd2w==",
|
||||
"version": "7.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.7.tgz",
|
||||
"integrity": "sha512-+YjnjMRnyeTkWnspzoxRdiSOgkrcpTikhNPoxOZW0APXx+urHtUoXJ9lbtCZRCA5a4dg5gSbd19alL1DvRs5fg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"@mui/types": "^7.4.9",
|
||||
"@mui/types": "^7.4.10",
|
||||
"@types/prop-types": "^15.7.15",
|
||||
"clsx": "^2.1.1",
|
||||
"prop-types": "^15.8.1",
|
||||
"react-is": "^19.2.0"
|
||||
"react-is": "^19.2.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
|
|
@ -1613,15 +1613,15 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@mui/x-data-grid": {
|
||||
"version": "8.23.0",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-8.23.0.tgz",
|
||||
"integrity": "sha512-fv8AiibTgwPKJsXtYdc5bYDDW3EQp/ieQ0iUejvZ2JbYikMIPTYjI4pHy7zW3F3RDsi6DGQnw5AW6LeoDcT0fA==",
|
||||
"version": "8.24.0",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-8.24.0.tgz",
|
||||
"integrity": "sha512-OCTrskRlxwJZ+vYWbgQnQPXWNMA/nY/RIkoESjbCG38N9fJicVCdyjszjcQn9V1NQH4fwkMlIN+DVU6zzbqJxQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"@mui/utils": "^7.3.5",
|
||||
"@mui/x-internals": "8.23.0",
|
||||
"@mui/x-virtualizer": "0.3.0",
|
||||
"@mui/x-internals": "8.24.0",
|
||||
"@mui/x-virtualizer": "0.3.1",
|
||||
"clsx": "^2.1.1",
|
||||
"prop-types": "^15.8.1",
|
||||
"use-sync-external-store": "^1.6.0"
|
||||
|
|
@ -1651,9 +1651,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/x-internals": {
|
||||
"version": "8.23.0",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.23.0.tgz",
|
||||
"integrity": "sha512-FN7wdqwTxqq1tJBYVz8TA/HMcViuaHS0Jphr4pEjT/8Iuf94Yt3P82WbsTbXyYrgOQDQl07UqE7qWcJetRcHcg==",
|
||||
"version": "8.24.0",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.24.0.tgz",
|
||||
"integrity": "sha512-tHPk8eUcuwvhNsAc4zcia8y+issjC+bLGssrQQSdLLeLIf9ewFbcwAURNTSnNhreyj/4RJOemVrSxKXpjkdVvQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
|
|
@ -1673,14 +1673,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mui/x-virtualizer": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-virtualizer/-/x-virtualizer-0.3.0.tgz",
|
||||
"integrity": "sha512-ScQ3xullKQAtbIT9N7PVhgW9BDTo2Hu8fr/+N08TdRMJcq8bsVJB25mlcHk6zxjlgCuojqaeGfw71S1FOvyCXQ==",
|
||||
"version": "0.3.1",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-virtualizer/-/x-virtualizer-0.3.1.tgz",
|
||||
"integrity": "sha512-MhQ7U/zmSofBxeCRMiolhZWJ80RUJMFFMRqeehJu5GqscnudiVcplZb0eNsAkz9IjnJTyrjyLS0PY+kn78enOw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"@mui/utils": "^7.3.5",
|
||||
"@mui/x-internals": "8.23.0"
|
||||
"@mui/x-internals": "8.24.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.1",
|
||||
"@mui/icons-material": "^7.3.6",
|
||||
"@mui/material": "^7.3.6",
|
||||
"@mui/material": "^7.3.7",
|
||||
"@mui/material-nextjs": "^7.3.6",
|
||||
"@mui/x-data-grid": "^8.23.0",
|
||||
"@mui/x-data-grid": "^8.24.0",
|
||||
"@prisma/adapter-pg": "^7.2.0",
|
||||
"@prisma/client": "^7.2.0",
|
||||
"next": "16.1.1",
|
||||
|
|
|
|||
66
src/app/api/download/route.ts
Normal file
66
src/app/api/download/route.ts
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
// src/app/api/download/route.ts
|
||||
"use server"
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { auth } from "@/auth"; // Import the auth function from your central config
|
||||
import { prisma } from '@/lib/prisma';
|
||||
|
||||
export async function GET(request: NextRequest) {
|
||||
try {
|
||||
// 1. Check Authentication using the V5 auth() helper
|
||||
const session = await auth();
|
||||
|
||||
// In V5, tokens are usually handled in the session callback
|
||||
if (!session || !session.accessToken) {
|
||||
return new NextResponse("Unauthorized - No Access Token found", { status: 401 });
|
||||
}
|
||||
|
||||
// 2. Get parameters from URL
|
||||
const { searchParams } = new URL(request.url);
|
||||
const fileNodeId = searchParams.get('id');
|
||||
const mode = searchParams.get('mode') === 'inline' ? 'inline' : 'attachment';
|
||||
|
||||
if (!fileNodeId) {
|
||||
return new NextResponse("File ID is required", { status: 400 });
|
||||
}
|
||||
|
||||
// 3. Find the file in your Postgres FileNode table
|
||||
const fileNode = await prisma.fileNode.findUnique({
|
||||
where: { id: fileNodeId }
|
||||
});
|
||||
|
||||
if (!fileNode || !fileNode.oneDriveId) {
|
||||
return new NextResponse("File not found in database", { status: 404 });
|
||||
}
|
||||
|
||||
// 4. Fetch the file stream from Microsoft Graph
|
||||
const graphResponse = await fetch(
|
||||
`https://graph.microsoft.com/v1.0/me/drive/items/${fileNode.oneDriveId}/content`,
|
||||
{
|
||||
headers: {
|
||||
Authorization: `Bearer ${session.accessToken}`,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
if (!graphResponse.ok) {
|
||||
const errorText = await graphResponse.text();
|
||||
console.error('MS Graph Error:', errorText);
|
||||
return new NextResponse(`OneDrive Error: ${graphResponse.statusText}`, { status: graphResponse.status });
|
||||
}
|
||||
|
||||
// 5. Stream the response directly to the client
|
||||
return new NextResponse(graphResponse.body, {
|
||||
status: 200,
|
||||
headers: {
|
||||
'Content-Type': fileNode.mimeType || 'application/octet-stream',
|
||||
// Note: Using encodeURIComponent for filename to handle special characters
|
||||
'Content-Disposition': `${mode}; filename="${encodeURIComponent(fileNode.name)}"`,
|
||||
},
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('Download error:', error);
|
||||
return new NextResponse("Internal Server Error", { status: 500 });
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ import { revalidatePath } from "next/cache";
|
|||
import { getFreshAccessToken } from "@/lib/auth-utils";
|
||||
|
||||
/**
|
||||
* 1. FETCH: Get all file nodes
|
||||
* 1. FETCH: Get all file nodes for the Dashboard
|
||||
*/
|
||||
export async function getFileNodes() {
|
||||
try {
|
||||
|
|
@ -23,83 +23,94 @@ export async function getFileNodes() {
|
|||
}
|
||||
|
||||
/**
|
||||
* 2. DELETE: Remove from OneDrive and Database
|
||||
* Improved to ensure DB removal even if OneDrive API returns errors.
|
||||
* 2. DOWNLOAD: Generates the authenticated OneDrive URL
|
||||
*/
|
||||
export async function getDownloadUrlAction(id: string) {
|
||||
const session = await auth();
|
||||
if (!session?.user?.id) throw new Error("Unauthorized");
|
||||
|
||||
const file = await prisma.fileNode.findUnique({ where: { id } });
|
||||
if (!file || !file.oneDriveId) throw new Error("File not found or missing cloud ID");
|
||||
|
||||
const accessToken = await getFreshAccessToken(session.user.id);
|
||||
const res = await fetch(
|
||||
`https://graph.microsoft.com/v1.0/me/drive/items/${file.oneDriveId}`,
|
||||
{ headers: { Authorization: `Bearer ${accessToken}` } }
|
||||
);
|
||||
|
||||
if (!res.ok) throw new Error("Failed to contact OneDrive");
|
||||
|
||||
const data = await res.json();
|
||||
const downloadUrl = data["@microsoft.graph.downloadUrl"];
|
||||
|
||||
if (!downloadUrl) throw new Error("OneDrive did not provide a download link");
|
||||
|
||||
return { downloadUrl };
|
||||
}
|
||||
|
||||
/**
|
||||
* 3. DELETE: Remove from OneDrive (via ID) and Database
|
||||
* Folders are virtual (DB only), so cloud deletion is skipped if oneDriveId is null.
|
||||
*/
|
||||
export async function deleteFileAction(fileId: string) {
|
||||
const session = await auth();
|
||||
if (!session?.user?.id) throw new Error("Unauthorized");
|
||||
|
||||
// 1. Find the node to check permissions
|
||||
const node = await prisma.fileNode.findUnique({
|
||||
where: { id: fileId },
|
||||
});
|
||||
|
||||
if (!node) {
|
||||
// If not in DB, trigger a refresh anyway to clear the UI
|
||||
revalidatePath("/dashboard");
|
||||
return { success: true, message: "Item already removed from database" };
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
// @ts-ignore - role added via auth callbacks
|
||||
// @ts-ignore
|
||||
const isAdmin = session.user.role === "ADMIN";
|
||||
const isOwner = node.ownerId === session.user.id;
|
||||
|
||||
if (!isAdmin && !isOwner) {
|
||||
throw new Error("Permission Denied: You do not have authority to delete this item.");
|
||||
throw new Error("Permission Denied.");
|
||||
}
|
||||
|
||||
if (node.isFolder && !isAdmin) {
|
||||
throw new Error("Security Restriction: Only Administrators can delete folders.");
|
||||
}
|
||||
|
||||
// 2. OneDrive Deletion Attempt
|
||||
try {
|
||||
const accessToken = await getFreshAccessToken(session.user.id);
|
||||
|
||||
if (accessToken) {
|
||||
const rootFolder = "WebCalibre";
|
||||
// We target the folder on OneDrive by the ID stored in our DB
|
||||
const onedrivePath = `https://graph.microsoft.com/v1.0/me/drive/root:/${rootFolder}/${node.id}`;
|
||||
|
||||
const onedriveRes = await fetch(onedrivePath, {
|
||||
method: "DELETE",
|
||||
headers: { Authorization: `Bearer ${accessToken}` },
|
||||
});
|
||||
// Only attempt cloud deletion if it's a file/storage with a oneDriveId.
|
||||
// Virtual folders created in the DB have no oneDriveId and are skipped.
|
||||
if (accessToken && node.oneDriveId) {
|
||||
const onedriveRes = await fetch(
|
||||
`https://graph.microsoft.com/v1.0/me/drive/items/${node.oneDriveId}`,
|
||||
{
|
||||
method: "DELETE",
|
||||
headers: { Authorization: `Bearer ${accessToken}` },
|
||||
}
|
||||
);
|
||||
|
||||
if (!onedriveRes.ok && onedriveRes.status !== 404) {
|
||||
const errData = await onedriveRes.json().catch(() => ({}));
|
||||
console.warn("OneDrive Deletion Warning (Cloud record might still exist):", errData);
|
||||
console.warn("OneDrive Deletion Warning: Cloud record might still exist.");
|
||||
}
|
||||
}
|
||||
} catch (cloudError) {
|
||||
// We catch cloud errors but DO NOT throw them, so we can proceed to delete the DB record
|
||||
console.error("Cloud communication failed, proceeding with DB cleanup:", cloudError);
|
||||
console.error("Cloud cleanup failed:", cloudError);
|
||||
}
|
||||
|
||||
// 3. Database Deletion (The Source of Truth for your UI)
|
||||
try {
|
||||
await prisma.fileNode.delete({
|
||||
where: { id: fileId }
|
||||
});
|
||||
|
||||
await prisma.fileNode.delete({ where: { id: fileId } });
|
||||
revalidatePath("/dashboard");
|
||||
revalidatePath("/upload");
|
||||
|
||||
return { success: true };
|
||||
} catch (dbError: any) {
|
||||
console.error("Database deletion failed:", dbError);
|
||||
} catch (dbError) {
|
||||
throw new Error("Failed to remove the record from the database.");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 3. MOVE: Assign file to folder or folder to another folder
|
||||
* 4. MOVE: Assign file to folder or folder to another folder (Virtual Move)
|
||||
*/
|
||||
export async function moveNodeAction(nodeId: string, newParentId: string | null) {
|
||||
const session = await auth();
|
||||
if (!session?.user?.id) throw new Error("Unauthorized");
|
||||
|
||||
if (nodeId === newParentId) throw new Error("Cannot move to self.");
|
||||
|
||||
try {
|
||||
|
|
@ -107,10 +118,69 @@ export async function moveNodeAction(nodeId: string, newParentId: string | null)
|
|||
where: { id: nodeId },
|
||||
data: { parentId: newParentId }
|
||||
});
|
||||
|
||||
revalidatePath("/dashboard");
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
throw new Error("Move failed.");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 5. UPDATE & REPLACE: Full update of metadata and OneDrive content
|
||||
*/
|
||||
export async function updateFileFullAction(formData: FormData) {
|
||||
const session = await auth();
|
||||
if (!session?.user?.id) throw new Error("Unauthorized");
|
||||
|
||||
const id = formData.get("id") as string;
|
||||
const name = formData.get("name") as string;
|
||||
const description = formData.get("description") as string;
|
||||
const parentIdRaw = formData.get("parentId") as string;
|
||||
const metadataStr = formData.get("metadata") as string;
|
||||
const newFile = formData.get("file") as File | null;
|
||||
|
||||
const parentId = parentIdRaw === "root" ? null : parentIdRaw;
|
||||
let metadata = JSON.parse(metadataStr);
|
||||
|
||||
try {
|
||||
const accessToken = await getFreshAccessToken(session.user.id);
|
||||
const node = await prisma.fileNode.findUnique({ where: { id } });
|
||||
|
||||
// Update physical file content only if a new file is uploaded and we have a target oneDriveId
|
||||
if (newFile && newFile.size > 0 && node?.oneDriveId) {
|
||||
const onedrivePath = `https://graph.microsoft.com/v1.0/me/drive/items/${node.oneDriveId}/content`;
|
||||
|
||||
const uploadRes = await fetch(onedrivePath, {
|
||||
method: "PUT",
|
||||
headers: {
|
||||
Authorization: `Bearer ${accessToken}`,
|
||||
"Content-Type": newFile.type
|
||||
},
|
||||
body: Buffer.from(await newFile.arrayBuffer()),
|
||||
});
|
||||
|
||||
if (!uploadRes.ok) throw new Error("OneDrive content update failed");
|
||||
|
||||
metadata.type = newFile.name.split('.').pop()?.toUpperCase() || 'UNKNOWN';
|
||||
metadata.mimeType = newFile.type;
|
||||
}
|
||||
|
||||
await prisma.fileNode.update({
|
||||
where: { id },
|
||||
data: {
|
||||
name,
|
||||
description,
|
||||
parentId,
|
||||
metadata,
|
||||
size: newFile ? BigInt(newFile.size) : undefined,
|
||||
updatedAt: new Date(),
|
||||
}
|
||||
});
|
||||
|
||||
revalidatePath("/dashboard");
|
||||
return { success: true };
|
||||
} catch (error: any) {
|
||||
console.error("Full Update Failure:", error);
|
||||
throw new Error(error.message || "Failed to update record.");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,19 +1,83 @@
|
|||
"use client";
|
||||
'use client';
|
||||
|
||||
// src/app/dashboard/dashboard-view.tsx
|
||||
|
||||
import { useState } from "react";
|
||||
import {
|
||||
Button, CircularProgress, Box, Chip, IconButton, Tooltip, Typography
|
||||
Button,
|
||||
CircularProgress,
|
||||
Box,
|
||||
Chip,
|
||||
IconButton,
|
||||
Typography,
|
||||
Stack,
|
||||
TextField,
|
||||
InputAdornment,
|
||||
Tooltip
|
||||
} from "@mui/material";
|
||||
import {
|
||||
DataGrid,
|
||||
GridColDef,
|
||||
Toolbar,
|
||||
QuickFilter,
|
||||
QuickFilterControl,
|
||||
QuickFilterClear,
|
||||
} from "@mui/x-data-grid";
|
||||
import SyncIcon from "@mui/icons-material/Sync";
|
||||
import RefreshIcon from "@mui/icons-material/Refresh";
|
||||
import FolderIcon from "@mui/icons-material/Folder";
|
||||
import InsertDriveFileIcon from "@mui/icons-material/InsertDriveFile";
|
||||
import DeleteIcon from "@mui/icons-material/Delete";
|
||||
import { DataGrid, GridColDef } from "@mui/x-data-grid";
|
||||
import EditIcon from "@mui/icons-material/Edit";
|
||||
import SearchIcon from '@mui/icons-material/Search';
|
||||
import CancelIcon from '@mui/icons-material/Cancel';
|
||||
import DownloadIcon from '@mui/icons-material/Download';
|
||||
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
|
||||
|
||||
import { syncOneDrive } from "./sync-actions";
|
||||
import { deleteFileAction } from "./actions"; // Un-commented and assumed active
|
||||
import { deleteFileAction } from "./actions";
|
||||
import { useRouter } from "next/navigation";
|
||||
|
||||
function CustomToolbar() {
|
||||
return (
|
||||
<Toolbar sx={{ p: 2, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
|
||||
<Typography variant="h6" fontWeight="bold" color="primary">
|
||||
Library
|
||||
</Typography>
|
||||
<QuickFilter sx={{ display: 'flex', alignItems: 'center' }}>
|
||||
<QuickFilterControl
|
||||
render={({ ref, ...controlProps }, state) => (
|
||||
<TextField
|
||||
{...controlProps}
|
||||
inputRef={ref}
|
||||
variant="outlined"
|
||||
size="small"
|
||||
placeholder="Search files and metadata..."
|
||||
sx={{ width: 350 }}
|
||||
slotProps={{
|
||||
input: {
|
||||
startAdornment: (
|
||||
<InputAdornment position="start">
|
||||
<SearchIcon fontSize="small" />
|
||||
</InputAdornment>
|
||||
),
|
||||
endAdornment: state.value ? (
|
||||
<InputAdornment position="end">
|
||||
<QuickFilterClear size="small">
|
||||
<CancelIcon fontSize="small" />
|
||||
</QuickFilterClear>
|
||||
</InputAdornment>
|
||||
) : null,
|
||||
},
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
</QuickFilter>
|
||||
</Toolbar>
|
||||
);
|
||||
}
|
||||
|
||||
interface DashboardViewProps {
|
||||
initialFiles: any[];
|
||||
user?: {
|
||||
|
|
@ -26,19 +90,12 @@ export default function DashboardView({ initialFiles, user }: DashboardViewProps
|
|||
const [loading, setLoading] = useState(false);
|
||||
const [isRefreshing, setIsRefreshing] = useState(false);
|
||||
const router = useRouter();
|
||||
|
||||
const isAdmin = user?.role === "ADMIN";
|
||||
|
||||
/**
|
||||
* Recursive function to build the virtual path for the "Location" column.
|
||||
* Ensures we see "Projects / Project-1" instead of UUIDs or "ROOT".
|
||||
*/
|
||||
const getVirtualPath = (parentId: string | null): string => {
|
||||
if (!parentId) return "WebCalibre";
|
||||
const parent = initialFiles.find((f) => f.id === parentId);
|
||||
if (!parent) return "WebCalibre";
|
||||
|
||||
// Recursive lookup for breadcrumbs
|
||||
const prefix = parent.parentId ? `${getVirtualPath(parent.parentId)} / ` : "";
|
||||
return `${prefix}${parent.name}`;
|
||||
};
|
||||
|
|
@ -50,7 +107,6 @@ export default function DashboardView({ initialFiles, user }: DashboardViewProps
|
|||
router.refresh();
|
||||
} catch (error) {
|
||||
console.error("Sync failed:", error);
|
||||
alert("Failed to sync OneDrive");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
|
|
@ -59,13 +115,11 @@ export default function DashboardView({ initialFiles, user }: DashboardViewProps
|
|||
const handleRefresh = () => {
|
||||
setIsRefreshing(true);
|
||||
router.refresh();
|
||||
// Visual feedback for the refresh action
|
||||
setTimeout(() => setIsRefreshing(false), 800);
|
||||
};
|
||||
|
||||
const handleDelete = async (id: string, name: string) => {
|
||||
if (!confirm(`Are you sure you want to delete "${name}"?`)) return;
|
||||
|
||||
try {
|
||||
await deleteFileAction(id);
|
||||
router.refresh();
|
||||
|
|
@ -74,6 +128,17 @@ export default function DashboardView({ initialFiles, user }: DashboardViewProps
|
|||
}
|
||||
};
|
||||
|
||||
// --- NEW DOWNLOAD FUNCTIONS ---
|
||||
const handleDownload = (id: string) => {
|
||||
// Triggers local folder download via Content-Disposition: attachment
|
||||
window.location.href = `/api/download?id=${id}&mode=attachment`;
|
||||
};
|
||||
|
||||
const handleViewInTab = (id: string) => {
|
||||
// Opens in a new tab via Content-Disposition: inline
|
||||
window.open(`/api/download?id=${id}&mode=inline`, '_blank');
|
||||
};
|
||||
|
||||
const columns: GridColDef[] = [
|
||||
{
|
||||
field: "name",
|
||||
|
|
@ -82,49 +147,25 @@ export default function DashboardView({ initialFiles, user }: DashboardViewProps
|
|||
minWidth: 250,
|
||||
renderCell: (params) => (
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
|
||||
{params.row.isFolder ? (
|
||||
<FolderIcon sx={{ color: '#FFB020' }} /> // Folder yellow
|
||||
) : (
|
||||
<InsertDriveFileIcon color="action" />
|
||||
)}
|
||||
<Typography variant="body2" sx={{ fontWeight: params.row.isFolder ? 600 : 400 }}>
|
||||
{params.value}
|
||||
</Typography>
|
||||
{params.row.isFolder ? <FolderIcon sx={{ color: '#FFB020' }} /> : <InsertDriveFileIcon color="action" />}
|
||||
<Typography variant="body2">{params.value}</Typography>
|
||||
</Box>
|
||||
)
|
||||
},
|
||||
{
|
||||
field: "parentId",
|
||||
headerName: "Location (Project)",
|
||||
headerName: "Location",
|
||||
flex: 1,
|
||||
minWidth: 200,
|
||||
renderCell: (params) => {
|
||||
const path = getVirtualPath(params.value);
|
||||
return (
|
||||
<Tooltip title={path}>
|
||||
<Chip
|
||||
label={path}
|
||||
size="small"
|
||||
variant="outlined"
|
||||
color={path === "WebCalibre" ? "default" : "primary"}
|
||||
sx={{ maxWidth: '100%' }}
|
||||
/>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
renderCell: (params) => <Chip label={getVirtualPath(params.value)} size="small" variant="outlined" />
|
||||
},
|
||||
{ field: "description", headerName: "Description", flex: 1 },
|
||||
{
|
||||
field: "type",
|
||||
headerName: "Type",
|
||||
width: 100,
|
||||
valueGetter: (value, row) => {
|
||||
// Priority: Metadata -> isFolder check -> fallback
|
||||
const type = row.metadata?.type || (row.isFolder ? "FOLDER" : "FILE");
|
||||
// Ensure we don't display a UUID here if the sync was messy
|
||||
return type.length > 10 && row.isFolder ? "FOLDER" : type;
|
||||
},
|
||||
width: 120,
|
||||
valueGetter: (value, row) => row.metadata?.type || (row.isFolder ? "Folder" : "File"),
|
||||
renderCell: (params) => (
|
||||
<Typography variant="caption" sx={{ fontWeight: 'bold', color: 'text.secondary' }}>
|
||||
<Typography variant="caption" sx={{ textTransform: 'uppercase', fontWeight: 'bold', color: 'text.secondary' }}>
|
||||
{params.value}
|
||||
</Typography>
|
||||
)
|
||||
|
|
@ -132,41 +173,71 @@ export default function DashboardView({ initialFiles, user }: DashboardViewProps
|
|||
{
|
||||
field: "size",
|
||||
headerName: "Size",
|
||||
width: 120,
|
||||
valueGetter: (value, row) => {
|
||||
if (row.isFolder) return null;
|
||||
return value;
|
||||
},
|
||||
renderCell: (params) => {
|
||||
if (params.value === null) return "--";
|
||||
const mb = (Number(params.value) / 1024 / 1024).toFixed(2);
|
||||
return `${mb} MB`;
|
||||
}
|
||||
width: 100,
|
||||
renderCell: (params) => params.row.isFolder ? "--" : `${(Number(params.value) / 1024 / 1024).toFixed(2)} MB`
|
||||
},
|
||||
{
|
||||
field: "actions",
|
||||
headerName: "Actions",
|
||||
width: 100,
|
||||
sortable: false,
|
||||
width: 180, // Increased width to accommodate new buttons
|
||||
align: 'right',
|
||||
headerAlign: 'right',
|
||||
renderCell: (params) => {
|
||||
const isOwner = params.row.ownerId === user?.id;
|
||||
if (isAdmin || isOwner) {
|
||||
return (
|
||||
<IconButton
|
||||
size="small"
|
||||
color="error"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
handleDelete(params.row.id, params.row.name);
|
||||
}}
|
||||
>
|
||||
<DeleteIcon fontSize="small" />
|
||||
</IconButton>
|
||||
);
|
||||
}
|
||||
return null;
|
||||
const isFolder = params.row.isFolder;
|
||||
|
||||
return (
|
||||
<Stack direction="row" spacing={0.5} justifyContent="flex-end">
|
||||
{!isFolder && (
|
||||
<>
|
||||
<Tooltip title="View in Tab">
|
||||
<IconButton size="small" color="info" onClick={() => handleViewInTab(params.row.id)}>
|
||||
<OpenInNewIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<Tooltip title="Download to Folder">
|
||||
<IconButton size="small" color="success" onClick={() => handleDownload(params.row.id)}>
|
||||
<DownloadIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
</>
|
||||
)}
|
||||
|
||||
{(isAdmin || isOwner) && (
|
||||
<>
|
||||
<Tooltip title="Edit Details">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() => router.push(`/update/${params.row.id}`)}
|
||||
>
|
||||
<EditIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<Tooltip title="Delete">
|
||||
<IconButton
|
||||
size="small"
|
||||
color="error"
|
||||
onClick={() => handleDelete(params.row.id, params.row.name)}
|
||||
>
|
||||
<DeleteIcon fontSize="small" />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
</>
|
||||
)}
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: "metadata_search",
|
||||
headerName: "Metadata Search",
|
||||
width: 0,
|
||||
valueGetter: (value, row) => {
|
||||
if (!row.metadata) return "";
|
||||
return Object.entries(row.metadata)
|
||||
.filter(([k]) => k !== 'type' && k !== 'mimeType')
|
||||
.map(([k, v]) => `${k}:${v}`)
|
||||
.join(" ");
|
||||
}
|
||||
}
|
||||
];
|
||||
|
|
@ -174,53 +245,32 @@ export default function DashboardView({ initialFiles, user }: DashboardViewProps
|
|||
return (
|
||||
<Box className="space-y-4">
|
||||
<Box sx={{ display: 'flex', justifyContent: 'flex-end', gap: 2, mb: 2 }}>
|
||||
<Button
|
||||
variant="outlined"
|
||||
startIcon={isRefreshing ? <CircularProgress size={16} /> : <RefreshIcon />}
|
||||
onClick={handleRefresh}
|
||||
disabled={isRefreshing}
|
||||
>
|
||||
{isRefreshing ? "Refreshing..." : "Refresh List"}
|
||||
<Button variant="outlined" startIcon={isRefreshing ? <CircularProgress size={16} /> : <RefreshIcon />} onClick={handleRefresh}>
|
||||
Refresh List
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
variant="contained"
|
||||
startIcon={loading ? <CircularProgress size={20} color="inherit" /> : <SyncIcon />}
|
||||
onClick={handleSync}
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? "Syncing..." : "Sync OneDrive"}
|
||||
<Button variant="contained" startIcon={loading ? <CircularProgress size={20} color="inherit" /> : <SyncIcon />} onClick={handleSync} disabled={loading}>
|
||||
Sync OneDrive
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
<Box sx={{
|
||||
height: 700,
|
||||
width: "100%",
|
||||
bgcolor: 'background.paper',
|
||||
borderRadius: 3,
|
||||
boxShadow: '0 4px 6px -1px rgb(0 0 0 / 0.1)',
|
||||
overflow: 'hidden'
|
||||
}}>
|
||||
<Box sx={{ height: 700, width: "100%", bgcolor: 'background.paper', borderRadius: 3, boxShadow: 1, overflow: 'hidden' }}>
|
||||
<DataGrid
|
||||
rows={initialFiles}
|
||||
columns={columns}
|
||||
pageSizeOptions={[10, 25, 50]}
|
||||
slots={{ toolbar: CustomToolbar }}
|
||||
showToolbar
|
||||
disableRowSelectionOnClick
|
||||
initialState={{
|
||||
pagination: { paginationModel: { pageSize: 10 } },
|
||||
sorting: {
|
||||
sortModel: [{ field: 'name', sort: 'asc' }],
|
||||
columns: {
|
||||
columnVisibilityModel: {
|
||||
metadata_search: false,
|
||||
},
|
||||
},
|
||||
}}
|
||||
disableRowSelectionOnClick
|
||||
sx={{
|
||||
border: 'none',
|
||||
'& .MuiDataGrid-columnHeaders': {
|
||||
bgcolor: '#f8f9fa',
|
||||
borderBottom: '1px solid #eee',
|
||||
},
|
||||
'& .MuiDataGrid-cell': {
|
||||
borderBottom: '1px solid #f0f0f0',
|
||||
},
|
||||
'& .MuiDataGrid-columnHeaders': { bgcolor: '#f8f9fa' },
|
||||
'& .MuiDataGrid-toolbarContainer': { borderBottom: '1px solid #eee' }
|
||||
}}
|
||||
/>
|
||||
</Box>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
'use server';
|
||||
|
||||
import { auth } from "@/auth";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { revalidatePath } from "next/cache";
|
||||
|
|
@ -7,64 +6,37 @@ import { getFreshAccessToken } from "@/lib/auth-utils";
|
|||
|
||||
export async function syncOneDrive() {
|
||||
const session = await auth();
|
||||
|
||||
if (!session?.user?.id) throw new Error("Unauthorized");
|
||||
|
||||
try {
|
||||
const accessToken = await getFreshAccessToken(session.user.id);
|
||||
|
||||
if (!accessToken) {
|
||||
throw new Error("Microsoft account not linked properly or session expired.");
|
||||
}
|
||||
|
||||
const response = await fetch("https://graph.microsoft.com/v1.0/me/drive/root:/WebCalibre:/children", {
|
||||
headers: {
|
||||
Authorization: `Bearer ${accessToken}`,
|
||||
"Content-Type": "application/json"
|
||||
},
|
||||
headers: { Authorization: `Bearer ${accessToken}` },
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json();
|
||||
if (response.status === 404) {
|
||||
return { success: true, count: 0 };
|
||||
}
|
||||
throw new Error(errorData.error?.message || "Failed to fetch data from OneDrive");
|
||||
}
|
||||
if (!response.ok) return { success: true, count: 0 };
|
||||
|
||||
const data = await response.json();
|
||||
let syncedCount = 0;
|
||||
|
||||
// Regular expression to identify if a string is a UUID
|
||||
const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
||||
|
||||
for (const item of data.value) {
|
||||
const isFolder = !!item.folder;
|
||||
|
||||
/**
|
||||
* FILTER: If the item is a folder and the name is a UUID, skip it.
|
||||
* These are storage containers created by the upload action, not user-facing folders.
|
||||
*/
|
||||
// Only skip if it's a folder AND it's a UUID (storage container)
|
||||
// If a user named a file with a UUID, we still want it.
|
||||
if (isFolder && uuidRegex.test(item.name)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const extension = isFolder
|
||||
? 'FOLDER'
|
||||
: (item.name.split('.').pop()?.toUpperCase() || 'UNKNOWN');
|
||||
|
||||
const fileSize = item.size ? BigInt(item.size) : BigInt(0);
|
||||
const extension = isFolder ? 'FOLDER' : (item.name.split('.').pop()?.toUpperCase() || 'UNKNOWN');
|
||||
|
||||
await prisma.fileNode.upsert({
|
||||
where: { oneDriveId: item.id },
|
||||
where: { oneDriveId: item.id }, // Primary match
|
||||
update: {
|
||||
name: item.name,
|
||||
size: fileSize,
|
||||
size: BigInt(item.size || 0),
|
||||
isFolder: isFolder,
|
||||
metadata: {
|
||||
type: extension,
|
||||
mimeType: item.file?.mimeType || null
|
||||
},
|
||||
path: item.parentReference?.path + '/' + item.name,
|
||||
updatedAt: new Date(),
|
||||
},
|
||||
|
|
@ -72,14 +44,11 @@ export async function syncOneDrive() {
|
|||
id: crypto.randomUUID(),
|
||||
oneDriveId: item.id,
|
||||
name: item.name,
|
||||
size: fileSize,
|
||||
size: BigInt(item.size || 0),
|
||||
isFolder: isFolder,
|
||||
path: item.parentReference?.path + '/' + item.name,
|
||||
ownerId: session.user.id,
|
||||
metadata: {
|
||||
type: extension,
|
||||
mimeType: item.file?.mimeType || null
|
||||
},
|
||||
metadata: { type: extension, mimeType: item.file?.mimeType || null },
|
||||
}
|
||||
});
|
||||
syncedCount++;
|
||||
|
|
@ -87,9 +56,7 @@ export async function syncOneDrive() {
|
|||
|
||||
revalidatePath('/dashboard');
|
||||
return { success: true, count: syncedCount };
|
||||
|
||||
} catch (error: any) {
|
||||
console.error("Sync Process Failure:", error.message);
|
||||
throw new Error(error.message || "An unexpected error occurred during sync.");
|
||||
throw new Error(error.message);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { Box, Button, Typography, Paper, LinearProgress, Container } from "@mui/material";
|
||||
import CloudUploadIcon from "@mui/icons-material/CloudUpload";
|
||||
import { uploadFileAction } from "../upload-actions";
|
||||
|
||||
export default function UploadPage() {
|
||||
const [file, setFile] = useState<File | null>(null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
const handleUpload = async () => {
|
||||
if (!file) return;
|
||||
setLoading(true);
|
||||
|
||||
const formData = new FormData();
|
||||
formData.append("file", file);
|
||||
|
||||
try {
|
||||
await uploadFileAction(formData);
|
||||
alert("Book added to WebCalibre!");
|
||||
setFile(null);
|
||||
} catch (err) {
|
||||
alert("Upload failed. Check console.");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Container maxWidth="sm" sx={{ mt: 8 }}>
|
||||
<Paper elevation={3} sx={{ p: 4, textAlign: 'center', borderRadius: 4 }}>
|
||||
<Typography variant="h5" gutterBottom fontWeight="bold">
|
||||
Upload to Library
|
||||
</Typography>
|
||||
<Typography color="textSecondary" mb={4}>
|
||||
Files will be saved in your OneDrive "WebCalibre" folder.
|
||||
</Typography>
|
||||
|
||||
<Box sx={{ border: '2px dashed #ccc', p: 4, mb: 3, borderRadius: 2 }}>
|
||||
<input
|
||||
accept=".pdf,.epub,.mobi,.txt"
|
||||
style={{ display: 'none' }}
|
||||
id="file-input"
|
||||
type="file"
|
||||
onChange={(e) => setFile(e.target.files?.[0] || null)}
|
||||
/>
|
||||
<label htmlFor="file-input">
|
||||
<Button variant="outlined" component="span" startIcon={<CloudUploadIcon />}>
|
||||
{file ? file.name : "Choose Book File"}
|
||||
</Button>
|
||||
</label>
|
||||
</Box>
|
||||
|
||||
{loading && <LinearProgress sx={{ mb: 2 }} />}
|
||||
|
||||
<Button
|
||||
variant="contained"
|
||||
fullWidth
|
||||
size="large"
|
||||
disabled={!file || loading}
|
||||
onClick={handleUpload}
|
||||
>
|
||||
{loading ? "Uploading..." : "Start Upload"}
|
||||
</Button>
|
||||
</Paper>
|
||||
</Container>
|
||||
);
|
||||
}
|
||||
49
src/app/update/[id]/_actions.ts
Normal file
49
src/app/update/[id]/_actions.ts
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
'use server';
|
||||
|
||||
//src/app/update/[id]/_actions.ts
|
||||
|
||||
import { auth } from "@/auth";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { revalidatePath } from "next/cache";
|
||||
|
||||
export async function updateFileAction(formData: FormData) {
|
||||
const session = await auth();
|
||||
if (!session?.user?.id) throw new Error("Unauthorized");
|
||||
|
||||
const id = formData.get("id") as string;
|
||||
const name = formData.get("name") as string;
|
||||
const description = formData.get("description") as string;
|
||||
const parentIdRaw = formData.get("parentId") as string;
|
||||
const customMetadataRaw = formData.get("customMetadata") as string;
|
||||
|
||||
const parentId = (parentIdRaw === "" || parentIdRaw === "root") ? null : parentIdRaw;
|
||||
const customMetadata = customMetadataRaw ? JSON.parse(customMetadataRaw) : {};
|
||||
|
||||
try {
|
||||
// 1. Get existing record to preserve system metadata (like mimeType)
|
||||
const existing = await prisma.fileNode.findUnique({ where: { id } });
|
||||
const existingMetadata = (existing?.metadata as Record<string, any>) || {};
|
||||
|
||||
// 2. Update the record
|
||||
await prisma.fileNode.update({
|
||||
where: { id },
|
||||
data: {
|
||||
name,
|
||||
description,
|
||||
parentId,
|
||||
metadata: {
|
||||
...customMetadata, // User's new keys
|
||||
type: name.split('.').pop()?.toUpperCase() || existingMetadata.type || "FILE",
|
||||
mimeType: existingMetadata.mimeType // Preserve the original mimeType
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
revalidatePath("/dashboard");
|
||||
revalidatePath(`/update/${id}`);
|
||||
return { success: true };
|
||||
} catch (error: any) {
|
||||
console.error("Update error:", error);
|
||||
return { success: false, message: error.message };
|
||||
}
|
||||
}
|
||||
34
src/app/update/[id]/page.tsx
Normal file
34
src/app/update/[id]/page.tsx
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
import { auth } from "@/auth";
|
||||
import { redirect, notFound } from "next/navigation";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { Container } from "@mui/material";
|
||||
import UpdateView from "./update-view";
|
||||
|
||||
// Note: params is now handled as a Promise
|
||||
export default async function UpdatePage({ params }: { params: Promise<{ id: string }> }) {
|
||||
const session = await auth();
|
||||
if (!session) redirect("/");
|
||||
|
||||
// 1. Await the params to get the actual ID
|
||||
const { id } = await params;
|
||||
|
||||
// 2. Fetch the specific file using the awaited ID
|
||||
const fileNode = await prisma.fileNode.findUnique({
|
||||
where: { id: id }
|
||||
});
|
||||
|
||||
if (!fileNode) notFound();
|
||||
|
||||
// Fetch folders for the destination dropdown
|
||||
const folders = await prisma.fileNode.findMany({
|
||||
where: { isFolder: true },
|
||||
orderBy: { name: 'asc' },
|
||||
select: { id: true, name: true }
|
||||
});
|
||||
|
||||
return (
|
||||
<Container maxWidth="md" sx={{ py: 8 }}>
|
||||
<UpdateView fileNode={fileNode} folders={folders} />
|
||||
</Container>
|
||||
);
|
||||
}
|
||||
171
src/app/update/[id]/update-view.tsx
Normal file
171
src/app/update/[id]/update-view.tsx
Normal file
|
|
@ -0,0 +1,171 @@
|
|||
'use client';
|
||||
|
||||
import { useState } from "react";
|
||||
import {
|
||||
Box, Button, Typography, Paper, Stack,
|
||||
TextField, MenuItem, IconButton, Grid, Divider
|
||||
} from "@mui/material";
|
||||
import SaveIcon from "@mui/icons-material/Save";
|
||||
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
|
||||
import AssignmentIcon from '@mui/icons-material/Assignment';
|
||||
import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
|
||||
import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
|
||||
import FolderIcon from "@mui/icons-material/Folder";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { updateFileAction } from "./_actions";
|
||||
|
||||
interface MetadataPair {
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export default function UpdateView({ fileNode, folders }: any) {
|
||||
const router = useRouter();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
// 1. Initialize Basic Info
|
||||
const [name, setName] = useState(fileNode.name);
|
||||
const [description, setDescription] = useState(fileNode.description || "");
|
||||
const [parentId, setParentId] = useState(fileNode.parentId || "");
|
||||
|
||||
// 2. Parse existing JSON metadata into Key/Value array for the UI
|
||||
// We filter out 'type' and 'mimeType' as they are system-managed
|
||||
const initialMetadata = Object.entries(fileNode.metadata || {})
|
||||
.filter(([key]) => !['type', 'mimeType'].includes(key))
|
||||
.map(([key, value]) => ({ key, value: String(value) }));
|
||||
|
||||
const [customMetadata, setCustomMetadata] = useState<MetadataPair[]>(initialMetadata);
|
||||
|
||||
const handleUpdate = async () => {
|
||||
setLoading(true);
|
||||
const formData = new FormData();
|
||||
formData.append("id", fileNode.id);
|
||||
formData.append("name", name);
|
||||
formData.append("description", description);
|
||||
formData.append("parentId", parentId);
|
||||
|
||||
// Convert array back to object for storage
|
||||
const metadataObj = customMetadata.reduce((acc, curr) => {
|
||||
if (curr.key.trim()) acc[curr.key.trim()] = curr.value;
|
||||
return acc;
|
||||
}, {} as Record<string, string>);
|
||||
|
||||
formData.append("customMetadata", JSON.stringify(metadataObj));
|
||||
|
||||
const res = await updateFileAction(formData);
|
||||
if (res.success) {
|
||||
router.push("/dashboard");
|
||||
router.refresh();
|
||||
} else {
|
||||
alert("Update failed");
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Paper sx={{ p: { xs: 3, md: 6 }, borderRadius: 4 }} elevation={3}>
|
||||
<Button startIcon={<ArrowBackIcon />} onClick={() => router.back()} sx={{ mb: 2 }}>
|
||||
Back
|
||||
</Button>
|
||||
|
||||
<Typography variant="h4" fontWeight={900} color="primary" gutterBottom>
|
||||
Edit File Details
|
||||
</Typography>
|
||||
|
||||
<Stack spacing={4} sx={{ mt: 2 }}>
|
||||
{/* Name Field */}
|
||||
<TextField
|
||||
label="File Name"
|
||||
fullWidth value={name}
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
slotProps={{ inputLabel: { shrink: true } }}
|
||||
/>
|
||||
|
||||
{/* Folder Select */}
|
||||
<TextField
|
||||
id="update-dest-select"
|
||||
select fullWidth label="Destination Folder"
|
||||
value={parentId}
|
||||
onChange={(e) => setParentId(e.target.value)}
|
||||
slotProps={{
|
||||
select: { displayEmpty: true },
|
||||
inputLabel: { shrink: true }
|
||||
}}
|
||||
>
|
||||
<MenuItem value=""><em>-- Root --</em></MenuItem>
|
||||
{folders.map((f: any) => (
|
||||
<MenuItem key={f.id} value={f.id}>{f.name}</MenuItem>
|
||||
))}
|
||||
</TextField>
|
||||
|
||||
{/* Custom Metadata Section */}
|
||||
<Box>
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 2 }}>
|
||||
<Typography variant="h6" fontWeight="700" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<AssignmentIcon color="primary" /> Custom Attributes
|
||||
</Typography>
|
||||
<Button
|
||||
startIcon={<AddCircleOutlineIcon />}
|
||||
size="small"
|
||||
onClick={() => setCustomMetadata([...customMetadata, { key: "", value: "" }])}
|
||||
>
|
||||
Add Field
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
<Stack spacing={2}>
|
||||
{customMetadata.map((row, index) => (
|
||||
<Grid container spacing={1} key={index} alignItems="center">
|
||||
<Grid item xs={5}>
|
||||
<TextField
|
||||
fullWidth size="small" placeholder="Key"
|
||||
value={row.key}
|
||||
onChange={(e) => {
|
||||
const updated = [...customMetadata];
|
||||
updated[index].key = e.target.value;
|
||||
setCustomMetadata(updated);
|
||||
}}
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={6}>
|
||||
<TextField
|
||||
fullWidth size="small" placeholder="Value"
|
||||
value={row.value}
|
||||
onChange={(e) => {
|
||||
const updated = [...customMetadata];
|
||||
updated[index].value = e.target.value;
|
||||
setCustomMetadata(updated);
|
||||
}}
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={1}>
|
||||
<IconButton color="error" onClick={() => setCustomMetadata(customMetadata.filter((_, i) => i !== index))}>
|
||||
<DeleteOutlineIcon />
|
||||
</IconButton>
|
||||
</Grid>
|
||||
</Grid>
|
||||
))}
|
||||
</Stack>
|
||||
</Box>
|
||||
|
||||
<TextField
|
||||
label="Description"
|
||||
multiline rows={4} fullWidth
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
slotProps={{ inputLabel: { shrink: true } }}
|
||||
/>
|
||||
|
||||
<Button
|
||||
variant="contained" size="large" fullWidth
|
||||
startIcon={<SaveIcon />}
|
||||
onClick={handleUpdate}
|
||||
disabled={loading}
|
||||
sx={{ py: 1.5, fontWeight: 'bold' }}
|
||||
>
|
||||
{loading ? "Saving..." : "Save Changes"}
|
||||
</Button>
|
||||
</Stack>
|
||||
</Paper>
|
||||
);
|
||||
}
|
||||
|
|
@ -6,40 +6,44 @@ import { prisma } from "@/lib/prisma";
|
|||
import { revalidatePath } from "next/cache";
|
||||
|
||||
/**
|
||||
* Creates a virtual folder in the database.
|
||||
* We explicitly set the metadata type to "FOLDER" so the Dashboard icon
|
||||
* and Location logic work immediately.
|
||||
* 1. CREATE FOLDER: Virtual Only
|
||||
* Logic: User-created organizational folders exist ONLY in the database.
|
||||
* No call to OneDrive is made here.
|
||||
*/
|
||||
export async function createFolderAction(name: string, parentId: string | null = null) {
|
||||
export async function createFolderAction(name: string, parentId?: string | null) {
|
||||
const session = await auth();
|
||||
if (!session?.user?.id) throw new Error("Unauthorized");
|
||||
|
||||
// We generate a manual UUID because the schema requires 'id' but has no default generator
|
||||
const internalId = crypto.randomUUID();
|
||||
try {
|
||||
const internalId = crypto.randomUUID();
|
||||
|
||||
await prisma.fileNode.create({
|
||||
data: {
|
||||
id: internalId,
|
||||
name: name,
|
||||
isFolder: true,
|
||||
path: `/virtual/${name}`,
|
||||
ownerId: session.user.id,
|
||||
parentId: parentId || null,
|
||||
metadata: {
|
||||
type: "FOLDER",
|
||||
mimeType: "inode/directory"
|
||||
const newNode = await prisma.fileNode.create({
|
||||
data: {
|
||||
id: internalId,
|
||||
oneDriveId: null, // Virtual folders do not have a cloud ID
|
||||
name: name,
|
||||
isFolder: true,
|
||||
path: `virtual:/${name}`,
|
||||
ownerId: session.user.id,
|
||||
parentId: parentId || null,
|
||||
metadata: { type: "FOLDER" }
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
revalidatePath("/upload");
|
||||
revalidatePath("/dashboard");
|
||||
return { success: true };
|
||||
revalidatePath("/upload");
|
||||
revalidatePath("/dashboard");
|
||||
|
||||
return { success: true, node: newNode };
|
||||
} catch (error: any) {
|
||||
console.error("Folder creation error:", error);
|
||||
throw new Error(error.message || "Failed to create virtual folder");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Uploads a file to OneDrive into a unique UUID folder
|
||||
* and links it to a virtual parent (Project/Folder) in the DB.
|
||||
* 2. UPLOAD FILE: Physical Container
|
||||
* Logic: Creates a physical folder (UUID) on OneDrive to hold the file.
|
||||
* This ensures every file has a unique storage space in the cloud.
|
||||
*/
|
||||
export async function uploadFileAction(formData: FormData) {
|
||||
const session = await auth();
|
||||
|
|
@ -47,16 +51,19 @@ export async function uploadFileAction(formData: FormData) {
|
|||
|
||||
const file = formData.get("file") as File;
|
||||
const description = formData.get("description") as string || "";
|
||||
const parentId = formData.get("parentId") as string | null;
|
||||
const parentIdRaw = formData.get("parentId") as string | null;
|
||||
const parentId = (parentIdRaw === "" || parentIdRaw === "root") ? null : parentIdRaw;
|
||||
|
||||
const customMetadataRaw = formData.get("customMetadata") as string;
|
||||
const customMetadata = customMetadataRaw ? JSON.parse(customMetadataRaw) : {};
|
||||
|
||||
if (!file) throw new Error("No file selected");
|
||||
|
||||
// Use the utility to ensure we have a valid JWT (fixing the "no dots" error)
|
||||
const accessToken = await getFreshAccessToken(session.user.id);
|
||||
const rootFolder = "WebCalibre";
|
||||
const internalId = crypto.randomUUID();
|
||||
const internalId = crypto.randomUUID(); // This UUID will be the OneDrive folder name
|
||||
|
||||
// 1. Create the unique UUID folder on OneDrive inside WebCalibre
|
||||
// 1. Create the Physical Storage Folder on OneDrive
|
||||
const createSubFolderRes = await fetch(`https://graph.microsoft.com/v1.0/me/drive/root:/${rootFolder}:/children`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
|
|
@ -71,28 +78,23 @@ export async function uploadFileAction(formData: FormData) {
|
|||
});
|
||||
|
||||
if (!createSubFolderRes.ok) {
|
||||
const err = await createSubFolderRes.json();
|
||||
console.error("OneDrive Folder Creation Error:", err);
|
||||
throw new Error("Storage directory creation failed");
|
||||
const errorData = await createSubFolderRes.json();
|
||||
throw new Error(errorData.error?.message || "Storage directory creation failed");
|
||||
}
|
||||
|
||||
const subFolderData = await createSubFolderRes.json();
|
||||
|
||||
// 2. Create Upload Session for the file
|
||||
// 2. Create Upload Session inside the new Physical Folder
|
||||
const sessionUrl = `https://graph.microsoft.com/v1.0/me/drive/items/${subFolderData.id}:/${encodeURIComponent(file.name)}:/createUploadSession`;
|
||||
const sessionRes = await fetch(sessionUrl, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
Authorization: `Bearer ${accessToken}`,
|
||||
"Content-Type": "application/json"
|
||||
},
|
||||
headers: { Authorization: `Bearer ${accessToken}`, "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ item: { "@microsoft.graph.conflictBehavior": "replace" } })
|
||||
});
|
||||
|
||||
const { uploadUrl } = await sessionRes.json();
|
||||
const buffer = Buffer.from(await file.arrayBuffer());
|
||||
|
||||
// 3. Perform the actual upload
|
||||
// 3. PUT the file binary
|
||||
const uploadRes = await fetch(uploadUrl, {
|
||||
method: "PUT",
|
||||
headers: {
|
||||
|
|
@ -102,24 +104,25 @@ export async function uploadFileAction(formData: FormData) {
|
|||
body: buffer
|
||||
});
|
||||
|
||||
if (!uploadRes.ok) throw new Error("OneDrive stream failed");
|
||||
const driveItem = await uploadRes.json();
|
||||
|
||||
// 4. Record in Database with full metadata and virtual hierarchy
|
||||
const uploadedFileData = await uploadRes.json();
|
||||
const oneDriveId = uploadedFileData.id;
|
||||
const extension = file.name.split('.').pop()?.toUpperCase() || "UNKNOWN";
|
||||
|
||||
// 4. Create record in Database
|
||||
// Link it to the VIRTUAL folder via parentId
|
||||
await prisma.fileNode.create({
|
||||
data: {
|
||||
id: internalId, // Matches the folder name on OneDrive
|
||||
oneDriveId: driveItem.id,
|
||||
id: internalId,
|
||||
oneDriveId: oneDriveId,
|
||||
name: file.name,
|
||||
description: description,
|
||||
size: BigInt(file.size),
|
||||
isFolder: false,
|
||||
path: `/${rootFolder}/${internalId}/${file.name}`,
|
||||
ownerId: session.user.id,
|
||||
parentId: parentId || null, // Virtual link to the Project folder
|
||||
parentId: parentId,
|
||||
metadata: {
|
||||
...customMetadata,
|
||||
type: extension,
|
||||
mimeType: file.type
|
||||
}
|
||||
|
|
@ -127,5 +130,6 @@ export async function uploadFileAction(formData: FormData) {
|
|||
});
|
||||
|
||||
revalidatePath("/dashboard");
|
||||
revalidatePath("/upload");
|
||||
return { success: true };
|
||||
}
|
||||
|
|
@ -1,96 +1,98 @@
|
|||
'use client';
|
||||
|
||||
import { useState } from "react";
|
||||
import { useState, useRef } from "react";
|
||||
import {
|
||||
Box, Button, Typography, Paper, LinearProgress, Stack,
|
||||
TextField, MenuItem, IconButton, Tooltip, Divider,
|
||||
InputAdornment
|
||||
Box, Button, Typography, Paper, Stack,
|
||||
TextField, MenuItem, IconButton, Divider,
|
||||
Grid, CircularProgress
|
||||
} from "@mui/material";
|
||||
import CloudUploadIcon from "@mui/icons-material/CloudUpload";
|
||||
import CreateNewFolderIcon from "@mui/icons-material/CreateNewFolder";
|
||||
import FolderIcon from "@mui/icons-material/Folder";
|
||||
import CreateNewFolderIcon from "@mui/icons-material/CreateNewFolder";
|
||||
import AssignmentIcon from '@mui/icons-material/Assignment';
|
||||
import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
|
||||
import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
|
||||
import { useRouter } from "next/navigation";
|
||||
import { uploadFileAction, createFolderAction } from "./_actions";
|
||||
|
||||
/**
|
||||
* Format bytes to human readable string (MiB/KiB)
|
||||
*/
|
||||
const formatFileSize = (bytes: number) => {
|
||||
if (bytes === 0) return '0 Bytes';
|
||||
const k = 1024;
|
||||
const sizes = ['Bytes', 'KB', 'MB', 'GB'];
|
||||
const i = Math.floor(Math.log(bytes) / Math.log(k));
|
||||
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
|
||||
};
|
||||
|
||||
interface Folder {
|
||||
id: string;
|
||||
name: string;
|
||||
parentId: string | null;
|
||||
interface MetadataPair {
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
interface UploadViewProps {
|
||||
user: any;
|
||||
folders?: Folder[];
|
||||
}
|
||||
|
||||
export default function UploadView({ user, folders = [] }: UploadViewProps) {
|
||||
export default function UploadView({ user, folders = [] }: any) {
|
||||
const router = useRouter();
|
||||
const fileInputRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
// Form State
|
||||
const [file, setFile] = useState<File | null>(null);
|
||||
const [description, setDescription] = useState("");
|
||||
const [parentId, setParentId] = useState("");
|
||||
const [status, setStatus] = useState<'idle' | 'uploading' | 'success'>('idle');
|
||||
const [customMetadata, setCustomMetadata] = useState<MetadataPair[]>([]);
|
||||
|
||||
// Folder Creation State
|
||||
const [showFolderInput, setShowFolderInput] = useState(false);
|
||||
const [newFolderName, setNewFolderName] = useState("");
|
||||
const [isCreatingFolder, setIsCreatingFolder] = useState(false);
|
||||
|
||||
const MAX_FILE_SIZE = 150 * 1024 * 1024; // 150MB Limit
|
||||
|
||||
const handleCreateFolder = async () => {
|
||||
if (!newFolderName.trim()) return;
|
||||
setIsCreatingFolder(true);
|
||||
try {
|
||||
// Creates folder nested under current selection if parentId exists
|
||||
await createFolderAction(newFolderName, parentId || null);
|
||||
setNewFolderName("");
|
||||
setShowFolderInput(false);
|
||||
router.refresh();
|
||||
} catch (err) {
|
||||
alert("Error creating folder");
|
||||
// FIX: Pass the current parentId to the action so it nests correctly
|
||||
const result = await createFolderAction(newFolderName, parentId);
|
||||
if (result.success) {
|
||||
setNewFolderName("");
|
||||
setShowFolderInput(false);
|
||||
router.refresh();
|
||||
}
|
||||
} catch (err: any) {
|
||||
alert(err.message || "Failed to create folder");
|
||||
} finally {
|
||||
setIsCreatingFolder(false);
|
||||
}
|
||||
};
|
||||
|
||||
const addMetadataRow = () => setCustomMetadata([...customMetadata, { key: "", value: "" }]);
|
||||
|
||||
const removeMetadataRow = (index: number) => {
|
||||
setCustomMetadata(customMetadata.filter((_, i) => i !== index));
|
||||
};
|
||||
|
||||
const updateMetadataRow = (index: number, field: 'key' | 'value', val: string) => {
|
||||
const updated = [...customMetadata];
|
||||
updated[index][field] = val;
|
||||
setCustomMetadata(updated);
|
||||
};
|
||||
|
||||
const handleUpload = async () => {
|
||||
if (!file) return;
|
||||
if (file.size > MAX_FILE_SIZE) {
|
||||
alert(`File is too large! Max allowed: ${formatFileSize(MAX_FILE_SIZE)}.`);
|
||||
return;
|
||||
}
|
||||
|
||||
setStatus('uploading');
|
||||
|
||||
const formData = new FormData();
|
||||
formData.append("file", file);
|
||||
formData.append("description", description);
|
||||
formData.append("parentId", parentId);
|
||||
|
||||
const metadataObj = customMetadata.reduce((acc, curr) => {
|
||||
if (curr.key.trim()) acc[curr.key.trim()] = curr.value;
|
||||
return acc;
|
||||
}, {} as Record<string, string>);
|
||||
|
||||
formData.append("customMetadata", JSON.stringify(metadataObj));
|
||||
|
||||
try {
|
||||
const result = await uploadFileAction(formData);
|
||||
if (result.success) {
|
||||
setStatus('success');
|
||||
setFile(null);
|
||||
setDescription("");
|
||||
setCustomMetadata([]);
|
||||
router.push("/dashboard");
|
||||
router.refresh();
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
alert("Upload failed. Check server logs.");
|
||||
alert("Upload failed.");
|
||||
setStatus('idle');
|
||||
}
|
||||
};
|
||||
|
|
@ -102,8 +104,7 @@ export default function UploadView({ user, folders = [] }: UploadViewProps) {
|
|||
</Typography>
|
||||
|
||||
<Stack spacing={4} sx={{ mt: 4 }}>
|
||||
|
||||
{/* Section 1: Destination Folder */}
|
||||
{/* 1. Destination */}
|
||||
<Box>
|
||||
<Typography variant="h6" gutterBottom fontWeight="700" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<FolderIcon color="primary" /> 1. Destination
|
||||
|
|
@ -111,147 +112,139 @@ export default function UploadView({ user, folders = [] }: UploadViewProps) {
|
|||
|
||||
<Stack direction="row" spacing={1}>
|
||||
<TextField
|
||||
id="project-destination-select"
|
||||
select
|
||||
fullWidth
|
||||
label="Target Project / Folder"
|
||||
value={parentId}
|
||||
onChange={(e) => setParentId(e.target.value)}
|
||||
disabled={status === 'uploading'}
|
||||
helperText="Files will be virtually organized into this folder."
|
||||
size="small"
|
||||
slotProps={{
|
||||
select: { displayEmpty: true },
|
||||
inputLabel: { shrink: true },
|
||||
}}
|
||||
>
|
||||
<MenuItem value=""><em>-- Root (Main Library) --</em></MenuItem>
|
||||
{folders.map((f) => (
|
||||
<MenuItem key={f.id} value={f.id} sx={{ pl: f.parentId ? 4 : 2 }}>
|
||||
{f.parentId ? `↳ ${f.name}` : f.name}
|
||||
</MenuItem>
|
||||
<MenuItem value=""><em>-- Root (Main Folder) --</em></MenuItem>
|
||||
{folders.map((f: any) => (
|
||||
<MenuItem key={f.id} value={f.id}>{f.name}</MenuItem>
|
||||
))}
|
||||
</TextField>
|
||||
<Tooltip title="Create New Folder Inside Selected">
|
||||
<IconButton
|
||||
color="primary"
|
||||
onClick={() => setShowFolderInput(!showFolderInput)}
|
||||
sx={{ border: '1px solid', borderColor: 'divider', borderRadius: 1, width: 56, height: 56 }}
|
||||
>
|
||||
<CreateNewFolderIcon />
|
||||
</IconButton>
|
||||
</Tooltip>
|
||||
<IconButton
|
||||
color="primary"
|
||||
onClick={() => setShowFolderInput(!showFolderInput)}
|
||||
sx={{ border: '1px solid #ccc', borderRadius: 1 }}
|
||||
>
|
||||
<CreateNewFolderIcon />
|
||||
</IconButton>
|
||||
</Stack>
|
||||
|
||||
{showFolderInput && (
|
||||
<Stack direction="row" spacing={1} sx={{ mt: 2, p: 2, bgcolor: 'action.hover', borderRadius: 2 }}>
|
||||
<TextField
|
||||
size="small"
|
||||
fullWidth
|
||||
placeholder="New folder name..."
|
||||
value={newFolderName}
|
||||
onChange={(e) => setNewFolderName(e.target.value)}
|
||||
autoFocus
|
||||
disabled={isCreatingFolder}
|
||||
/>
|
||||
<Button
|
||||
variant="contained"
|
||||
onClick={handleCreateFolder}
|
||||
disabled={isCreatingFolder || !newFolderName.trim()}
|
||||
>
|
||||
{isCreatingFolder ? "..." : "Create"}
|
||||
</Button>
|
||||
</Stack>
|
||||
<Box sx={{ mt: 2, p: 2, bgcolor: '#f8f9fa', borderRadius: 2 }}>
|
||||
<Typography variant="subtitle2" gutterBottom>
|
||||
{parentId ? `Create inside current selection` : `Create at Root`}
|
||||
</Typography>
|
||||
<Stack direction="row" spacing={1}>
|
||||
<TextField
|
||||
fullWidth size="small" placeholder="Folder Name (e.g. Project-2)"
|
||||
value={newFolderName}
|
||||
onChange={(e) => setNewFolderName(e.target.value)}
|
||||
onKeyPress={(e) => e.key === 'Enter' && handleCreateFolder()}
|
||||
/>
|
||||
<Button
|
||||
variant="contained"
|
||||
onClick={handleCreateFolder}
|
||||
disabled={isCreatingFolder || !newFolderName}
|
||||
>
|
||||
{isCreatingFolder ? <CircularProgress size={24} /> : "Create"}
|
||||
</Button>
|
||||
</Stack>
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
|
||||
<Divider />
|
||||
|
||||
{/* Section 2: File Upload Area */}
|
||||
{/* 2. Upload Area */}
|
||||
<Box>
|
||||
<Typography variant="h6" gutterBottom fontWeight="700" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<CloudUploadIcon color="primary" /> 2. Upload File
|
||||
</Typography>
|
||||
|
||||
<Box
|
||||
sx={{
|
||||
p: 5,
|
||||
mt: 1,
|
||||
border: '2px dashed',
|
||||
borderColor: file ? 'primary.main' : 'divider',
|
||||
borderRadius: 3,
|
||||
textAlign: 'center',
|
||||
bgcolor: file ? 'rgba(25, 118, 210, 0.04)' : '#fafafa',
|
||||
'&:hover': { bgcolor: 'rgba(0, 0, 0, 0.02)' }
|
||||
}}
|
||||
>
|
||||
<input
|
||||
type="file" id="file-input" hidden
|
||||
onChange={(e) => {
|
||||
setFile(e.target.files?.[0] || null);
|
||||
setStatus('idle');
|
||||
}}
|
||||
/>
|
||||
<label htmlFor="file-input">
|
||||
<Button
|
||||
variant={file ? "outlined" : "contained"}
|
||||
component="span"
|
||||
startIcon={<CloudUploadIcon />}
|
||||
size="large"
|
||||
disabled={status === 'uploading'}
|
||||
>
|
||||
{file ? "Change File" : "Choose Document"}
|
||||
</Button>
|
||||
</label>
|
||||
|
||||
{file && (
|
||||
<Box mt={2}>
|
||||
<Typography variant="subtitle2" color="primary.main" fontWeight="bold">
|
||||
{file.name}
|
||||
</Typography>
|
||||
<Typography variant="caption" color="text.secondary">
|
||||
{formatFileSize(file.size)}
|
||||
</Typography>
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
</Box>
|
||||
|
||||
{/* Section 3: Notes */}
|
||||
<Box>
|
||||
<Typography variant="h6" gutterBottom fontWeight="700" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<AssignmentIcon color="primary" /> 3. Metadata
|
||||
</Typography>
|
||||
<TextField
|
||||
label="Description / Notes"
|
||||
multiline rows={3} fullWidth
|
||||
placeholder="Add keywords or a brief summary..."
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
disabled={status === 'uploading'}
|
||||
<input
|
||||
type="file"
|
||||
ref={fileInputRef}
|
||||
style={{ display: 'none' }}
|
||||
onChange={(e) => setFile(e.target.files?.[0] || null)}
|
||||
/>
|
||||
</Box>
|
||||
|
||||
{/* Progress & Actions */}
|
||||
<Box>
|
||||
{status === 'uploading' && (
|
||||
<Box mb={2}>
|
||||
<LinearProgress sx={{ borderRadius: 5, height: 10 }} />
|
||||
<Typography variant="caption" color="primary" sx={{ mt: 1, display: 'block', textAlign: 'center' }}>
|
||||
Transferring to OneDrive and updating Library...
|
||||
</Typography>
|
||||
</Box>
|
||||
)}
|
||||
|
||||
<Button
|
||||
variant="contained" size="large" fullWidth
|
||||
disabled={!file || status === 'uploading'}
|
||||
onClick={handleUpload}
|
||||
sx={{ py: 2, fontWeight: 'bold' }}
|
||||
variant="outlined"
|
||||
fullWidth
|
||||
sx={{ p: 4, borderStyle: 'dashed', textTransform: 'none' }}
|
||||
onClick={() => fileInputRef.current?.click()}
|
||||
>
|
||||
{status === 'uploading' ? 'Uploading...' : 'Add to Library'}
|
||||
{file ? (
|
||||
<Box>
|
||||
<Typography color="success.main" fontWeight="bold">✓ {file.name}</Typography>
|
||||
<Typography variant="caption" color="text.secondary">
|
||||
Click to change file ({(file.size / 1024 / 1024).toFixed(2)} MB)
|
||||
</Typography>
|
||||
</Box>
|
||||
) : (
|
||||
"Click to Select File"
|
||||
)}
|
||||
</Button>
|
||||
|
||||
{status === 'success' && (
|
||||
<Typography align="center" color="success.main" fontWeight="bold" sx={{ mt: 2 }}>
|
||||
✅ File processed and assigned to project!
|
||||
</Typography>
|
||||
)}
|
||||
</Box>
|
||||
|
||||
{/* 3. Custom Attributes */}
|
||||
<Box>
|
||||
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 1 }}>
|
||||
<Typography variant="h6" fontWeight="700" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||
<AssignmentIcon color="primary" /> 3. Custom Attributes
|
||||
</Typography>
|
||||
<Button startIcon={<AddCircleOutlineIcon />} size="small" onClick={addMetadataRow}>
|
||||
Add Field
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
<Stack spacing={2}>
|
||||
{customMetadata.map((row, index) => (
|
||||
<Grid container spacing={1} key={index} alignItems="center">
|
||||
<Grid item xs={5}>
|
||||
<TextField
|
||||
fullWidth size="small" placeholder="Key (e.g. Project-ID)"
|
||||
value={row.key} onChange={(e) => updateMetadataRow(index, 'key', e.target.value)}
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={6}>
|
||||
<TextField
|
||||
fullWidth size="small" placeholder="Value"
|
||||
value={row.value} onChange={(e) => updateMetadataRow(index, 'value', e.target.value)}
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item xs={1}>
|
||||
<IconButton color="error" onClick={() => removeMetadataRow(index)}>
|
||||
<DeleteOutlineIcon />
|
||||
</IconButton>
|
||||
</Grid>
|
||||
</Grid>
|
||||
))}
|
||||
|
||||
<TextField
|
||||
label="General Description"
|
||||
multiline rows={2} fullWidth
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
/>
|
||||
</Stack>
|
||||
</Box>
|
||||
|
||||
<Button
|
||||
variant="contained" size="large" fullWidth
|
||||
disabled={!file || status === 'uploading'}
|
||||
onClick={handleUpload}
|
||||
sx={{ py: 2, fontWeight: 'bold' }}
|
||||
>
|
||||
{status === 'uploading' ? 'Uploading to OneDrive...' : 'Start Upload'}
|
||||
</Button>
|
||||
</Stack>
|
||||
</Paper>
|
||||
);
|
||||
|
|
|
|||
20
src/auth.ts
20
src/auth.ts
|
|
@ -1,3 +1,4 @@
|
|||
// src/auth.ts
|
||||
import NextAuth from "next-auth";
|
||||
import { PrismaAdapter } from "@auth/prisma-adapter";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
|
|
@ -10,6 +11,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
|
|||
callbacks: {
|
||||
async jwt({ token, account, user }) {
|
||||
// 1. Handle OAuth tokens (from first sign-in)
|
||||
// This captures the tokens directly from the Microsoft Azure response
|
||||
if (account) {
|
||||
token.accessToken = account.access_token;
|
||||
token.refreshToken = account.refresh_token;
|
||||
|
|
@ -17,10 +19,10 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
|
|||
}
|
||||
|
||||
// 2. Attach User ID and Role to the token
|
||||
// When 'user' exists, it's the first time we've fetched this user from the DB during login
|
||||
// This runs when the user first logs in
|
||||
if (user) {
|
||||
token.sub = user.id;
|
||||
// @ts-ignore - 'role' exists on our custom User model
|
||||
// @ts-ignore - 'role' is a custom field in your Postgres User table
|
||||
token.role = user.role;
|
||||
}
|
||||
|
||||
|
|
@ -29,10 +31,16 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
|
|||
|
||||
async session({ session, token }) {
|
||||
// 3. Pass values from the JWT Token into the Client-facing Session
|
||||
if (session?.user && token.sub) {
|
||||
session.user.id = token.sub;
|
||||
// @ts-ignore - Attaching the role so the Navbar and Settings page can see it
|
||||
session.user.role = token.role;
|
||||
// This makes the tokens and IDs available to your API routes and Components
|
||||
if (session?.user) {
|
||||
session.user.id = token.sub as string;
|
||||
|
||||
// @ts-ignore - Attaching the role for UI permissions
|
||||
session.user.role = token.role as string;
|
||||
|
||||
// IMPORTANT: We must attach the accessToken here so the
|
||||
// /api/download route can use it to fetch from MS Graph
|
||||
session.accessToken = token.accessToken as string;
|
||||
}
|
||||
return session;
|
||||
},
|
||||
|
|
|
|||
24
src/types/next-auth.d.ts
vendored
Normal file
24
src/types/next-auth.d.ts
vendored
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
// src/types/next-auth.d.ts
|
||||
import NextAuth, { DefaultSession } from "next-auth"
|
||||
import { JWT } from "next-auth/jwt"
|
||||
|
||||
declare module "next-auth" {
|
||||
/**
|
||||
* Returned by `useSession`, `auth`, and received as a prop on the `SessionProvider` React Context
|
||||
*/
|
||||
interface Session {
|
||||
accessToken?: string;
|
||||
user: {
|
||||
id: string;
|
||||
role?: string;
|
||||
} & DefaultSession["user"]
|
||||
}
|
||||
}
|
||||
|
||||
declare module "next-auth/jwt" {
|
||||
/** Returned by the `jwt` callback and `getToken`, when using JWT sessions */
|
||||
interface JWT {
|
||||
accessToken?: string;
|
||||
role?: string;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue