diff --git a/.gitignore b/.gitignore index 4d0e770f..6cfabb06 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ instance_config.json ### Web Server Cache ### cache_dir -### Unit Test Files### +### Unit Test Files ### results/ test/integration_tests/dev/results test/integration_tests/prod/results diff --git a/Makefile b/Makefile index 14039b4b..1797b117 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ COMPOSE_COMMAND := DOCKER_HOST=$(DOCKER_HOST) docker compose -p $(PROJECT_NAME) help: # Show help for each of the Makefile recipes. @grep -E '^[a-zA-Z0-9 -_]+:.*#' Makefile | sort | while read -r l; do printf "\033[1;32m$$(echo $$l | cut -f 1 -d':')\033[00m:$$(echo $$l | cut -f 2- -d'#')\n"; done -configure: +configure: scp ./prod/nginx/nginx_vhost_default_location $(WEB_REMOTE):${NGINX_VHOST} lint-python: # Lint only the python files that have changed on this branch, with respect to master. (You can run `make lint-python COMMIT=` e.g. `make lint-python COMMIT=HEAD~1` to lint the files that have changed on the last commit.) @@ -30,14 +30,14 @@ lint-js: # Lint only the js and jsx files that have changed on this branch, with COMMIT=$(COMMIT) ./scripts/lint_js.sh lint: lint-python lint-js # Lint only the python, js and jsx files that have changed on this branch, with respect to master. (You can run `make lint COMMIT=` e.g. `make lint COMMIT=HEAD~1` to lint the files that have changed on the last commit.) - + black: # Run black on all python files that have changed on this branch, with respect to master. (You can run `make black COMMIT=` e.g. `make black COMMIT=origin/master` to lint the files that have changed with respect to origin/master.) COMMIT=$(COMMIT) ./scripts/format_python.sh build: # Build docker images (for development and production) using docker compose. docker compose --env-file $(ENV_FILE) -f docker-compose.build.yaml build $(SERVICE) -convert: # Use the "docker compose config" command to render the compose file. (Useful to see the impact of environment variables.) +convert: # Use the "docker compose config" command to render the compose file. (Useful to see the impact of environment variables.) $(COMPOSE_COMMAND) config create-db-setup-script: # Create the db setup script. diff --git a/README.md b/README.md index f2133498..ed00a442 100644 --- a/README.md +++ b/README.md @@ -90,11 +90,11 @@ For many Harmony projects, the free tier of Mapbox will be sufficient. Refer to When you run a script or the web server, select a configuration by setting the `ZEN_ENV` environmental variable. This environmental variable maps directly to folder names in `config/`, and will cause the `config` module to export the contents of that particular configuration. - Say there is configuration directory named `usa`. We can specify that configuration with the following: +Say there is configuration directory named `usa`. We can specify that configuration with the following: - ```bash - export ZEN_ENV='usa' - ``` +```bash +export ZEN_ENV='usa' +``` ## Local development setup diff --git a/docker/pipeline/Dockerfile b/docker/pipeline/Dockerfile index c5f003b1..0f833a56 100644 --- a/docker/pipeline/Dockerfile +++ b/docker/pipeline/Dockerfile @@ -51,12 +51,12 @@ RUN apt-get update \ build-essential \ # wget: may be used in a pipeline step to download files. wget \ - # cmake: is needed for installing proj. + # cmake: is needed for installing proj. cmake \ # curl: may be used in a pipeline step. curl \ # sqlite: is needed for building proj? - sqlite3 \ + sqlite3 \ # libsqlite3-dev: required for building proj. libsqlite3-dev \ # libtiff-dev: is needed for building proj. @@ -174,4 +174,4 @@ COPY scripts ./scripts ENV ZEN_HOME /zenysis ENV R77_SRC_ROOT /zenysis ENV PYTHONPATH /zenysis -ENV USER zenysis \ No newline at end of file +ENV USER zenysis diff --git a/druid_setup/single/docker-compose.yml b/druid_setup/single/docker-compose.yml index 26699b0e..744a9f5b 100644 --- a/druid_setup/single/docker-compose.yml +++ b/druid_setup/single/docker-compose.yml @@ -50,7 +50,7 @@ services: image: postgres:latest restart: always ports: - # expose postgres port to host on a non standard port, to avoid + # expose postgres port to host on a non standard port, to avoid # possible conflicts with other postgres instances. - "5431:5432" volumes: diff --git a/models/python/dashboard/scripts/create_new_schema.sh b/models/python/dashboard/scripts/create_new_schema.sh index d3f46edf..4836b10b 100755 --- a/models/python/dashboard/scripts/create_new_schema.sh +++ b/models/python/dashboard/scripts/create_new_schema.sh @@ -147,7 +147,7 @@ TEST_UPGRADE_DOWNGRADE=" def test_upgrade_downgrade_${NEW_VERSION_UNDERSCORE} self.assertEqual(my_dashboard_spec_dict, downgraded_spec_dict, diff)" echo -e "\n${TEST_UPGRADE_DOWNGRADE}" >> models/python/dashboard/tests/test_schema_upgrade_downgrade.py - + echo '(9/10) Adding all new files to git' git add \ "${ZEN_SRC_ROOT}/models/python/dashboard/${SCHEMA_DIR_NAME}" \ diff --git a/prod/cron/pipeline.sh b/prod/cron/pipeline.sh index 676f096a..fff226c4 100755 --- a/prod/cron/pipeline.sh +++ b/prod/cron/pipeline.sh @@ -5,7 +5,7 @@ # # IMPORTANT NOTE: Ideally the pipeline should be run by some orchestration # /automation framework. -# +# # Pre-requisites: # - The administrator user is authenticated with the container registry. # - The Harmony repository is cloned (or the required files are copied) to @@ -32,4 +32,4 @@ COMMAND="./pipeline/$ZEN_ENV/process/process_all" DOCKER_HOST= docker compose -- COMMAND="./pipeline/$ZEN_ENV/index/index_all" DOCKER_HOST= docker compose --project-name harmony-etl-pipeline-$ZEN_ENV-index --env-file /home/ubuntu/Harmony/.env.harmony.pipeline -f /home/ubuntu/Harmony/docker-compose.pipeline.yaml up --exit-code-from etl-pipeline # Run validate -COMMAND="./pipeline/$ZEN_ENV/validate/validate_all" DOCKER_HOST= docker compose --project-name harmony-etl-pipeline-$ZEN_ENV-validate --env-file /home/ubuntu/Harmony/.env.harmony.pipeline -f /home/ubuntu/Harmony/docker-compose.pipeline.yaml up --exit-code-from etl-pipeline \ No newline at end of file +COMMAND="./pipeline/$ZEN_ENV/validate/validate_all" DOCKER_HOST= docker compose --project-name harmony-etl-pipeline-$ZEN_ENV-validate --env-file /home/ubuntu/Harmony/.env.harmony.pipeline -f /home/ubuntu/Harmony/docker-compose.pipeline.yaml up --exit-code-from etl-pipeline diff --git a/requirements.txt b/requirements.txt index a16c07d9..e8c1513e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,7 +53,7 @@ gspread>=5.4.0 # first install `grpcio==1.26.0` and then install the google-cloud-logging. google-cloud-logging==1.11.0 ; platform_python_implementation != 'PyPy' -# With PyPy shapely ends up pulling in numpy 1.21.0, for when we get to the pipeline step, so not sure why we +# With PyPy shapely ends up pulling in numpy 1.21.0, for when we get to the pipeline step, so not sure why we # don't use the same version for both. # On M1, with PyPy running native, 1.21.0 can't install. # I change to `numpy==1.21.0` (not exlusions) and ran: @@ -87,4 +87,4 @@ openpyxl>=3.0.9 ijson-bigint==3.2.0.post1 types-jsonschema==4.17.0.8 -future==0.18.3 \ No newline at end of file +future==0.18.3 diff --git a/web/client/components/AdvancedQueryApp/LiveResultsView/QueryResultActionButtons/ShareQueryModal/DownloadableImageElement.jsx b/web/client/components/AdvancedQueryApp/LiveResultsView/QueryResultActionButtons/ShareQueryModal/DownloadableImageElement.jsx index f6e9e383..0b44cb8a 100644 --- a/web/client/components/AdvancedQueryApp/LiveResultsView/QueryResultActionButtons/ShareQueryModal/DownloadableImageElement.jsx +++ b/web/client/components/AdvancedQueryApp/LiveResultsView/QueryResultActionButtons/ShareQueryModal/DownloadableImageElement.jsx @@ -55,7 +55,7 @@ export default function DownloadableImageElement({ return ( - {/* + {/* NOTE: Hidden element that updates DownloadableElement Elt via onRender The Element rendered under scaled div bellow makes distorted images due to parent divs' scaling. */} diff --git a/web/client/components/AdvancedQueryApp/QueryFormPanel/index.jsx b/web/client/components/AdvancedQueryApp/QueryFormPanel/index.jsx index bd4028cd..6d3f9ba8 100644 --- a/web/client/components/AdvancedQueryApp/QueryFormPanel/index.jsx +++ b/web/client/components/AdvancedQueryApp/QueryFormPanel/index.jsx @@ -150,8 +150,7 @@ export default class QueryFormPanel extends React.PureComponent { // clear existing data so it will show loading this.setState( { analyticalInsightsData: undefined, loadingAnalyticalInsights: false }, - () => { - }, + () => {}, ); } } diff --git a/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/FullscreenTile/index.jsx b/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/FullscreenTile/index.jsx index 5677b97a..e6ee554f 100644 --- a/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/FullscreenTile/index.jsx +++ b/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/FullscreenTile/index.jsx @@ -35,7 +35,7 @@ type Props = { >, /** - * extracted filters to apply to the display custom values in + * extracted filters to apply to the display custom values in * the text box */ extractedFilterItems: $ReadOnlyArray, diff --git a/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/EditItemView/PlaceholderEditView.jsx b/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/EditItemView/PlaceholderEditView.jsx index 08adfa2c..f86264ec 100644 --- a/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/EditItemView/PlaceholderEditView.jsx +++ b/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/EditItemView/PlaceholderEditView.jsx @@ -9,9 +9,9 @@ import type { TilePosition } from 'models/DashboardBuilderApp/DashboardItem/Dash type Props = { cellsPerRow: number, - + /** - * extracted filters to apply to the display custom values in + * extracted filters to apply to the display custom values in * the text box */ extractedFilterItems: $ReadOnlyArray, diff --git a/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/TileContent.jsx b/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/TileContent.jsx index 6cb57f95..ceb0c0e9 100644 --- a/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/TileContent.jsx +++ b/web/client/components/DashboardBuilderApp/DashboardContainer/DashboardGrid/TileContainer/TileContent.jsx @@ -34,7 +34,7 @@ type Props = { >, extractedFilterItems: $ReadOnlyArray, - + item: DashboardItemType, onHeightUpdate?: (rowCount: number) => void, onItemChange: DashboardItemType => void, diff --git a/web/client/components/DataCatalogApp/common/hooks/aqt/useDimensionList.js b/web/client/components/DataCatalogApp/common/hooks/aqt/useDimensionList.js index d6eff84d..8022d4e5 100644 --- a/web/client/components/DataCatalogApp/common/hooks/aqt/useDimensionList.js +++ b/web/client/components/DataCatalogApp/common/hooks/aqt/useDimensionList.js @@ -41,7 +41,7 @@ export default function useDimensionList( if (categories.length === 0) { return undefined; } - + // NOTE: Right now we are only expecting dimensions to live // within a single parent category. That category cannot be nested // further beneath another category. This assumption is valid right now, diff --git a/web/client/lib/I18N/index.jsx b/web/client/lib/I18N/index.jsx index 955a9df5..2ef9e7a9 100644 --- a/web/client/lib/I18N/index.jsx +++ b/web/client/lib/I18N/index.jsx @@ -203,7 +203,7 @@ function I18NRef(props: { * { count: 0 }, * ); */ -/* :: +/* :: declare function text( contents: string, idOrConfig?: string | TranslationConfig, diff --git a/web/public/fonts/bootstrap/glyphicons-halflings-regular.svg b/web/public/fonts/bootstrap/glyphicons-halflings-regular.svg index 94fb5490..187805af 100644 --- a/web/public/fonts/bootstrap/glyphicons-halflings-regular.svg +++ b/web/public/fonts/bootstrap/glyphicons-halflings-regular.svg @@ -285,4 +285,4 @@ - \ No newline at end of file + diff --git a/web/public/scss/components/advanced_query_app/_customizable_tag.scss b/web/public/scss/components/advanced_query_app/_customizable_tag.scss index c1be6f37..2543fece 100644 --- a/web/public/scss/components/advanced_query_app/_customizable_tag.scss +++ b/web/public/scss/components/advanced_query_app/_customizable_tag.scss @@ -21,7 +21,7 @@ } .aqt-customizable-filter-tag:hover { - /* background-image is used instead of background-color + /* background-image is used instead of background-color since we needed to override the blue gradient */ background-image: linear-gradient( to right, diff --git a/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/_dashboard_grid.scss b/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/_dashboard_grid.scss index e7ecbc5d..3ca26fc6 100644 --- a/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/_dashboard_grid.scss +++ b/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/_dashboard_grid.scss @@ -50,7 +50,7 @@ } } - &__tile-wrapper { + &__tile-wrapper { cursor: initial; // Using the react grid layout resize handles because rgl translates them diff --git a/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/tile_container/_text_tile.scss b/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/tile_container/_text_tile.scss index 475156a4..720de4e7 100644 --- a/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/tile_container/_text_tile.scss +++ b/web/public/scss/components/dashboard_builder/dashboard_container/dashboard_grid/tile_container/_text_tile.scss @@ -42,7 +42,7 @@ body.dashboard-modern-mode .gd-dashboard-text-tile { margin-left: 0; margin-right: 0; margin-top: 0; - + padding-bottom: calc-em($padding-bottom-px, $font-size-px); padding-left: calc-em($padding-left-px, $font-size-px); padding-right: calc-em($padding-right-px, $font-size-px); diff --git a/web/public/scss/components/query_results/settings_modal/_settings_modal.scss b/web/public/scss/components/query_results/settings_modal/_settings_modal.scss index 1f5b60b3..abfeb17e 100644 --- a/web/public/scss/components/query_results/settings_modal/_settings_modal.scss +++ b/web/public/scss/components/query_results/settings_modal/_settings_modal.scss @@ -15,7 +15,7 @@ white-space: normal; } - + &__control-label { color: $slate-hover; font-size: 14px; @@ -29,9 +29,9 @@ } .pivot-modal-over-popover-hack { - // EXTREME NOTE: popovers are at 9999 and modals are at 9999. - // Reducing the z index of the dropdown would put it behind the Settings - // Modal. This is needed because this is a modal on top of a dropdown on + // EXTREME NOTE: popovers are at 9999 and modals are at 9999. + // Reducing the z index of the dropdown would put it behind the Settings + // Modal. This is needed because this is a modal on top of a dropdown on // top of a modal. We need to use important to get the React-Modal // imported component to respect this z index. z-index: 100000 !important; diff --git a/web/server/routes/views/validate_data_catalog.py b/web/server/routes/views/validate_data_catalog.py index c5309c80..4470c2db 100644 --- a/web/server/routes/views/validate_data_catalog.py +++ b/web/server/routes/views/validate_data_catalog.py @@ -478,7 +478,7 @@ def validate_import_file( if status_code == 200: response[ 'validationMessage' - ] = '''The uploaded file passed validation. + ] = '''The uploaded file passed validation. No conflicts were found with the existing instance metadata. ''' if response['validationSummary']: @@ -487,7 +487,7 @@ def validate_import_file( elif status_code == 409: response[ 'validationMessage' - ] = '''The uploaded file failed validation. + ] = '''The uploaded file failed validation. Conflicts were found with the existing instance metadata. ''' diff --git a/web/server/templates/data_catalog_changes.html b/web/server/templates/data_catalog_changes.html index 3e4ea77d..1e4dd575 100644 --- a/web/server/templates/data_catalog_changes.html +++ b/web/server/templates/data_catalog_changes.html @@ -86,7 +86,7 @@
Deleted Records
{% endif %} - + {% if table_changes.modified_records| length > 0 %}
Modified Records
{% for row_grouping in table_changes.modified_records %} @@ -115,4 +115,4 @@
Modified Records
{% endfor %} - \ No newline at end of file + diff --git a/web/server/templates/emails/access_granted_email.html b/web/server/templates/emails/access_granted_email.html index 33382846..9a2223c7 100644 --- a/web/server/templates/emails/access_granted_email.html +++ b/web/server/templates/emails/access_granted_email.html @@ -6,7 +6,7 @@

