Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions src/controllers/ReviewController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,36 @@ export class ReviewController {
return Object.prototype.hasOwnProperty.call(obj, 'persistentID');
}

// ... (rest of the code)

if (errors.length > 0) {
console.log('Validation Errors: ', errors);
res.status(500).send(
errors.map((error: ValidationError) => {
let persistentID = 'missing id';
if (error.target && typeof error.target === 'object' && hasPersistentID(error.target)) {
persistentID = error.target.persistentID;
}
return {
persistentID: persistentID,
constraints: error.constraints,
};
}),
const processed_errors = errors.map((error: ValidationError) => {
let persistentID = 'missing id';
if (error.target && typeof error.target === 'object' && hasPersistentID(error.target)) {
persistentID = error.target.persistentID;
}
const richConstraints = {};
if (error.constraints) {
Object.entries(error.constraints).forEach(([key, message]) => {
const context = error.contexts ? error.contexts[key] : undefined;
const severity = context?.severity || 'error';
richConstraints[key] = {
message: message,
severity: severity
};
});
}
return {
persistentID: persistentID,
property: error.property,
constraints: richConstraints,
};
});
console.log('Validation Errors: ', processed_errors);
return res.status(500).render('pages/review',
{
title: "Review Dashboard",
errors: processed_errors,
}
);
} else {
res.status(200).send(`successfully saved ${saves} entries`);
Expand Down
2 changes: 1 addition & 1 deletion src/db/entities/SLCItemCatalog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class slc_item_catalog extends BaseEntity implements CatalogInterface {
@IsNotEmpty()
@IsString()
@IsUrl()
@Reachable()
@Reachable({ context: { severity: 'warn'} })
iframe_url!: string;

@Column()
Expand Down
230 changes: 0 additions & 230 deletions src/views/pages/review-dashboard.ejs

This file was deleted.

30 changes: 30 additions & 0 deletions src/views/pages/review.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!DOCTYPE html>
<html lang="en">
<%- include('../partials/head') -%>
<%- include('../partials/header') -%>

<body>
<div class="container">
<h2>Validation Results</h2>
<ul>
<% errors.forEach(function (item) { %>
<li>
<p>Persistent ID: <%= item.persistentID %></p>
<p>Property: <%= item.property %></p>
<% for (const constraint in item.constraints) {%>
<%
const message = item.constraints[constraint].message;
const color = (item.constraints[constraint].severity === 'warn') ? 'orange' : 'red';
%>
<p style="color: <%= color %>">
<%= constraint %> - <%= message %>
</p>
<% } %>
</li>
<% }); %>
</ul>
</div>

<%- include('../partials/footer') -%>
</body>
</html>