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.

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

Dev -> Main #202

Merged
merged 52 commits into from Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
e2021f3
Add last cached value to data source query
kalenluciano Jan 17, 2024
ca1ec22
Merge remote-tracking branch 'origin/dev' into feature/add-last-cache…
joshuagraber Jan 18, 2024
bb45f4a
test: update snapshots
joshuagraber Jan 19, 2024
d1f6f13
Merge branch 'dev' into feature/add-last-cached-value
joshuagraber Jan 19, 2024
e98f0df
fix(assets): favicon not displaying
joshuagraber Jan 20, 2024
402188b
feat(pages): update DataSourceStaticView
joshuagraber Jan 20, 2024
471c89c
test(pages): update tests and snapshots
joshuagraber Jan 20, 2024
e4afea4
chore(lint): reformat files with lint errors using black
joshuagraber Jan 20, 2024
7f680cd
chore(lint): attempt re-formatting again with actual VS 'black' exten…
joshuagraber Jan 20, 2024
59e018e
chore: update .gitignore
joshuagraber Jan 21, 2024
547ed5b
refactor(util): update formatDate to return undefined for invalid dat…
joshuagraber Jan 22, 2024
a8f1567
test(util): update test for formatDate
joshuagraber Jan 22, 2024
480e6ea
get_data_source_by_id fix
Jan 23, 2024
53a5786
Merge pull request #194 from Police-Data-Accessibility-Project/automa…
mbodeantor Jan 23, 2024
5556620
chore(deps): add eslint-config from design-system
joshuagraber Jan 25, 2024
1aebc45
test(scripts): update test scripts
joshuagraber Jan 25, 2024
f6c8107
docs(readme): document lint/test script updates
joshuagraber Jan 25, 2024
61d58ce
refactor: update miscellaneous files with linting errors
joshuagraber Jan 25, 2024
386d09b
test(snapshots): update outdated snapshots
joshuagraber Jan 25, 2024
de16e6d
ci(client): add client scripts to pull workflow
joshuagraber Jan 25, 2024
d7161ca
chore(config): remove stray eslint config from package.json
joshuagraber Jan 25, 2024
ebac422
ci: move working-directory to top level defaults
joshuagraber Jan 25, 2024
823a6cf
ci: add cache-dependency-path to setup-node action
joshuagraber Jan 25, 2024
78e38a1
ci: add cache-dependency-path to all steps
joshuagraber Jan 25, 2024
6c3eb1b
chore(linting): remove extraneous rules in linting config
joshuagraber Jan 25, 2024
4ec6ec2
chore(scripts): update ci script to use proper flag
joshuagraber Jan 25, 2024
03f8129
Revert "test(snapshots): update outdated snapshots"
joshuagraber Jan 25, 2024
500eca0
test: update snapshots again
joshuagraber Jan 25, 2024
e1c7b73
ci: use exact node version used locally
joshuagraber Jan 25, 2024
a006bb5
Merge branch 'dev' into feature/add-last-cached-value
mbodeantor Jan 25, 2024
22acfef
Merge pull request #186 from Police-Data-Accessibility-Project/featur…
mbodeantor Jan 25, 2024
83995d0
Revert "ci: use exact node version used locally"
joshuagraber Jan 26, 2024
5f5cf91
chore(deps): re-install deps with node v20
joshuagraber Jan 26, 2024
c0f7fc4
ci: use node v20
joshuagraber Jan 26, 2024
dfd6ac3
Merge remote-tracking branch 'origin/dev' into feature/client-linting…
joshuagraber Jan 26, 2024
f2729ea
test: update snapshots
joshuagraber Jan 26, 2024
484083d
ci: add time zone setter to test script
joshuagraber Jan 26, 2024
29d7f65
Merge pull request #195 from Police-Data-Accessibility-Project/featur…
mbodeantor Jan 26, 2024
3b72493
feature: add tertiary button from design-system
joshuagraber Jan 30, 2024
f1c74f0
test(pages): update DataSourceStaticView test
joshuagraber Jan 30, 2024
4aedc8d
chore(deps): bump design-system -> 2.2.0
joshuagraber Jan 30, 2024
bae44f5
fix: miscellaneous styling issues
joshuagraber Jan 30, 2024
0f2430b
test: update snapshots
joshuagraber Jan 30, 2024
2ee5a64
chore(deps): bump design-system -> 2.3.0
joshuagraber Jan 30, 2024
3336bef
chore(cleanup): remove logs and miscellaneous updates
joshuagraber Jan 30, 2024
9b149f7
test: update snapshots
joshuagraber Jan 30, 2024
5d9307f
Merge pull request #198 from Police-Data-Accessibility-Project/featur…
mbodeantor Jan 31, 2024
1af1f7b
remove agencies join from archives endpoint, change url_status when u…
Jan 31, 2024
b2d2ad0
update test columns
Jan 31, 2024
f3bd0fc
Merge pull request #200 from Police-Data-Accessibility-Project/archiv…
mbodeantor Feb 2, 2024
6ab2c41
standardized error codes
Feb 2, 2024
7cc573f
Merge pull request #201 from Police-Data-Accessibility-Project/more_e…
mbodeantor Feb 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
90 changes: 87 additions & 3 deletions .github/workflows/pull.yaml
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:

