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

FLEX-106: 🔀 Merge v2.20.1 into OPEN's customized version of SEED #21

Closed
wants to merge 206 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
444d5ea
Resolve conflicts on main merge to develop (#3724)
nllong Dec 19, 2022
af65d98
Merge branch 'main' into develop
nllong Dec 19, 2022
54e0ed8
Merge branch 'main' into develop
nllong Dec 19, 2022
af19805
Fix stacked property points (#3725)
haneslinger Dec 23, 2022
273f70c
Fix filter group with extra column work on revised programs (#3727)
haneslinger Dec 29, 2022
9904fa3
Allow users to create columns (#3730)
haneslinger Dec 30, 2022
047e25f
Fix filter on nulls and empty strings
haneslinger Jan 3, 2023
427d5d2
Address comments
haneslinger Jan 5, 2023
7552f53
Merge branch 'develop' into Fix-filter-on-nulls-and-empty-strings
axelstudios Jan 6, 2023
294626c
Merge pull request #3733 from SEED-platform/Fix-filter-on-nulls-and-e…
axelstudios Jan 6, 2023
fe1ee8d
Add the @has_perm_class permission to program metric api endpoints (#…
anchapin Jan 9, 2023
2490d96
fix meter service route for units in organization settings (#3738)
kflemin Jan 10, 2023
2822c4e
Fix custom report legend sort for chrome (#3740)
haneslinger Jan 11, 2023
92acc00
Sort column mappings in profile before export (#3748)
nllong Jan 13, 2023
d2e04cc
Update derived column migration to prevent conflicting column names a…
nllong Jan 17, 2023
b1e4ed4
Fixed issue with overlapping meter readings with new ESPM format (#3745)
anchapin Jan 18, 2023
257ecb6
Show portfolio manager errors (#3735)
haneslinger Jan 18, 2023
1694ed1
Allow users to hide property insight dataset (#3726)
haneslinger Jan 19, 2023
6abf1b1
remove references to prod server, as needed (#3781)
nllong Jan 21, 2023
3374066
Update help text (#3782)
nllong Jan 23, 2023
53756e5
Fix filtering on "" and !"" for all data types (#3765)
haneslinger Jan 25, 2023
1b04800
Fix bug where compliance calculations were not being cast to the righ…
nllong Jan 25, 2023
ff64271
Mark icebox-labeled issues as stale after 180 days (#3790)
nllong Jan 25, 2023
2f0ea1e
Bump future from 0.18.2 to 0.18.3 in /requirements (#3792)
dependabot[bot] Jan 25, 2023
7a52919
Prep release 2.17.1 (#3793)
nllong Jan 26, 2023
4937300
Fix 500 on data view evaluate when extra data is not present (#3803)
haneslinger Jan 27, 2023
466a832
Catch create column error correctly (#3791)
haneslinger Jan 30, 2023
cec8abb
Show all navs in org (#3811)
haneslinger Jan 30, 2023
22951d7
Remove add column in mapping page (#3813)
haneslinger Jan 31, 2023
4b6e170
Remove state population in create column (#3806)
haneslinger Feb 1, 2023
9ce4ba4
Allow switching cycles in inventory detail page (#3783)
haneslinger Feb 1, 2023
26aac34
Add more logging to the exception when a property state is missing an…
nllong Feb 1, 2023
b3f9e3c
Sort the dropdown of meter units (#3822)
nllong Feb 3, 2023
c1a8fc6
Update Django to 3.2.17 and bump SEED to 2.17.2 (#3824)
nllong Feb 4, 2023
c509588
Merge branch 'main' into develop
nllong Feb 4, 2023
88a7262
Change "Program Configuration" to "Program Setup" (#3832)
anchapin Feb 8, 2023
198624a
Get audit date and audit date type from buildingsync files (#3838)
haneslinger Feb 9, 2023
c8b79f6
Fix ESPM xml report import (#3856)
nllong Feb 14, 2023
29fd2d9
Bump django from 3.2.17 to 3.2.18 in /requirements (#3863)
dependabot[bot] Feb 16, 2023
3350248
Add CRUD to MeterReading (#3757)
nllong Feb 17, 2023
d1eafa2
Remove project and compliance models (#3743)
nllong Feb 17, 2023
46e062c
Fix importing of GeoJSON property footprints (#3848)
nllong Feb 17, 2023
62ce1e3
Update GeoJSON export format with GeometryCollections and remove crs …
nllong Feb 17, 2023
25106a4
Fix Nginx Security (#3866)
axelstudios Feb 17, 2023
99f0642
Fix clickable header (#3867)
axelstudios Feb 18, 2023
b367ed1
Add export to meters and meter readings (#3868)
nllong Feb 18, 2023
474ca22
Prep release 2.17.3 (#3870)
nllong Feb 19, 2023
eec4f90
Open New Tab on Insight Property Click (#3853)
haneslinger Feb 20, 2023
5ed9a5e
Update nginx security (#3873)
nllong Feb 21, 2023
15e29fe
Prep release for 2.17.4 (#3875)
nllong Feb 21, 2023
49b4832
Implement Salesforce integration (#3840)
kflemin Mar 19, 2023
10043f3
Add option to export meter data in GeoJSON (#3900)
nllong Mar 20, 2023
76585bd
Filter cycle specific labels on inventory list (#3858)
perryr16 Mar 20, 2023
d86095f
Update Evaluate Permissions (#3864)
haneslinger Mar 20, 2023
031df13
Fix casting of GHG metrics on Program Insight page (#3880)
haneslinger Mar 21, 2023
edc711a
select cycles instead of start/end dates (#3895)
kflemin Mar 21, 2023
40a685d
Specify cycle in eui analysis (#3820)
haneslinger Mar 22, 2023
573857e
Bump sentry-sdk from 1.7.2 to 1.14.0 in /requirements (#3907)
dependabot[bot] Mar 22, 2023
e07f088
Migrate BETTER API from V1 to V2 (#3881)
perryr16 Mar 22, 2023
99f7f66
Fix deletion of new custom report (#3924)
haneslinger Mar 22, 2023
3d9de45
Fix saving BETTER/Salesforce data for non-active orgs (#3925)
axelstudios Mar 22, 2023
98fc545
Fix GitHub Actions Masking (#3930)
axelstudios Mar 23, 2023
de565b2
adding >= and <= to display (#3928)
kflemin Mar 23, 2023
f503433
Fix custom reports download button (#3926)
haneslinger Mar 23, 2023
0275e20
Updated the meter import process to work with latest format from Ener…
anchapin Mar 24, 2023
4370f3b
Fix active nav for deep URLs (#3931)
axelstudios Mar 24, 2023
15aeed6
Fixed saving Program Setup data for non-active orgs (#3932)
axelstudios Mar 24, 2023
968aa97
Make test_compliance_metric_retrieve_endpoint deterministic (#3934)
haneslinger Mar 24, 2023
d1b7043
Fix custom report creation reload (#3936)
haneslinger Mar 25, 2023
8a88cb4
Add labels button on property insights page (#3860)
haneslinger Mar 25, 2023
5f30ebf
Create property timeline view (#3899)
perryr16 Mar 26, 2023
16ace48
Update copyright and copyright years (#3903)
nllong Mar 26, 2023
8dc72bf
Bump yargs-parser and protractor (#3939)
dependabot[bot] Mar 27, 2023
afc10ac
Modularized nginx, added gzip, added cache expiration (#3940)
axelstudios Mar 30, 2023
a1c8ea6
Fixed issue with filtering Property columns from Tax Lot tab of Inven…
anchapin Mar 30, 2023
251a8bb
Increase AnalysisMessage.user_message length (#3935)
perryr16 Mar 30, 2023
cd34cdf
Fixes Timeline Bugs (#3944)
perryr16 Mar 30, 2023
0cf7141
Fix editing a derived column without changing the name (#3949)
axelstudios Mar 31, 2023
61fbfaa
Fix Salesforce connection requests for non-superusers (#3947)
axelstudios Mar 31, 2023
c948690
Bump version and update changelog (#3950)
nllong Mar 31, 2023
a4eb220
Validate property state before creating BuildingSync document (#3953)
perryr16 Apr 4, 2023
876458f
add better error messaging that includes the property view ID (#3973)
kflemin Apr 12, 2023
60390f2
Fix Update-Salesforce requests (#3978)
axelstudios Apr 14, 2023
bda96a7
Add Salesforce fields to store data admin contact (#3985)
kflemin Apr 19, 2023
7a2384a
Codebuild & Elasticache Redis integration support (#3981)
dhaley Apr 20, 2023
fb63ff4
Add salesforce mappings sort and more error checking and messaging (#…
kflemin May 1, 2023
cc1f6db
Add zoom and panning to insights property page (#3879)
haneslinger May 2, 2023
e2fbff3
Enforce non-null `taxlot_id` attached to `TaxlotView`s (#4006)
axelstudios May 3, 2023
deb1a60
Remove program overview tabular data (#4007)
haneslinger May 3, 2023
7e2a33d
Save Insight property config locally (#3994)
haneslinger May 3, 2023
7015760
adding sf delete_label_on_sync setting (#4022)
kflemin May 5, 2023
bf0e4dc
replacing seed getting started guide for v2.18 (#4026)
kflemin May 5, 2023
82870f6
Add in the start and end cycle year to the title (#4014)
haneslinger May 6, 2023
de3b9d4
Bump version and update changelog (#4028)
axelstudios May 8, 2023
883bb4e
Bump django from 3.2.18 to 3.2.19 in /requirements (#4034)
dependabot[bot] May 10, 2023
d741d3c
Fix duplicate users per organization (#4033)
axelstudios May 10, 2023
3955adf
Move reports to insights page (#4031)
haneslinger May 10, 2023
1db2bd8
Require org id from endpoints with has_perm_class (#4027)
haneslinger May 11, 2023
13bea9c
remove sync salesforce button due to timeout (#4038)
kflemin May 12, 2023
bc98e49
Fix column list profile GET request syntax (#3988)
ebeers-png May 15, 2023
c90629f
Direct to property insight on click of program overview column (#4011)
haneslinger May 16, 2023
2163524
Improve inventory load times (#3990)
ebeers-png May 22, 2023
3fc3068
Updated installation steps (#3987)
anchapin May 22, 2023
4332646
Bump django-ses from 1.0.3 to 3.5.0 in /requirements (#4055)
dependabot[bot] May 23, 2023
5d140fc
Bump requests from 2.28.0 to 2.31.0 in /requirements (#4056)
dependabot[bot] May 23, 2023
1f888a1
Pin urllib3 (#4059)
axelstudios May 23, 2023
2701857
Prevent Automatically Serving Static `index.html` Files (#4057)
axelstudios May 27, 2023
e8b1fd4
Add Terms of Service (#4065)
kflemin May 31, 2023
a6d8989
Add ranked sorting to insight property page (#4030)
haneslinger Jun 5, 2023
d7e0ebb
INclude x and y in property insights tables (#4075)
haneslinger Jun 7, 2023
6bec609
Add percentages to program overview (#4077)
haneslinger Jun 7, 2023
ee01b9e
Fix User Creation Bugs (#4094)
axelstudios Jun 14, 2023
6c460ef
Fix categorical data on reports scatter plot (#4085)
haneslinger Jun 20, 2023
ef5476c
Add matching criteria to report export (#4072)
haneslinger Jun 21, 2023
db67361
remove OEP (#4109)
kflemin Jun 22, 2023
2f87846
Fix ESPM Source Types (#4096)
axelstudios Jun 23, 2023
7801f75
Fix serializer & Swagger description
axelstudios Jun 23, 2023
9699e9d
Fix Download URLs (#4066)
axelstudios Jun 29, 2023
41fa04b
Multiple cycle upload (#4073)
anchapin Jul 3, 2023
d02eda8
Add UBID relation to state (#4074)
perryr16 Jul 9, 2023
a1c6c97
Bump django from 3.2.19 to 3.2.20 in /requirements (#4128)
dependabot[bot] Jul 9, 2023
c99e4ca
Store additional geocoding results (#4020)
nllong Jul 9, 2023
5f7d20c
Bump version and update changelog
axelstudios Jul 9, 2023
e7a3563
Use iterator() when rehashing to save memory (#4139)
nllong Jul 12, 2023
0fc09f0
Merge sphinx spelling list with VSCode's Code Spelling version (#4149)
nllong Jul 18, 2023
358552e
Constrain uniqueness of column name and move geocoding column creatio…
nllong Jul 19, 2023
22e66f3
Update changelog
axelstudios Jul 20, 2023
9654932
Remove Deprecated APIs (#4049)
axelstudios Jul 26, 2023
fd60d6b
Lock `google-chrome` to v114 (#4165)
axelstudios Jul 26, 2023
2548b62
Bump word-wrap from 1.2.3 to 1.2.4 (#4154)
dependabot[bot] Jul 26, 2023
43f91d0
Fix a few code-formatting issues (#4172)
nllong Aug 1, 2023
6ecbed7
Add Open Street Map to CSP rules (#4169)
axelstudios Aug 1, 2023
083dad5
add error handling for sf edge case (#4159)
kflemin Aug 1, 2023
16fb2d0
Remove ID from inventory document display name (#4125)
perryr16 Aug 1, 2023
c706fef
Set the MEDIA_ROOT path back to original value during test (#4174)
nllong Aug 4, 2023
c4ff2bd
Optimize list analyses endpoint (#4206)
haneslinger Aug 29, 2023
680b6a2
Move analyses endpoint (#4210)
haneslinger Aug 30, 2023
7925a85
Add new `create_property` and `update_with_espm` endpoint (#4012)
kflemin Sep 6, 2023
f7f9c08
Fix display name (#4223)
haneslinger Sep 13, 2023
1e53c1a
Fix refresh_metadata (#4221)
haneslinger Sep 13, 2023
ed7081b
Bump uwsgi from 2.0.17.1 to 2.0.22 in /requirements (#4209)
dependabot[bot] Sep 15, 2023
33c0630
Remove Beta label from text of analysis button (#4225)
kflemin Sep 16, 2023
f8372e5
Fix Meters Without `source_id` (#4229)
axelstudios Sep 19, 2023
833be65
Fix performance for fetching analyses and force user email to lowerca…
ebeers-png Sep 19, 2023
84b06ad
EEEJ Analysis Functionality (#4208)
kflemin Sep 22, 2023
59e07d9
Show Analysis `debug_message` If Available (#4198)
axelstudios Sep 22, 2023
ea1dcea
Use display name in custom reports legend (#4060)
haneslinger Sep 22, 2023
1136d53
Allow analysis property view related properties to be null (#4227)
perryr16 Sep 22, 2023
12b624e
Add more API documentation for meter and meter readings (#4237)
nllong Sep 23, 2023
41cd02a
Update inventory selection to include current inventory type only (#3…
perryr16 Sep 24, 2023
735ede7
Update default meter range selection for BETTER analysis (#3819)
perryr16 Sep 24, 2023
16692c9
Delete BuildingFiles and Related Events on PropertyState delete (#4217)
perryr16 Sep 24, 2023
f5a9536
Fixed Issues with Scenario/Measure CRUD Operations (#4240)
axelstudios Sep 25, 2023
20d2ab0
Add a cycle indicator to the analysis modal and filter analyses for c…
perryr16 Sep 25, 2023
37d1da5
Disable ability to remove matching criteria fields once inventory is …
perryr16 Sep 25, 2023
5030df2
Add smaller EEEJ data files for testing (#4243)
kflemin Sep 27, 2023
757dede
Add Uniformat Table (#4238)
axelstudios Sep 27, 2023
6e04a7d
Fix Meter Overwrites (#4250)
axelstudios Sep 27, 2023
1122f60
Fix filter group dropdown bugs (#4249)
ebeers-png Sep 27, 2023
55031b6
Add Import Export to Audit Template (#4215)
perryr16 Sep 27, 2023
1059035
Fix EEEJ analysis errors when there are no lat/long or address (#4247)
kflemin Sep 28, 2023
67d16ff
Add envvar to specify loading test EEEJ dataset (#4254)
kflemin Sep 28, 2023
25ebebe
Default to excluding Address Line 1 as a matching criteria (#4256)
axelstudios Sep 30, 2023
561ccc3
Bump version (#4259)
nllong Sep 30, 2023
308adf3
Refactor map page for functionality and performance (#4260)
axelstudios Oct 1, 2023
eda7c0b
Release 2.20.0 (#4261)
nllong Oct 1, 2023
83fcc9f
Release 2.20.0 (#4262)
nllong Oct 1, 2023
820cf74
Fix the items in the 2.20.0 changelog (#4263)
nllong Oct 1, 2023
96aa964
ArcGIS CSP rule (#4265)
axelstudios Oct 2, 2023
2b28b07
Add documentation for cleaning up conflicting column names during mig…
nllong Oct 3, 2023
45da704
Update changelog for 2.20.0 (#4268)
nllong Oct 3, 2023
47656e5
Fix edge case for map label filtering (#4270)
axelstudios Oct 4, 2023
9504d49
Update changelog (#4272)
nllong Oct 5, 2023
8f74f6a
Merge branch 'main' into develop
nllong Oct 6, 2023
8c30d60
Update dependencies and fonts (#3941)
axelstudios Oct 6, 2023
d1df392
Release 2.20.0 (again) (#4273) (#4275)
nllong Oct 7, 2023
0c2b9de
Update Redis config to support encryption in transit with AWS ElastiC…
dhaley Oct 9, 2023
13e51a5
Fix mapping of BETTER's measures with empty strings to false (#4276)
nllong Oct 10, 2023
5018266
move cspell config to json and to the root (#4277)
nllong Oct 10, 2023
1945664
Decrease BETTER polling rate 5x, increase timeout 5x (#4280)
axelstudios Oct 12, 2023
5459216
Code Cleanup (#3539)
axelstudios Oct 13, 2023
a4f76a2
Enable natural sorting of Inventory List columns (#4281)
axelstudios Oct 18, 2023
04bd758
Handle ambiguous timestamps (#4287)
axelstudios Oct 19, 2023
962ac7c
Increase ESPM max timeout (#4296)
anchapin Oct 20, 2023
6035ee0
Fix cycle deletion modal (#4291)
axelstudios Oct 20, 2023
8b00f30
Handle nonexistent timestamps (#4294)
axelstudios Oct 20, 2023
683ed09
Feature to enable Redis for ElastiCache (#4288)
dhaley Oct 21, 2023
37f594c
Update list of BETTER's measures returned (#4300)
nllong Oct 24, 2023
3362c07
Add failing logic to AT export if AT credentials are invalid (#4282)
perryr16 Oct 25, 2023
1e6dcc7
Add analysis description translations (#4304)
kflemin Oct 25, 2023
13ec52f
Fix showing derived column values on the inventory list page (#4364)
axelstudios Oct 26, 2023
b0f04e7
Health check endpoint (#4371)
axelstudios Oct 27, 2023
0dbce5a
Update changelog
axelstudios Oct 27, 2023
15177e7
Updated developer resources documentation (#4373)
axelstudios Oct 31, 2023
ebd4aa8
Provide environment variable to disable wait-for-it condition in depl…
dhaley Nov 3, 2023
ea0a0e4
Add healthcheck to docker web container (#4374)
axelstudios Nov 3, 2023
2258583
Bump django from 3.2.20 to 3.2.23 in /requirements (#4379)
dependabot[bot] Nov 3, 2023
21d9c9f
Updated salesforce pg_restore docs (#4382)
axelstudios Nov 7, 2023
36af0ae
Update documentation for bulk celerybeat task changes
axelstudios Nov 7, 2023
7b79849
:bento: Add back OPEN customized email templates
Nov 8, 2023
34f2bf4
:bento: Add GRID-related images
Nov 9, 2023
8c592dc
:globe_with_meridians: Add back translations for OPEN-branded outboun…
Nov 9, 2023
596715f
:boom: Re-add OPEN-related outbound email templating code
Nov 9, 2023
4656629
:bug: Use correct signup URL for OPEN-customized emails
Nov 10, 2023
f9dfd64
Merge remote-tracking branch 'origin/opengb-develop' into FLEX-106_up…
Nov 10, 2023
f736a3d
:art: Code formatting
Nov 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
436 changes: 436 additions & 0 deletions .cspell.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ node_modules
vendors/node_modules
config/settings/local_untracked.py
config/settings/local_untracked.py.dist
oep
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{js,json}]
[*.{html,js,json}]
indent_size = 2

[*.py]
Expand Down
79 changes: 0 additions & 79 deletions .eslintrc

This file was deleted.

101 changes: 101 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
module.exports = {
extends: 'airbnb-base',
parserOptions: {
ecmaVersion: 2022
},
env: {
browser: true,
es6: true,
jasmine: true,
jquery: true
},
globals: {
_: true,
$filter: true,
$route: true,
angular: true,
angularDragula: true,
BE: true,
Chart: true,
dimple: true,
inject: true,
module: true,
moment: true,
ol: true,
pluralize: true,
protractor: true,
qq: true,
saveAs: true,
Spinner: true,
Terraformer: true,
UniqueBuildingIdentification: true
},
plugins: [
'angular',
'prefer-arrow',
'protractor'
],
rules: {
'arrow-parens': [
'error',
'always'
],
'comma-dangle': [
'error',
'never'
],
'consistent-return': 'warn',
'func-style': [
'error',
'declaration',
{
allowArrowFunctions: true
}
],
'linebreak-style': 'off',
'max-len': [
'warn',
200,
2,
{
ignoreUrls: true,
ignoreComments: true,
ignoreRegExpLiterals: true,
ignoreStrings: true,
ignoreTemplateLiterals: true
}
],
'no-plusplus': 'off',
'no-restricted-syntax': [
'error',
'ForInStatement',
'LabeledStatement',
'WithStatement'
],
'no-sequences': 'error',
'no-shadow': 'warn',
'object-shorthand': [
'error',
'properties'
],
'operator-linebreak': [
'error',
'after'
],
'prefer-arrow/prefer-arrow-functions': [
'error',
{
disallowPrototype: true,
singleReturnOnly: true,
classPropertiesAllowed: false
}
],
// FIX LATER
camelcase: 'off',
'default-case': 'off',
'no-console': 'off',
'no-param-reassign': 'off',
'no-underscore-dangle': 'off',
'prefer-destructuring': 'off'
}
};
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The contribution process for SEED is composed of three steps:
1. Send consent email

In order for us to distribute your code as part of SEED under the SEED
[license](https://github.com/SEED-platform/seed/blob/main/LICENSE), we’ll need
[license](https://github.com/SEED-platform/seed/blob/main/LICENSE.md), we’ll need
your consent. An email acknowledging understanding of these terms and agreeing to them is
all that will be asked of any contributor. Send an email to the SEED project manager (see
below for the address) including the following text and a list of co-contributors (if any):
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Bug report
about: Create a report to help improve SEED
title: ""
labels: "Bug"
assignees: ""
title: ''
labels: 'Bug'
assignees: ''
---

<!--Fill in the following information detailing the issue. Make sure to not disclose protected data (e.g., passwords). Screenshots are helpful.-->
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Feature request
about: Suggest an idea or improvement for SEED
title: ""
title: ''
labels: Feature
assignees: ""
assignees: ''
---

**Is your feature request related to a problem? Please describe.**
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,27 @@ jobs:
npm install
sudo apt update
sudo apt install -y xvfb
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
sudo apt install -y /tmp/chrome.deb
# Available chrome-driver versions: https://chromedriver.storage.googleapis.com/
# Available google-chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable?id=202706
# Lock to 114.0.5735.90
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb
sudo apt install -y --allow-downgrades /tmp/chrome.deb
google-chrome --version
- name: Test Django
if: ${{ matrix.test_env == 'django' }}
env:
SEED_PM_UN: ${{ secrets.SEED_PM_UN }}
SEED_PM_PW: ${{ secrets.SEED_PM_PW }}
SF_INSTANCE: ${{ secrets.SF_INSTANCE }}
SF_USERNAME: ${{ secrets.SF_USERNAME }}
SF_PASSWORD: ${{ secrets.SF_PASSWORD }}
SF_DOMAIN: ${{ vars.SF_DOMAIN }}
SF_SECURITY_TOKEN: ${{ secrets.SF_SECURITY_TOKEN }}
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
DJANGO_LOG_LEVEL: ERROR
run: |
docker exec seed_web touch /seed/config/settings/local_untracked.py
docker exec --env SEED_PM_UN --env SEED_PM_PW --env DJANGO_LOG_LEVEL seed_web coverage run manage.py test seed --settings=config.settings.docker_dev
docker exec --env SEED_PM_UN --env SEED_PM_PW --env DJANGO_LOG_LEVEL --env SF_INSTANCE --env SF_USERNAME --env SF_PASSWORD --env SF_SECURITY_TOKEN --env SF_DOMAIN seed_web coverage run manage.py test --settings=config.settings.docker_dev
if [[ ! -z "${COVERALLS_REPO_TOKEN}" ]]; then
docker exec --env COVERALLS_REPO_TOKEN seed_web coveralls
else
Expand All @@ -83,9 +91,9 @@ jobs:
run: |
CHROME_VERSION=$(google-chrome --version | awk '{ print $NF }')
echo "Getting webdriver for chrome version ${CHROME_VERSION}"
./node_modules/protractor/bin/webdriver-manager update --versions.chrome=${CHROME_VERSION} --gecko=false
npx webdriver-manager update --versions.chrome=${CHROME_VERSION} --gecko=false
Xvfb :99 &
./node_modules/protractor/bin/protractor seed/static/seed/tests/protractor-tests/protractorConfig.js
npx protractor seed/static/seed/tests/protractor-tests/protractorConfig.js
- name: Test API
if: ${{ matrix.test_env == 'api' }}
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ seed/data_importer/tests/data/tmp_*
seed/data_importer/tests/data/~*
seed/tests/api/api_test_user.json
seed/building_sync/tests/data/test_file.xml
seed/tests/output
test.sqlite

# Ignore all protractor coverage
Expand Down
8 changes: 3 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
exclude: |
(?x)(
.*/migrations
)

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
Expand All @@ -18,9 +13,12 @@ repos:
exclude: .*/templates
- id: debug-statements
- id: end-of-file-fixer
exclude: seed/static/seed/locales/
- id: mixed-line-ending
exclude: seed/static/seed/locales/
- id: pretty-format-json
args: ["--autofix", "--no-sort-keys", "--no-ensure-ascii"]
exclude: seed/static/seed/locales/
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.10.1
hooks:
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CHANGELOG.md
seed/tests/data/vcr_cassettes/
charts/persistentvolumes/templates/
charts/seed/templates/
seed/static/seed/locales/
seed/tests/data/vcr_cassettes/
30 changes: 30 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"singleQuote": true,
"overrides": [
{
"files": "*.html",
"options": {
"printWidth": 200
}
},
{
"files": "*.js",
"options": {
"printWidth": 200,
"trailingComma": "none"
}
},
{
"files": "*.scss",
"options": {
"printWidth": 200
}
},
{
"files": ["*.yaml", "*.yml"],
"options": {
"singleQuote": false
}
}
]
}
26 changes: 26 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module.exports = {
extends: 'stylelint-config-standard-scss',
rules: {
// Fix later
'no-descending-specificity': null,
'scss/dollar-variable-pattern': [
'^([a-z][a-z0-9]*)(-[a-z0-9]+)*|([a-z][a-z0-9]*)(_[a-z0-9]+)*$',
{
message: 'Expected variable to be kebab-case or snake_case'
}
],
'scss/no-global-function-names': null,
'selector-class-pattern': [
'^([a-z][a-z0-9]*)(-[a-z0-9]+)*|([a-z][a-z0-9]*)(_[a-z0-9]+)*$',
{
message: 'Expected class selector to be kebab-case or snake_case'
}
],
'selector-id-pattern': [
'^([a-z][a-z0-9]*)(-[a-z0-9]+)*|([a-z][a-z0-9]*)(_[a-z0-9]+)*$',
{
message: 'Expected id selector to be kebab-case or snake_case'
}
]
}
};
Loading
Loading