Skip to content

Commit

Permalink
Merge branch 'main' into N21-2111-sync-existing-course
Browse files Browse the repository at this point in the history
  • Loading branch information
sdinkov authored Aug 2, 2024
2 parents b51c574 + 736c083 commit f39758c
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 6 deletions.
15 changes: 15 additions & 0 deletions apps/server/src/modules/board/domain/board-node.do.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,21 @@ export abstract class BoardNode<T extends BoardNodeProps> extends DomainObject<T
});
}

public getProps(): T {
const copyProps = { ...this.props };
// TODO This is a Hotfix. We need to make sure that only properties of type T are returned
// At runtime the props are a MikroORM entity that has additional non-persisted properties
// see @Property({ persist: false })
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
copyProps.domainObject = undefined;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
copyProps.children = [];

return copyProps;
}

get level(): number {
return this.ancestorIds.length;
}
Expand Down
13 changes: 9 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
"i18next": "^23.3.0",
"i18next-fs-backend": "^2.1.5",
"ioredis": "^5.3.2",
"jose": "^5.6.3",
"jose": "^1.28.1",
"jsdom": "^23.2.0",
"jsonwebtoken": "^9.0.2",
"jwks-rsa": "^2.0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/services/fileStorage/proxy-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ const signedUrlService = {
userId: creatorId,
flatFileName: fileObject.storageFileName,
localFileName: query.name || fileObject.name,
download,
download: true,
bucket: fileObject.bucket,
})
)
Expand Down

0 comments on commit f39758c

Please sign in to comment.