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

Promote Dev #798

Merged
merged 8 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"extensions": [
"ms-python.python",
"charliermarsh.ruff",
"ms-python.black-formatter",
"ms-azuretools.vscode-docker",
"streetsidesoftware.code-spell-checker"
]
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const preview = {
},
},

tags: ['autodocs']
tags: ['autodocs', 'autodocs']
};

export default preview;
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"DERRID",
"dischargers",
"dotenv",
"dotenvx",
"dowork",
"dtype",
"DUCHESNE",
Expand Down Expand Up @@ -108,6 +109,7 @@
"PIUTE",
"plss",
"POSTTONET",
"prebuild",
"programid",
"protobuf",
"PTSDF",
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## [2.0.20-1](https://github.com/agrc/deq-enviro/compare/v2.0.20-0...v2.0.20-1) (2025-02-11)


### Bug Fixes

* update content-security-policy to allow for base64 images ([d29126b](https://github.com/agrc/deq-enviro/commit/d29126bb502d406d39ccd0330929539e4c67bc90))

## [2.0.20-0](https://github.com/agrc/deq-enviro/compare/v2.0.19...v2.0.20-0) (2025-02-11)


### Bug Fixes

* update remote config defaults on every build ([1da6cfb](https://github.com/agrc/deq-enviro/commit/1da6cfb37e03d2dc4e547fef2b416b4d560c70ed))


### Dependencies

* bump node dependencies 🌲 ([8e2a717](https://github.com/agrc/deq-enviro/commit/8e2a71769ceb21de89ffa10497a8b932eb1447c2))
* bump python dependencies ([1581821](https://github.com/agrc/deq-enviro/commit/1581821d6e807df8fcbbeb7f78741b6fc9df4f86))

## [2.0.19](https://github.com/agrc/deq-enviro/compare/v2.0.18...v2.0.19) (2025-01-15)


Expand Down
10 changes: 2 additions & 8 deletions build-scripts/updateRemoteConfigDefaults.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import * as dotenv from 'dotenv';
import '@dotenvx/dotenvx/config';
import admin from 'firebase-admin';
import fs from 'fs';
import auth from '../functions/common/auth.js';

dotenv.config();

admin.initializeApp({
apiKey: process.env.VITE_FIREBASE_API_KEY,
appId: process.env.VITE_FIREBASE_APP_ID,
projectId: process.env.VITE_FIREBASE_PROJECT_ID,
});
admin.initializeApp(JSON.parse(process.env.VITE_FIREBASE_CONFIG));

async function main() {
await auth(['https://www.googleapis.com/auth/firebase.remoteconfig']);
Expand Down
3 changes: 1 addition & 2 deletions cloudrun/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
install_requires=[
"cloudevents==1.*",
"google-cloud-logging==3.*",
"google-cloud-storage==2.*",
"google-cloud-storage==3.*",
"google-cloud-firestore==2.*",
"google-events==0.*",
"flask-cors==5.*",
Expand All @@ -55,7 +55,6 @@
],
extras_require={
"dev": [
"black>=23,<25",
"pytest-cov>=4,<7",
"pytest-instafail==0.5.*",
"pytest-mock==3.*",
Expand Down
2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"headers": [
{
"key": "Content-Security-Policy",
"value": "default-src 'none'; font-src *; worker-src blob:; script-src 'self' 'unsafe-eval' https://*.google.com https://www.googletagmanager.com https://*.qualtrics.com 'unsafe-inline' https://js.arcgis.com; connect-src 'self' https://*.cloudfunctions.net https://*.utah.gov https://*.googleapis.com https://*.arcgis.com https://www.google-analytics.com https://ut-dts-agrc-web-api-dev.web.app https://*.a.run.app https://*.qualtrics.com; img-src 'self' blob: data: https://www.gravatar.com https://*.wp.com https://*.utah.gov https://*.arcgis.com https://www.googletagmanager.com https://*.googleapis.com https://*.qualtrics.com; style-src 'self' 'unsafe-inline' https://*.googleapis.com; base-uri 'self'; form-action 'self' https://*.qualtrics.com; frame-src *; object-src 'self' https://*.googleapis.com"
"value": "default-src 'none'; font-src *; worker-src blob:; script-src 'self' 'unsafe-eval' https://*.google.com https://www.googletagmanager.com https://*.qualtrics.com 'unsafe-inline' https://js.arcgis.com; connect-src 'self' data: https://*.cloudfunctions.net https://*.utah.gov https://*.googleapis.com https://*.arcgis.com https://www.google-analytics.com https://ut-dts-agrc-web-api-dev.web.app https://*.a.run.app https://*.qualtrics.com; img-src 'self' blob: data: https://www.gravatar.com https://*.wp.com https://*.utah.gov https://*.arcgis.com https://www.googletagmanager.com https://*.googleapis.com https://*.qualtrics.com; style-src 'self' 'unsafe-inline' https://*.googleapis.com; base-uri 'self'; form-action 'self' https://*.qualtrics.com; frame-src *; object-src 'self' https://*.googleapis.com"
}
]
},
Expand Down
24 changes: 12 additions & 12 deletions functions/package-lock.json

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

6 changes: 3 additions & 3 deletions functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"dependencies": {
"@google-cloud/secret-manager": "^5.6.0",
"firebase-admin": "^13.0.2",
"firebase-functions": "^6.2.0",
"firebase-admin": "^13.1.0",
"firebase-functions": "^6.3.1",
"googleapis": "^144.0.0",
"got": "^14.4.5",
"got": "^14.4.6",
"knex": "^3.1.0",
"pg": "^8.13.1",
"yup": "^1.6.1"
Expand Down
Loading
Loading