Skip to content

Commit

Permalink
fix miscelaneous bugs found during integration
Browse files Browse the repository at this point in the history
bonus: port some features added to Arranger 2
- make date range agg use today as max
- improve date range agg UI features
- improve exporter customisation logic
- adds date handling in TSV exports
- adds array fields functionality
  • Loading branch information
justincorrigible committed Oct 31, 2022
1 parent 00334db commit c016126
Show file tree
Hide file tree
Showing 39 changed files with 982 additions and 259 deletions.
105 changes: 53 additions & 52 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,55 @@
module.exports = {
env: {
es6: true,
node: true,
},
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:import/recommended',
'plugin:import/typescript',
'prettier',
],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
},
plugins: ['@typescript-eslint', 'prettier'],
root: true,
rules: {
'@typescript-eslint/no-empty-interface': [
'warn',
{
allowSingleExtends: false,
},
],
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-var-requires': 'off',
'import/first': ['warn', 'absolute-first'],
'import/order': [
'warn',
{
groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
'newlines-between': 'always',
warnOnUnassignedImports: true,
},
],
'import/newline-after-import': 'warn',
'prettier/prettier': [
'error',
{
printWidth: 100,
semi: true,
singleQuote: true,
trailingComma: 'all',
},
],
},
settings: {
'import/resolver': {
'babel-module': { allowExistingDirectories: true },
},
'import/internal-regex': '^@/',
},
env: {
es6: true,
node: true,
},
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:import/recommended',
'plugin:import/typescript',
'prettier',
],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
},
plugins: ['@typescript-eslint', 'prettier'],
root: true,
rules: {
'@typescript-eslint/no-empty-interface': [
'warn',
{
allowSingleExtends: false,
},
],
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-var-requires': 'off',
'import/first': ['warn', 'absolute-first'],
'import/order': [
'warn',
{
groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
'newlines-between': 'always',
warnOnUnassignedImports: true,
},
],
'import/newline-after-import': 'warn',
'prettier/prettier': [
'error',
{
printWidth: 100,
trailingComma: 'all',
semi: true,
singleQuote: true,
useTabs: true,
},
],
},
settings: {
'import/resolver': {
'babel-module': { allowExistingDirectories: true },
},
'import/internal-regex': '^@/',
},
};
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ lerna-debug.log
**/.DS_Store
**/*.env*
!**/.env.schema

.vscode/*log
7 changes: 7 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ pipeline {
}

stage('Build images') {
when {
anyOf {
branch 'develop'
branch 'main'
branch 'test'
}
}
steps {
container('docker') {
sh "DOCKER_BUILDKIT=1 \
Expand Down
1 change: 1 addition & 0 deletions modules/components/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
'@emotion/pkg-renaming': 'error',
'@emotion/styled-import': 'error',
'jsx-a11y/href-no-hash': 'off',
'react/no-unknown-property': ['error', { ignore: ['css'] }],
'react/prop-types': 'off',
},
settings: {
Expand Down
35 changes: 28 additions & 7 deletions modules/components/package-lock.json

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

4 changes: 3 additions & 1 deletion modules/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"storybook-router": "^0.3.3",
"ts-jest": "^29.0.3",
"ttypescript": "^1.5.13",
"type-fest": "^3.0.0",
"typescript-transform-paths": "^3.3.1"
},
"peerDependencies": {
Expand Down Expand Up @@ -135,9 +136,10 @@
},
"prettier": {
"printWidth": 100,
"trailingComma": "all",
"semi": true,
"singleQuote": true,
"trailingComma": "all"
"useTabs": true
},
"husky": {
"hooks": {
Expand Down
Loading

0 comments on commit c016126

Please sign in to comment.