Skip to content

Commit 635dbc8

Browse files
authored
Merge pull request #248 from loneil/feature/deleteFile
couple model fixes for file storage db record
2 parents 97001ee + 62a6a33 commit 635dbc8

7 files changed

Lines changed: 19979 additions & 19 deletions

File tree

app/frontend/package-lock.json

Lines changed: 19972 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "common-hosted-form-service-frontend",
3-
"version": "1.0.0",
3+
"version": "1.2.0",
44
"private": true,
55
"license": "Apache-2.0",
66
"scripts": {

app/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "common-hosted-form-service-app",
3-
"version": "1.0.0",
3+
"version": "1.2.0",
44
"private": true,
55
"license": "Apache-2.0",
66
"scripts": {

app/src/forms/common/models/tables/fileStorage.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
const { Model } = require('objection');
2+
const { Timestamps } = require('../mixins');
23
const { Regex } = require('../../constants');
34
const stamps = require('../jsonSchema').stamps;
45

5-
class FileStorage extends Model {
6+
class FileStorage extends Timestamps(Model) {
67
static get tableName() {
78
return 'file_storage';
89
}

app/src/forms/file/service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const service = {
4646
delete: async (id) => {
4747
let trx;
4848
try {
49-
trx = FileStorage.startTransaction();
49+
trx = await FileStorage.startTransaction();
5050
const obj = await service.read(id);
5151

5252
await FileStorage.query(trx)

openshift/app.bc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ objects:
6060
value: "${ROUTE_PATH}"
6161
from:
6262
kind: DockerImage
63-
name: docker.io/node:lts-alpine
63+
name: docker.io/node:14.18.1-alpine
6464
type: Docker
6565
successfulBuildsHistoryLimit: 3
6666
parameters:

0 commit comments

Comments
 (0)