{{email_header}}

- +

{{intro}}

@@ -16,7 +16,7 @@ @@ -34,7 +34,6 @@  

- {% endblock %} diff --git a/web/server/templates/emails/alert_notifications.html b/web/server/templates/emails/alert_notifications.html index f4444aba..92de065f 100644 --- a/web/server/templates/emails/alert_notifications.html +++ b/web/server/templates/emails/alert_notifications.html @@ -6,7 +6,6 @@

{{email_header}}

-

{{intro}}

@@ -16,7 +15,7 @@
- {{btn_text}}  
@@ -51,7 +50,6 @@

{{previous_alert_txt}}

- - + {% else %}
- {{btn_text}}  
@@ -74,7 +72,7 @@ {% endfor %}
diff --git a/web/server/templates/emails/invitation_email.html b/web/server/templates/emails/invitation_email.html index e9764030..3ed5ffcb 100644 --- a/web/server/templates/emails/invitation_email.html +++ b/web/server/templates/emails/invitation_email.html @@ -6,7 +6,6 @@

{{email_header}}

-

{{intro}}

@@ -16,7 +15,7 @@ diff --git a/web/server/templates/emails/new_dashboard_email.html b/web/server/templates/emails/new_dashboard_email.html index 315d99d8..7f929664 100644 --- a/web/server/templates/emails/new_dashboard_email.html +++ b/web/server/templates/emails/new_dashboard_email.html @@ -6,7 +6,6 @@

{{email_header}}

-

{{intro}}

@@ -16,7 +15,7 @@
- {{btn_text}}  
@@ -37,7 +36,6 @@  

- {% endblock email_body %} diff --git a/web/server/templates/emails/password_reset_email.html b/web/server/templates/emails/password_reset_email.html index f3f8c2a9..f9a5c51c 100644 --- a/web/server/templates/emails/password_reset_email.html +++ b/web/server/templates/emails/password_reset_email.html @@ -16,7 +16,7 @@
- {{btn_text}}  
@@ -36,6 +36,5 @@  

- {% endblock %} diff --git a/web/server/templates/emails/share_email.html b/web/server/templates/emails/share_email.html index ce3fb93e..d86ded18 100644 --- a/web/server/templates/emails/share_email.html +++ b/web/server/templates/emails/share_email.html @@ -24,7 +24,7 @@ @@ -40,7 +40,6 @@  

- {% endblock email_body %}
- {{btn_text}}  
- {{btn_text}}