bull-admin-panel
Advanced tools
Comparing version 1.0.0 to 1.0.1
const v = require('../'); | ||
const JobState = require('../../models/constants/job-state'); | ||
const JOB_STATE = require('../../models/constants/job-state'); | ||
@@ -21,4 +21,4 @@ module.exports = v.compile({ | ||
empty: false, | ||
enum: JobState.all(), | ||
enum: Object.values(JOB_STATE), | ||
}, | ||
}); |
@@ -6,3 +6,3 @@ const classNames = require('classnames'); | ||
const {RouterView, Link, getRouter} = require('capybara-router'); | ||
const InfiniteScroll = require('react-infinite-scroll'); | ||
const InfiniteScroll = require('@kelp404/react-infinite-scroller'); | ||
const FlipMove = require('react-flip-move').default; | ||
@@ -9,0 +9,0 @@ const Base = require('./shared/base'); |
const {getRouter} = require('capybara-router'); | ||
const dayjs = require('dayjs').default; | ||
const dayjs = require('dayjs'); | ||
@@ -4,0 +4,0 @@ /** |
@@ -9,3 +9,3 @@ // Stylesheets | ||
const $ = require('jquery/dist/jquery'); | ||
const dayjs = require('dayjs').default; | ||
const dayjs = require('dayjs'); | ||
const LocalizedFormat = require('dayjs/plugin/localizedFormat'); | ||
@@ -12,0 +12,0 @@ const {RouterView} = require('capybara-router'); |
const errors = require('../models/errors'); | ||
const PageList = require('../models/page-list'); | ||
const JobModel = require('../models/dto/job-model'); | ||
const JobState = require('../models/constants/job-state'); | ||
const JOB_STATE = require('../models/constants/job-state'); | ||
const cleanJobsForm = require('../forms/jobs/clean-jobs-form'); | ||
@@ -64,6 +64,5 @@ const jobsSearchForm = require('../forms/jobs/jobs-search-form'); | ||
const size = Number(req.query.size || 20); | ||
let types = JobState.all(); | ||
if (req.query.state) { | ||
types = [req.query.state]; | ||
} | ||
const types = req.query.state | ||
? [req.query.state] | ||
: Object.values(JOB_STATE); | ||
@@ -84,3 +83,5 @@ return Promise.all([ | ||
res.json(new PageList(index, size, total, jobs.map(x => new JobModel(x)))); | ||
res.json( | ||
new PageList(index, size, total, jobs.filter(x => x).map(x => new JobModel(x))), | ||
); | ||
}); | ||
@@ -87,0 +88,0 @@ }; |
@@ -7,11 +7,2 @@ module.exports = { | ||
REMOVED: 'job-removed', | ||
all() { | ||
return [ | ||
this.WAITING, | ||
this.ACTIVE, | ||
this.COMPLETED, | ||
this.FAILED, | ||
this.REMOVED, | ||
]; | ||
}, | ||
}; |
@@ -6,10 +6,2 @@ module.exports = { | ||
FAILED: 'failed', | ||
all() { | ||
return [ | ||
this.WAITING, | ||
this.ACTIVE, | ||
this.COMPLETED, | ||
this.FAILED, | ||
]; | ||
}, | ||
}; |
{ | ||
"name": "bull-admin-panel", | ||
"version": "1.0.0", | ||
"version": "1.0.1", | ||
"description": "An admin panel of Bull based on WebSocket.", | ||
@@ -11,5 +11,6 @@ "main": "index.js", | ||
"eslint": "node_modules/eslint/bin/eslint.js ./ --ignore-path .gitignore --ignore-pattern 'lib/frontend/dist/'", | ||
"changelog": "node_modules/conventional-changelog-cli/cli.js -p angular", | ||
"test": "node_modules/jest/bin/jest.js --coverage __tests__", | ||
"coveralls": "node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info" | ||
"changelog": "node_modules/conventional-changelog-cli/cli.js -n changelog.config/index.js", | ||
"test": "npm run test:backend && npm run test:frontend", | ||
"test:backend": "node_modules/jest/bin/jest.js --config __tests__/backend/jest.config.js", | ||
"test:frontend": "node_modules/jest/bin/jest.js --config __tests__/frontend/jest.config.js" | ||
}, | ||
@@ -36,3 +37,3 @@ "files": [ | ||
"dependencies": { | ||
"bull": "4.7.0", | ||
"bull": "4.8.1", | ||
"express": "4.17.3", | ||
@@ -43,15 +44,17 @@ "fastest-validator": "1.12.0", | ||
"query-string": "7.1.1", | ||
"ws": "7.5.7" | ||
"ws": "8.5.0" | ||
}, | ||
"devDependencies": { | ||
"@babel/core": "7.17.5", | ||
"@babel/core": "7.17.8", | ||
"@babel/eslint-parser": "7.17.0", | ||
"@babel/plugin-proposal-class-properties": "7.16.7", | ||
"@babel/plugin-transform-runtime": "7.17.0", | ||
"@babel/polyfill": "7.12.1", | ||
"@babel/preset-env": "7.16.11", | ||
"@babel/preset-react": "7.16.7", | ||
"@fortawesome/fontawesome-free": "5.15.1", | ||
"@fortawesome/fontawesome-free": "6.1.0", | ||
"@kelp404/react-infinite-scroller": "1.2.5", | ||
"babel-loader": "8.2.3", | ||
"bootstrap": "4.5.3", | ||
"capybara-router": "2.6.0", | ||
"capybara-router": "2.8.0", | ||
"classnames": "2.3.1", | ||
@@ -62,22 +65,23 @@ "compression-webpack-plugin": "4.0.1", | ||
"conventional-changelog-cli": "2.2.2", | ||
"coveralls": "3.1.1", | ||
"css-loader": "5.0.1", | ||
"dayjs": "1.10.1", | ||
"dayjs": "1.11.0", | ||
"eslint": "8.11.0", | ||
"eslint-config-xo": "0.40.0", | ||
"eslint-config-xo-react": "0.26.0", | ||
"eslint-config-xo-react": "0.27.0", | ||
"eslint-config-xo-space": "0.32.0", | ||
"eslint-plugin-react": "7.29.3", | ||
"eslint-plugin-react": "7.29.4", | ||
"eslint-plugin-react-hooks": "4.3.0", | ||
"file-loader": "6.2.0", | ||
"history": "5.3.0", | ||
"jest": "26.6.3", | ||
"jquery": "3.5.1", | ||
"mini-css-extract-plugin": "0.12.0", | ||
"jest": "27.5.1", | ||
"jest-environment-jsdom": "27.5.1", | ||
"jest-environment-node": "27.5.1", | ||
"jquery": "3.6.0", | ||
"mini-css-extract-plugin": "1.6.2", | ||
"node-sass": "6.0.1", | ||
"nodemon": "2.0.15", | ||
"npm-check-updates": "12.5.3", | ||
"npm-check-updates": "12.5.4", | ||
"nprogress": "0.2.0", | ||
"optimize-css-assets-webpack-plugin": "6.0.1", | ||
"pubsub-js": "1.9.1", | ||
"pubsub-js": "1.9.4", | ||
"react": "16.13.1", | ||
@@ -87,10 +91,9 @@ "react-bootstrap": "1.3.0", | ||
"react-flip-move": "3.0.4", | ||
"react-infinite-scroll": "git+https://git@github.com/kelp404/react-infinite-scroll.git#843a0d0380bf5c84ea337a03eed207cc2b527204", | ||
"react-test-renderer": "16.13.1", | ||
"redis": "3.1.2", | ||
"redis": "4.0.4", | ||
"sass-loader": "10.2.1", | ||
"webpack": "4.44.2", | ||
"webpack": "4.46.0", | ||
"webpack-cli": "3.3.12", | ||
"webpack-dev-server": "3.11.0" | ||
"webpack-dev-server": "3.11.3" | ||
} | ||
} |
# bull-admin-panel | ||
[![npm version](https://badge.fury.io/js/bull-admin-panel.svg)](https://www.npmjs.com/package/bull-admin-panel) | ||
[![Coverage Status](https://coveralls.io/repos/github/kelp404/bull-admin-panel/badge.svg?branch=master)](https://coveralls.io/github/kelp404/bull-admin-panel?branch=master) | ||
[![Actions Status](https://github.com/kelp404/bull-admin-panel/workflows/test%20and%20upload%20coveralls/badge.svg)](https://github.com/kelp404/bull-admin-panel/actions) | ||
[![Actions Status](https://github.com/kelp404/bull-admin-panel/workflows/test/badge.svg)](https://github.com/kelp404/bull-admin-panel/actions) | ||
@@ -114,75 +113,1 @@ An admin panel of [Bull](https://github.com/OptimalBits/bull) based on WebSocket. | ||
`npm start` | ||
## [Git Commit Guidelines](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines) | ||
We have very precise rules over how our git commit messages can be formatted. This leads to **more | ||
readable messages** that are easy to follow when looking through the **project history**. But also, | ||
we use the git commit messages to **generate the AngularJS change log**. | ||
The commit message formatting can be added using a typical git workflow or through the use of a CLI | ||
wizard ([Commitizen](https://github.com/commitizen/cz-cli)). To use the wizard, run `yarn run commit` | ||
in your terminal after staging your changes in git. | ||
### Commit Message Format | ||
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special | ||
format that includes a **type**, a **scope** and a **subject**: | ||
``` | ||
<type>(<scope>): <subject> | ||
<BLANK LINE> | ||
<body> | ||
<BLANK LINE> | ||
<footer> | ||
``` | ||
The **header** is mandatory and the **scope** of the header is optional. | ||
Any line of the commit message cannot be longer 100 characters! This allows the message to be easier | ||
to read on GitHub as well as in various git tools. | ||
### Revert | ||
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header | ||
of the reverted commit. | ||
In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit | ||
being reverted. | ||
### Type | ||
Must be one of the following: | ||
* **feat**: A new feature | ||
* **fix**: A bug fix | ||
* **docs**: Documentation only changes | ||
* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing | ||
semi-colons, etc) | ||
* **refactor**: A code change that neither fixes a bug nor adds a feature | ||
* **perf**: A code change that improves performance | ||
* **test**: Adding missing or correcting existing tests | ||
* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation | ||
generation | ||
### Scope | ||
The scope could be anything specifying place of the commit change. For example `/`, | ||
`/jobs`, etc... | ||
You can use `*` when the change affects more than a single scope. | ||
### Subject | ||
The subject contains succinct description of the change: | ||
* use the imperative, present tense: "change" not "changed" nor "changes" | ||
* don't capitalize first letter | ||
* no dot (.) at the end | ||
### Body | ||
Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes". | ||
The body should include the motivation for the change and contrast this with previous behavior. | ||
### Footer | ||
The footer should contain any information about **Breaking Changes** and is also the place to | ||
[reference GitHub issues that this commit closes][closing-issues]. | ||
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. | ||
The rest of the commit message is then used for this. | ||
A detailed explanation can be found in this [document][commit-message-format]. |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
2956
1198461
48
51
113
+ Addedbull@4.8.1(transitive)
+ Addedws@8.5.0(transitive)
- Removedbull@4.7.0(transitive)
- Removedws@7.5.7(transitive)
Updatedbull@4.8.1
Updatedws@8.5.0