jobs:
setup:
setup_api:
name: Setup API
runs-on: ubuntu-latest
steps:
- name: Cancel previous
Expand All @@ -21,13 +22,15 @@ jobs:
python -m pip install --upgrade pip
pip install -r requirements.txt

lint:
lint_api:
name: Lint API
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: psf/black@stable

test:
test_api:
name: Test API
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -44,3 +47,84 @@ jobs:
run: |
pip install pytest pytest-cov
pytest app_test.py --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html

setup_client:
defaults:
run:
working-directory: client
name: Setup client
runs-on: ubuntu-latest
steps:
- name: Cancel previous
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: '18.x'
cache: 'npm'
cache-dependency-path: 'client/package-lock.json'
- name: Install deps
run: npm ci


lint_client:
defaults:
run:
working-directory: client
name: Lint client
needs: setup_client
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: '18.x'
cache: 'npm'
cache-dependency-path: 'client/package-lock.json'
- run: npm ci
- name: Lint JS and Vue
run: npm run lint

test_client:
defaults:
run:
working-directory: client
name: Test client
needs: setup_client
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: '18.x'
cache: 'npm'
cache-dependency-path: 'client/package-lock.json'
- uses: szenius/set-timezone@v1.2
with:
timezoneLinux: "America/New_York"
- run: npm ci
- name: Run tests
run: npm run test:ci

build_client:
defaults:
run:
working-directory: client
name: Build client
needs: setup_client
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: '18.x'
cache: 'npm'
cache-dependency-path: 'client/package-lock.json'
- run: npm ci
- name: Build app
run: npm run build
12 changes: 11 additions & 1 deletion README.md
Expand Up @@ -137,11 +137,21 @@ npm run lint
npm run lint:fix
```

### Runs tests quietly
### Runs tests with debug output
```
npm run test
```

### Runs tests quietly for CI
```
npm run test:ci
```

### Runs tests only on changed files
```
npm run test:changed
```

### Runs tests and outputs coverage reports
```
npm run coverage
Expand Down
2 changes: 0 additions & 2 deletions app_test_data.py
Expand Up @@ -385,13 +385,11 @@
"https://informationportal.igchicago.org/911-calls-for-cpd-service/",
"Bi-weekly",
"NULL",
"Chicago Police Department - IL",
),
(
"rec04V1oMa6Dxt0Sl",
"https://www.columbus.gov/police-annualreports/",
"Annually",
datetime.date(2023, 9, 16),
"Columbus Division of Police - OH",
),
]
39 changes: 5 additions & 34 deletions client/.eslintrc.json
@@ -1,38 +1,9 @@
{
"root": true,
"extends": [
"eslint:recommended",
"plugin:vue/vue3-essential",
"plugin:vue/vue3-recommended",
"plugin:vue/strongly-recommended",
"@vue/eslint-config-prettier"
"@pdap-design-system/eslint-config"
],
"plugins": ["prettier"],
"rules": {
"vue/require-default-prop": "off",
// Switch base eslint indent rule off
"indent": "off",
"vue/html-self-closing": [
"error",
{
"html": {
"void": "always",
"normal": "always",
"component": "always"
},
"svg": "always",
"math": "always"
}
],
"prettier/prettier": [
// Use prettier indent rule instead
"warn",
{
"indent": ["warn", "tab", { "SwitchCase": 2 }],
"tabWidth": 2,
"useTabs": true
}
],
"vue/no-multiple-template-root": "off"
}
}
"plugins": [
"prettier"
]
}
2 changes: 1 addition & 1 deletion client/.gitignore
@@ -1,6 +1,6 @@
.DS_Store
node_modules
/dist
dist
coverage

# local env files
Expand Down
1 change: 1 addition & 0 deletions client/index.html
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" type="image/x-icon" href="/assets/favicon.png">
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
Expand Down