Skip to content
Closed
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
8 changes: 6 additions & 2 deletions stackpress/package.json
Comment thread
jamespaulengay marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,10 @@
"require": "./cjs/view/helpers.js",
"import": "./esm/view/helpers.js"
},
"./view/handlebars": {
"require": "./cjs/view/handlebars.js",
"import": "./esm/view/handlebars.js"
},
"./view/import": {
"require": "./cjs/view/import.js",
"import": "./esm/view/import.js"
Expand Down Expand Up @@ -579,6 +583,7 @@
"view/transform": [ "./cjs/view/transform/index.d.ts" ],
"view/client": [ "./cjs/view/client.d.ts" ],
"view/helpers": [ "./cjs/view/helpers.d.ts" ],
"view/handlebars": [ "./cjs/view/handlebars.d.ts" ],
"view/import": [ "./cjs/view/import.d.ts" ],
"view/plugin": [ "./cjs/view/plugin.d.ts" ],
"view/types": [ "./cjs/view/types.d.ts" ],
Expand Down Expand Up @@ -630,10 +635,10 @@
"@stackpress/ingest": "0.7.2",
"@stackpress/inquire": "0.7.2",
"@stackpress/lib": "0.7.2",
"handlebars": "4.7.9",
"html-entities": "2.6.0",
"jose": "6.2.0",
"moment": "2.30.1",
"mustache": "4.2.0",
"nanoid": "5.1.6",
"nodemailer": "7.0.13",
"papaparse": "5.5.3",
Expand All @@ -647,7 +652,6 @@
"@istanbuljs/esm-loader-hook": "0.3.0",
"@types/chai": "4.3.20",
"@types/mocha": "10.0.10",
"@types/mustache": "4.2.6",
"@types/nodemailer": "7.0.11",
"@types/node": "25.3.5",
"@types/papaparse": "5.5.2",
Expand Down
15 changes: 7 additions & 8 deletions stackpress/src/admin/transform/pages/copy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ res.data.set('admin', {
//if form submitted
if (req.method === 'POST') {
const input: Partial<<%type%>> = {};
<%#fields%>
if (req.data.has('<%column%>')) {
input.<%column%> = req.data('<%column%>');
<%#each fields as |field|%>
if (req.data.has('<%field.column%>')) {
input.<%field.column%> = req.data('<%field.column%>');
}
<%/fields%>
<%/each%>
//emit the create event
const response = await ctx.resolve<<%type%>>('<%event%>-create', input, res);
//if error
Expand All @@ -163,16 +163,15 @@ if (req.method === 'POST') {
const results = response.results!
//redirect
const base = admin.base ?? '/admin';
<%#oneid%>
<%#if oneid%>
res.redirect(
\`\${base}/<%model%>/detail/<%ids%>\`
);
<%/oneid%>
<%^oneid%>
<%else%>
res.redirect(
\`\${base}/<%model%>/search\`
);
<%/oneid%>
<%/if%>
}
return;
}
Expand Down
7 changes: 3 additions & 4 deletions stackpress/src/admin/transform/pages/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,15 @@ if (req.method === 'POST') {
const results = response.results!
//redirect
const base = admin.base ?? '/admin';
<%#oneid%>
<%#if oneid%>
res.redirect(
\`\${base}/<%model%>/detail/<%ids%>\`
);
<%/oneid%>
<%^oneid%>
<%else%>
res.redirect(
\`\${base}/<%model%>/search\`
);
<%/oneid%>
<%/if%>
}
}`,

Expand Down
11 changes: 5 additions & 6 deletions stackpress/src/admin/transform/pages/detail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,22 +147,21 @@ res.data.set('admin', {
base: admin.base ?? '/admin',
menu: admin.menu || []
});
<%#active%>
<%#if active%>
//make sure to set the active column to -1 in order
// to get it returned even if it's soft-deleted
req.data.set('filter', '<%column%>', -1);
<%/active%>
<%#hashes.length%>
<%/if%>
<%#if hashes.length%>
const response = await ctx.resolve<<%extended%>>('<%event%>-detail', req);
<%#hashes%>
if (typeof response.results?.<%column%> !== 'undefined') {
delete response.results.<%column%>;
}
<%/hashes%>
res.fromStatusResponse(response);
<%/hashes.length%>
<%^hashes.length%>
<%else%>
await ctx.emit('<%event%>-detail', req, res);
<%/hashes.length%>`,
<%/if%>`,

};
8 changes: 4 additions & 4 deletions stackpress/src/admin/transform/pages/detail/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,24 +172,24 @@ if (detail.code !== 200) {
res.fromStatusResponse(detail);
return;
}
<%#hashes.length%>
<%#if hashes.length%>
//remove hashed data
<%#hashes%>
if (typeof detail.results?.<%column%> !== 'undefined') {
delete detail.results.<%column%>;
}
<%/hashes%>
<%/hashes.length%>
<%/if%>

//if form submitted
if (req.method === 'POST') {
//get the form input
const input = req.data();
//set the foreign id
input.<%id.local%> = detail.results?.<%id.foreign%>;
<%#remove%>
<%#each remove%>
delete input.<%column%>;
<%/remove%>
<%/each%>
//emit the create event
const response = await ctx.resolve<UnknownNest>('<%create%>', input);
//if error
Expand Down
8 changes: 4 additions & 4 deletions stackpress/src/admin/transform/pages/detail/export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ if (detail.code !== 200) {
res.fromStatusResponse(detail);
return;
}
<%#hashes.length%>
<%#if hashes.length%>
//remove hashed data
<%#hashes%>
if (typeof detail.results?.<%column%> !== 'undefined') {
delete detail.results.<%column%>;
}
<%/hashes%>
<%/hashes.length%>
<%/if%>

//extract filters from url query
let { q, filter = {}, span, sort } = req.data<{
Expand Down Expand Up @@ -200,14 +200,14 @@ if (detail.code !== 200) {
res.fromStatusResponse(detail);
return;
}
<%#hashes.length%>
<%#if hashes.length%>
//remove hashed data
<%#hashes%>
if (typeof detail.results?.<%column%> !== 'undefined') {
delete detail.results.<%column%>;
}
<%/hashes%>
<%/hashes.length%>
<%/if%>

//extract filters from url query
let { q, filter = {}, span, sort } = req.data<{
Expand Down
4 changes: 2 additions & 2 deletions stackpress/src/admin/transform/pages/detail/import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ if (detail.code !== 200) {
res.fromStatusResponse(detail);
return;
}
<%#hashes.length%>
<%#if hashes.length%>
//remove hashed data
<%#hashes%>
if (typeof detail.results?.<%column%> !== 'undefined') {
delete detail.results.<%column%>;
}
<%/hashes%>
<%/hashes.length%>
<%/if%>
//if form submitted
if (req.method === 'POST') {
Expand Down
4 changes: 2 additions & 2 deletions stackpress/src/admin/transform/pages/detail/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,14 @@ if (detail.code !== 200) {
res.fromStatusResponse(detail);
return;
}
<%#hashes.length%>
<%#if hashes.length%>
//remove hashed data
<%#hashes%>
if (typeof detail.results?.<%column%> !== 'undefined') {
delete detail.results.<%column%>;
}
<%/hashes%>
<%/hashes.length%>
<%/if%>

//next get the relation rows

Expand Down
4 changes: 2 additions & 2 deletions stackpress/src/admin/transform/pages/restore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ res.data.set('admin', {
menu: admin.menu || []
});
<%#active%>
<%#if active%>
//make sure to set the active column to -1 in order
// to get it returned even if it's soft-deleted
req.data.set('filter', '<%column%>', -1);
<%/active%>
<%/if%>
//if confirmed
if (req.data('confirmed')) {
Expand Down
7 changes: 3 additions & 4 deletions stackpress/src/admin/transform/pages/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,16 @@ if (req.method === 'POST' || req.method === 'PUT') {
return;
}
//not submitted, fetch the data using the id
<%#hashes.length%>
<%#if hashes.length%>
const response = await ctx.resolve<<%extended%>>('<%event%>-detail', req);
<%#hashes%>
if (typeof response.results?.<%column%> !== 'undefined') {
delete response.results.<%column%>;
}
<%/hashes%>
res.fromStatusResponse(response);
<%/hashes.length%>
<%^hashes.length%>
<%else%>
await ctx.emit('<%event%>-detail', req, res);
<%/hashes.length%>`,
<%/if%>`,

};
Loading