Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.7.14 #1051

Merged
merged 8 commits into from
Apr 9, 2024
Merged

Release 1.7.14 #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
efea1d7
chore: Updating npm dev dependencies
ChiaAutomation Apr 5, 2024
e13bf3e
fix: allow unpaginated requests on xls download
MichaelTaylor3D Apr 8, 2024
acc346e
Merge pull request #1048 from Chia-Network/fix/allow-unpaginated-xls-…
TheLastCicada Apr 8, 2024
6141a03
fix: move max limit to 1000 for pagination
MichaelTaylor3D Apr 9, 2024
8d032fa
Merge pull request #1049 from Chia-Network/fix/max-limit
TheLastCicada Apr 9, 2024
b54d439
fix: untokenized units sql operator
MichaelTaylor3D Apr 9, 2024
678303c
Merge pull request #1050 from Chia-Network/fix/untokenizedunits
TheLastCicada Apr 9, 2024
e2e7ceb
chore: bump version to 1.7.14
TheLastCicada Apr 9, 2024
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
13 changes: 6 additions & 7 deletions package-lock.json
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cadt",
"version": "1.7.13",
"version": "1.7.14",
"_comment": "DONT CHANGE MAJOR UNLESS DATAMODEL CHANGES: The major version corresponds to the datamodel version your using, so 2.0.0 means it'll use datamodel v2",
"private": true,
"bin": "build/server.js",
Expand Down Expand Up @@ -59,21 +59,21 @@
"winston-daily-rotate-file": "^4.7.1"
},
"devDependencies": {
"@babel/cli": "^7.23.9",
"@babel/core": "^7.24.0",
"@babel/plugin-syntax-import-attributes": "^7.23.3",
"@babel/preset-env": "^7.24.0",
"@babel/cli": "^7.24.1",
"@babel/core": "^7.24.4",
"@babel/plugin-syntax-import-attributes": "^7.24.1",
"@babel/preset-env": "^7.24.4",
"@babel/register": "^7.23.7",
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.0.3",
"@commitlint/config-conventional": "^19.1.0",
"babel-plugin-module-resolver": "^5.0.0",
"chai": "^5.1.0",
"chai-http": "^4.4.0",
"eslint": "^8.57.0",
"eslint-plugin-es": "^4.1.0",
"eslint-plugin-mocha": "^10.4.1",
"husky": "^9.0.11",
"mocha": "^10.3.0",
"mocha": "^10.4.0",
"semver": "^7.6.0",
"sinon": "^17.0.1",
"socket.io-client": "^4.7.5",
Expand Down
5 changes: 4 additions & 1 deletion src/controllers/units.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,10 @@ export const findAll = async (req, res) => {
}

where.marketplace = {
[Sequelize.Op.not]: 'Tokenized on Chia',
[Sequelize.Op.or]: [
{ [Sequelize.Op.is]: null },
{ [Sequelize.Op.not]: 'Tokenized on Chia' },
],
};
}

Expand Down
3 changes: 2 additions & 1 deletion src/validations/projects.validations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const baseSchema = {

export const projectsGetQuerySchema = Joi.object({
page: Joi.number().optional(),
limit: Joi.number().max(100).min(1).optional(),
limit: Joi.number().max(1000).min(1).optional(),
search: Joi.string().optional(),
columns: Joi.array().items(Joi.string()).single().optional(),
orgUid: Joi.string().optional(),
Expand All @@ -76,6 +76,7 @@ export const projectsGetQuerySchema = Joi.object({
Joi.alternatives([
Joi.object({ projectIds: Joi.string().required() }).unknown(),
Joi.object({ warehouseProjectId: Joi.string().required() }).unknown(),
Joi.object({ xls: Joi.string().required() }).unknown(),
]),
{
then: Joi.object({
Expand Down
8 changes: 7 additions & 1 deletion src/validations/units.validations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const unitsPostSchema = Joi.object({

export const unitsGetQuerySchema = Joi.object({
page: Joi.number().min(1).required(),
limit: Joi.number().max(100).min(1).required(),
limit: Joi.number().max(1000).min(1).required(),
search: Joi.string(),
warehouseUnitId: Joi.string(),
columns: Joi.array().items(Joi.string()).single(),
Expand Down Expand Up @@ -83,6 +83,12 @@ export const unitsGetQuerySchema = Joi.object({
limit: Joi.number().max(100).min(1).optional(),
}),
})
.when(Joi.object({ xls: Joi.exist() }).unknown(), {
then: Joi.object({
page: Joi.number().min(1).optional(),
limit: Joi.number().max(100).min(1).optional(),
}),
})
.and('page', 'limit');

export const unitsUpdateSchema = Joi.object({
Expand Down
Loading