You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by aa...@apache.org on 2022/01/10 22:06:43 UTC

[superset] branch refactorReports updated (5070f63 -> ecea115)

This is an automated email from the ASF dual-hosted git repository.

aafghahi pushed a change to branch refactorReports
in repository https://gitbox.apache.org/repos/asf/superset.git.


 discard 5070f63  Add functionality is now working (#17578)
    omit 88000cd  Arash/refactor (#17548)
    omit 150cb81  refactor: Reports code clean 10-29 (#17424)
    omit 6151b55  refactor: Arash/new state report (#16987)
    omit d6b758e  continued refactoring (#16377)
    omit 72b076d  Fetch bug fixed (#16376)
    omit 8169789  code dry (#16358)
    omit 7ee4117  fix: Header Actions test refactor (#16336)
    omit eee7b51  refactor progress (#16339)
    omit 6650425  pexdax refactor (#16333)
    omit c5bae17  continued refactoring (#16377)
    omit fd7f739  Fetch bug fixed (#16376)
    omit be2e1ec  code dry (#16358)
    omit 2962a44  fix: Header Actions test refactor (#16336)
    omit d90da9b  refactor progress (#16339)
    omit 0147e8b  pexdax refactor (#16333)
    omit 7353a2b  fix(explore): Metric control breaks when saved metric deleted from dataset (#17503)
    omit 83e49fc  feat: Certify Charts and Dashboards (#17335)
    omit 9576478  feat(dashboard): Add divider component in native filters (#17410)
    omit c216565  Remove loading span, add empty-loading-bar css class, change empty loading rows length to 12, remove width logic on empty loading columns (#17515)
    omit 6d66963  fix: hiding HiddenControl inputs for real, to reduce bootstrap space consumption (#15182)
    omit 7602431  fix: Dashboard access when DASHBOARD_RBAC is disabled (#17511)
    omit 035cc34  chore: bump major on Pillow, optional dependency (#17521)
    omit bdc6a1d  chore(deps-dev): bump @types/jquery in /superset-frontend (#17452)
    omit 2fffff6  chore: Slovak translation, enabling language and adding first translations  (#14783)
    omit 5622531  chore(deps-dev): bump eslint-import-resolver-webpack (#17453)
    omit c7a7865  docs(exploring-data): Add upload excel notes (#17502)
    omit 18c7aec  chore: remove deprecated selects and deps (#17522)
    omit 0f3b630  fix: Bulk update Spanish translations (#16799)
    omit 27e7fb3  chore: update node version in nvmrc (#17492)
    omit 29bc9f4  chore(deps-dev): bump @babel/cli in /superset-frontend (#17500)
    omit 228f936  chore(de-translation): update German translations (based on master) (#17441) (#17478)
    omit bc855f4  fix(hive): Update _latest_partition_from_df in HiveEngineSpec to work on tables with multiple indexes (#14302)
    omit 5d1c907  chore(translations): fix translation literals (#17501)
    omit d05c561  docs: add dropbox to users list (#17504)
    omit daff9b4  chore: migrate FormattedNumber component from jsx to tsx (#17361)
    omit 16e012f  refactor(chart.commands): separate commands into two different modules (#17509)
    omit b750204  Add files via upload (#17434)
    omit 1f8eff7  fix: Always use temporal type for dttm columns [ID-2] (#17458)
    omit 66d7569  refactor(QueryContext): separate all processing concerns into QueryContextProcessor (#17497)
    omit 062039c  docs: mention that username should be admin to load examples (#17484)
    omit 8da982b  fix(presto): expand data with null item (#17470)
    omit 19f1c40  docs: Update frequently-asked-questions-page.mdx (#14837)
    omit 4b7d06c  refactor(QueryContext): move df methods utils to utils package (#17496)
    omit 8a6ecd3  refactor(QueryContext): add QueryContextFactory (#17495)
    omit 261e418  chore(deps): bump cachelib from 0.1.1 to 0.4.1 (#17482)
    omit 69c3cc7  chore(sql_lab): Added Unit Test for stop query exception (#17464)
    omit 8e1619b  fix(sqllab): Have table name tooltip only show when name is truncated (#17386)
    omit 69f9ee8  fix: feature flags typing (#15254)
    omit 02a9b84  chore: Bump FAB to 3.4.0 (#17420)
    omit 8d8fbac  chore(deps-dev): bump @types/react-loadable in /superset-frontend (#17454)
    omit fb1bc6c  Update Makefile (#17480)
    omit 7b68002  fix: create-admin command in Makefile (#17471)
    omit 683d1da  refactor(QueryObject):  decouple from superset (#17479)
    omit b2363e4  fix(Dashboard): Save empty label_colors in json_metadata (#17462)
    omit 377db1b  refactor: queryObject - add QueryObjectFactory (#17466)
    omit b914e2d  refactor: queryObject - decouple from queryContext and clean code (#17465)
    omit 56d742f  chore(fr-translation): update whole French translation (based on 1.3.0 release) (#16868)
    omit 3f2129b  refactor: chartDataCommand - remove the responsibly of creating query context from command (#17461)
    omit c54027a  fix(views/core): iteration over None type (#14305)
    omit 9cfce64  fix(docker): add ecpg to docker image (#16566)
    omit 9070b6b  refactor(monorepo): stage 1 (#17427)
    omit 34d7f0a  chore: Ignore docs directory for dependabot (#17451)
    omit 1e2c834  test: add native filter default value e2e (#17398)
    omit 96bdcc3  chore: bumping react syntax highlighter and thusly prismjs (#17439)
    omit c2d8b0e  chore: Notify user of custom label colors and related Dashboard color scheme (#17422)
    omit c829614  chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9 in /docs (#14576)
    omit 211b32a  fix(mssql): week time grain should respect datefirst setting (#10811)
    omit 3ee9e11  feat: add a config to enable retina quality images in screenshots (#17409)
    omit 9f1bf1c  fix: do not show migration toast if user not enable dashboard filter components (#17440)
    omit eb029ab  fix(sql lab): NULL styling in grid cell (#17385)
    omit 71e3fa1  use full resultType with csv download on chart in dashboard (#17431)
    omit 9741eaa  Fix 'DataFrame' object has no attribute 'ix' (#12092)
    omit 7f4c240  chore: bump superset-ui 0.18.25 (#17438)
    omit e2a429b  feat(explore): adhoc column expressions [ID-3] (#17379)
    omit 5d3e1b5  refactor: ChartDataCommand into two separate commands (#17425)
    omit d8851c9  refactor(TestChartApi):  move chart data api tests into TestChartDataApi (#17407)
    omit 0ca4312  fix: rename to schemas_allowed_for_file_upload in dbs.extra (#17323)
    omit ad8a7c4  fix: avoid escaping bind-like params containing colons (#17419)
    omit aa8040e  fix: allow POST chart/data request without CSRF token (#17429)
    omit e6ff25c  fix(chart): ensure samples data is displayed (#16900)
    omit f10bc6d  fix: add fallback and validation for report and cron timezones (#17338)
    omit bfc813d  Update date_parser.py (#17426)
    omit bcef8fa1 feature: Add quarter unit to datetrunc (#17416)
    omit 0712be4  fix(Dashboard): Only apply changes when editing properties (#17392)
    omit 9ce6b7d  refactor ChartDataCommand - separate loading query_context form cache into different module (#17405)
    omit ffa55f7  chore: add dependencies for monorepo (#17403)
    omit 7cdd58b  Fix missing dashboardId (#17380)
    omit 28944f5  refactor move chart_data_apis from ChartRestApi ChartDataRestApi in seperate module (#17400)
    omit 8756c90  fix(dashboard): don't show report modal for anonymous user (#17106)
    omit 45480f7  refactor move ChartDataResult enums to common (#17399)
    omit 0257cf7  fix: title case in menus (#17135)
    omit 2544a4a  fix(sqllab): Bugfix for tracking url transformation (#17263)
    omit 6431225  docs: add mishmash io to users list (#17350)
    omit 0d77f36  fix: handle TIME column serialization (#16869)
    omit 675ffaf  revert: Partial revert of 17236 (#17383)
    omit a1961cf  fix: Users being able to update datasets across DBs (#17348)
    omit 1beda79  fix(sqllab): Query limit dropdown number breaks to separate lines (#17382)
    omit 8f9cea8  docs: Reorder install instructions in CONTRIBUTING.md (#17387)
    omit 333b137  feat: Drill ODBC/JDBC Impersonation feature (#17353)
    omit 7d22c9c  feat(native_filter_migration): add transition mode (#16992)
    omit 6b1de57  fix: various typo fixes in MD files (#17309)
    omit 561d1ac  feat(metrics): Provide override for disabling ad-hoc metrics (#17202)
    omit 33a8e87  fix: failed timezone selector UT (#17370)
    omit b58f94ad chore: bump @typescript-eslint/eslint-plugin to 5.3.0 (#17367)
    omit ed4a628  fix: Database selector overflow (#17369)
    omit ee87b01  chore: bump superset-ui 0.18.20 (#17362)
    omit f05a32e  fix: Remove horizontal scroll navigation from SQL Lab (#17356)
    omit ee7c34b  Make color scheme optional (#17357)
    omit fa51b32  fix(dashboard): Return columns and verbose_map for groupby values of Pivot Table v2 [ID-7] (#17287)
    omit ab1fcf3  test: add native filter e2e test part3 (#17343)
    omit d0085b1  Check validity of control item (#17349)
    omit e5fe186  fix: Show sqllab state when deleting databases (#17331)
    omit 43f4ab8  fix: clear 'delete' confirmation (#17345)
    omit 1fbce88  fix: set correct schema on config import (#16041)
    omit 03a2c6e  feat: apply d3NumberFormat to table reports (#17336)
    omit 4e9f812  fix: removed redundant logger definition (#17289)
    omit 1c12167  fix: Revert default series sort-by metric and enforce non-xor with series limit (#17236)
    omit 36f489e  fix: Normalize prequery result type (#17312)
    omit cb34a22  fix: import should accept old keys (#17330)
    omit 59a6502  fix: Color consistency (#17089)
    omit 85a19a9  fix: Unable to select None for Alert's log retention (#17268)
    omit 33bcf82  chore(websocket): bump dependencies (#17325)
    omit 2199ef2  chore: Test cases for annotations and annotation layers incorrect creation through API (#17246)
    omit 93bafa0  feat: improve logic in is_select (#17329)
    omit 9a4ab10  fix: remove variables from styled component (#17228)
    omit 7c6d6f4  Revert "fix(native-filters): Fix update ownState (#17181)" (#17311)
    omit b3f0abf  fix numbering on getting started with kubernetes docs (#17306)
    omit 28b494c  chore: migrate HiddenControl component from jsx to tsx (#17315)
    omit a2a457b  fix(Dashboard): Sidepanel positioning (#17200)
    omit 5491a4d  fix(Explore): Remove changes to the properties on cancel (#17184)
    omit 9515ba6  chore: bump superset-ui to 0.18.17 (#17310)
    omit bea8502  run npm install to fix a bad package version (#17314)
    omit a898883  Remove redundant parentheses from setup.py (#17284)
    omit 1f2a7a4  fix: datatable crash when column is empty string (#17303)
    omit abf24bb  test: add native filter part2 (#17283)
    omit 6a63a21  chore: Bumping pyarrow / pandas (#17290)
    omit 79ed0ae  docs(UPDATING): Adding downtime for #16756 (#17293)
    omit 8a27c67  change to 422 for stop query (#17292)
    omit 5948a9f  fix(AlertReportModal): Text Area Change (#17176)
    omit d0bad96  fix: Allow users to update database in Dataset Edit Modal (#17265)
    omit b7bda70  fix: revert "feat(sqla): apply time grain to all temporal groupbys" (#17239)
    omit 456efc0  fix(reports): Owners no longer showing undefined in reports (#17223)
    omit 0a660a1  fix: Updated connection string for Firebolt (#17242)
    omit 8ee50de  Drop constraint (#17275)
    omit fa44325  fix(explore): Metrics disappearing after removing metric from dataset (#17201)
    omit ca6a1ec  chore(doc): Update BigQuery Connection database connection UI into doc (#17191)
    omit f0c0ef7  fix(cli): fail CLI script on failed import/export (#16976)
    omit 9ef9adf  test: added some sanity test for native filter (#17231)
    omit ce558e0  chore: bump superset-ui to 0.18.17 (#17270)
     add 57d0d0e  pexdax refactor (#16333)
     add 684fa58  refactor progress (#16339)
     add 3c6b7af  fix: Header Actions test refactor (#16336)
     add 9bc4236  code dry (#16358)
     add 459ca21  Fetch bug fixed (#16376)
     add 1297954  continued refactoring (#16377)
     add abd3b72  pexdax refactor (#16333)
     add 85bb11e  refactor progress (#16339)
     add 59b157c  fix: Header Actions test refactor (#16336)
     add 85e14e2  code dry (#16358)
     add 0f8cf4b  Fetch bug fixed (#16376)
     add 156deac  continued refactoring (#16377)
     add 2cd5906  Merge branch 'refactorReports' of github.com:apache/incubator-superset into refactorReports
     add 159b290  refactor: Arash/new state report (#16987)
     add 7b884bf  refactor: Reports code clean 10-29 (#17424)
     new 15f0f60  chore: bump superset-ui to 0.18.17 (#17270)
     new 177d846  test: added some sanity test for native filter (#17231)
     new fc5839d  fix(cli): fail CLI script on failed import/export (#16976)
     new 8110074  chore(doc): Update BigQuery Connection database connection UI into doc (#17191)
     new 366a359  fix(explore): Metrics disappearing after removing metric from dataset (#17201)
     new a40330d  Drop constraint (#17275)
     new 6715d23  fix: Updated connection string for Firebolt (#17242)
     new d625d67  fix(reports): Owners no longer showing undefined in reports (#17223)
     new 4ba100a  fix: revert "feat(sqla): apply time grain to all temporal groupbys" (#17239)
     new 7dd6239  fix: Allow users to update database in Dataset Edit Modal (#17265)
     new 134ac9f  fix(AlertReportModal): Text Area Change (#17176)
     new d0942c8  change to 422 for stop query (#17292)
     new 403cf79  docs(UPDATING): Adding downtime for #16756 (#17293)
     new 6b7f2d3  chore: Bumping pyarrow / pandas (#17290)
     new 5561c88  test: add native filter part2 (#17283)
     new 03131e3  fix: datatable crash when column is empty string (#17303)
     new 460430e  Remove redundant parentheses from setup.py (#17284)
     new 07927fe  run npm install to fix a bad package version (#17314)
     new 0722180  chore: bump superset-ui to 0.18.17 (#17310)
     new 08710b3  fix(Explore): Remove changes to the properties on cancel (#17184)
     new ae89468  fix(Dashboard): Sidepanel positioning (#17200)
     new 15d10f8  chore: migrate HiddenControl component from jsx to tsx (#17315)
     new feb56e3  fix numbering on getting started with kubernetes docs (#17306)
     new 4309f7d  Revert "fix(native-filters): Fix update ownState (#17181)" (#17311)
     new 31f02a1  fix: remove variables from styled component (#17228)
     new 3dab33c  feat: improve logic in is_select (#17329)
     new e0aab37  chore: Test cases for annotations and annotation layers incorrect creation through API (#17246)
     new 8b91b28  chore(websocket): bump dependencies (#17325)
     new 208e319  fix: Unable to select None for Alert's log retention (#17268)
     new b5c9c75  fix: Color consistency (#17089)
     new be724cd  fix: import should accept old keys (#17330)
     new 594ff5c  fix: Normalize prequery result type (#17312)
     new 6d84fd4  fix: Revert default series sort-by metric and enforce non-xor with series limit (#17236)
     new 51e1484  fix: removed redundant logger definition (#17289)
     new 589d41d  feat: apply d3NumberFormat to table reports (#17336)
     new 3cef60c  fix: set correct schema on config import (#16041)
     new 7a5d42f  fix: clear 'delete' confirmation (#17345)
     new abcb7d8  fix: Show sqllab state when deleting databases (#17331)
     new d9e417c  Check validity of control item (#17349)
     new 2e542fa  test: add native filter e2e test part3 (#17343)
     new d8f3ec6  fix(dashboard): Return columns and verbose_map for groupby values of Pivot Table v2 [ID-7] (#17287)
     new 7ff5402  Make color scheme optional (#17357)
     new e69b4ee  fix: Remove horizontal scroll navigation from SQL Lab (#17356)
     new d42dc7c  chore: bump superset-ui 0.18.20 (#17362)
     new 9967673  fix: Database selector overflow (#17369)
     new c1b7b74  chore: bump @typescript-eslint/eslint-plugin to 5.3.0 (#17367)
     new bbdae74  fix: failed timezone selector UT (#17370)
     new 2982bac  feat(metrics): Provide override for disabling ad-hoc metrics (#17202)
     new 60f04f18 fix: various typo fixes in MD files (#17309)
     new f9da09c  feat(native_filter_migration): add transition mode (#16992)
     new 063b941  feat: Drill ODBC/JDBC Impersonation feature (#17353)
     new 0cc282b  docs: Reorder install instructions in CONTRIBUTING.md (#17387)
     new dfeec21  fix(sqllab): Query limit dropdown number breaks to separate lines (#17382)
     new 725d674  fix: Users being able to update datasets across DBs (#17348)
     new 290c87a  revert: Partial revert of 17236 (#17383)
     new 2171695  fix: handle TIME column serialization (#16869)
     new d587a6b  docs: add mishmash io to users list (#17350)
     new 298f304  fix(sqllab): Bugfix for tracking url transformation (#17263)
     new c3b5e09  fix: title case in menus (#17135)
     new e4ce83a  refactor move ChartDataResult enums to common (#17399)
     new 70ebf0a  fix(dashboard): don't show report modal for anonymous user (#17106)
     new e6c776e  refactor move chart_data_apis from ChartRestApi ChartDataRestApi in seperate module (#17400)
     new 11057fe  Fix missing dashboardId (#17380)
     new 5eb44a5  chore: add dependencies for monorepo (#17403)
     new cc25143  refactor ChartDataCommand - separate loading query_context form cache into different module (#17405)
     new eff362f  fix(Dashboard): Only apply changes when editing properties (#17392)
     new a50d2ea  feature: Add quarter unit to datetrunc (#17416)
     new b794215  Update date_parser.py (#17426)
     new 6726d08  fix: add fallback and validation for report and cron timezones (#17338)
     new 4d4c2df  fix(chart): ensure samples data is displayed (#16900)
     new 012121a  fix: allow POST chart/data request without CSRF token (#17429)
     new c25186e  fix: avoid escaping bind-like params containing colons (#17419)
     new 161401d  fix: rename to schemas_allowed_for_file_upload in dbs.extra (#17323)
     new f11746f  refactor(TestChartApi):  move chart data api tests into TestChartDataApi (#17407)
     new d1491fa  refactor: ChartDataCommand into two separate commands (#17425)
     new cdeec15  feat(explore): adhoc column expressions [ID-3] (#17379)
     new cb78684  chore: bump superset-ui 0.18.25 (#17438)
     new 3f4795f  Fix 'DataFrame' object has no attribute 'ix' (#12092)
     new cccfb03  use full resultType with csv download on chart in dashboard (#17431)
     new 38576bb  fix(sql lab): NULL styling in grid cell (#17385)
     new 946f466  fix: do not show migration toast if user not enable dashboard filter components (#17440)
     new 37dd9c8  feat: add a config to enable retina quality images in screenshots (#17409)
     new 9a2a596  fix(mssql): week time grain should respect datefirst setting (#10811)
     new 701b268  chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9 in /docs (#14576)
     new 1f8f301  chore: Notify user of custom label colors and related Dashboard color scheme (#17422)
     new 7529e0d  chore: bumping react syntax highlighter and thusly prismjs (#17439)
     new 8a75f0c  test: add native filter default value e2e (#17398)
     new d83725c  chore: Ignore docs directory for dependabot (#17451)
     new c9347fe  refactor(monorepo): stage 1 (#17427)
     new fcad26c  fix(docker): add ecpg to docker image (#16566)
     new a6c14cd  fix(views/core): iteration over None type (#14305)
     new 4e16083  refactor: chartDataCommand - remove the responsibly of creating query context from command (#17461)
     new f1bdf80  chore(fr-translation): update whole French translation (based on 1.3.0 release) (#16868)
     new 40391a8  refactor: queryObject - decouple from queryContext and clean code (#17465)
     new bdd9682  refactor: queryObject - add QueryObjectFactory (#17466)
     new fd6993d  fix(Dashboard): Save empty label_colors in json_metadata (#17462)
     new f3ca3bd  refactor(QueryObject):  decouple from superset (#17479)
     new 4f59e7b  fix: create-admin command in Makefile (#17471)
     new 0019dca  Update Makefile (#17480)
     new 7e9a40e  chore(deps-dev): bump @types/react-loadable in /superset-frontend (#17454)
     new 3a2688e  chore: Bump FAB to 3.4.0 (#17420)
     new 7bd477a  fix: feature flags typing (#15254)
     new 5118395  fix(sqllab): Have table name tooltip only show when name is truncated (#17386)
     new 8df67cf  chore(sql_lab): Added Unit Test for stop query exception (#17464)
     new 2db4638  chore(deps): bump cachelib from 0.1.1 to 0.4.1 (#17482)
     new 2d5a878  refactor(QueryContext): add QueryContextFactory (#17495)
     new 51264e6  refactor(QueryContext): move df methods utils to utils package (#17496)
     new bc46796  docs: Update frequently-asked-questions-page.mdx (#14837)
     new dbf272f  fix(presto): expand data with null item (#17470)
     new b77102f  docs: mention that username should be admin to load examples (#17484)
     new a12ae38  refactor(QueryContext): separate all processing concerns into QueryContextProcessor (#17497)
     new 63b5919  fix: Always use temporal type for dttm columns [ID-2] (#17458)
     new 6d06d5b  Add files via upload (#17434)
     new b206519  refactor(chart.commands): separate commands into two different modules (#17509)
     new 459276e  chore: migrate FormattedNumber component from jsx to tsx (#17361)
     new 93f09d7  docs: add dropbox to users list (#17504)
     new 05177bf  chore(translations): fix translation literals (#17501)
     new 07ebc41e fix(hive): Update _latest_partition_from_df in HiveEngineSpec to work on tables with multiple indexes (#14302)
     new 3e06b13  chore(de-translation): update German translations (based on master) (#17441) (#17478)
     new 17392d2  chore(deps-dev): bump @babel/cli in /superset-frontend (#17500)
     new 8129de8  chore: update node version in nvmrc (#17492)
     new 92fb46c  fix: Bulk update Spanish translations (#16799)
     new 3f35cc0e chore: remove deprecated selects and deps (#17522)
     new b0da978  docs(exploring-data): Add upload excel notes (#17502)
     new 7ef1037  chore(deps-dev): bump eslint-import-resolver-webpack (#17453)
     new a03eb8c  chore: Slovak translation, enabling language and adding first translations  (#14783)
     new b667462  chore(deps-dev): bump @types/jquery in /superset-frontend (#17452)
     new 09c9d74  chore: bump major on Pillow, optional dependency (#17521)
     new 3fafb02  fix: Dashboard access when DASHBOARD_RBAC is disabled (#17511)
     new a422385  fix: hiding HiddenControl inputs for real, to reduce bootstrap space consumption (#15182)
     new de3b81c  Remove loading span, add empty-loading-bar css class, change empty loading rows length to 12, remove width logic on empty loading columns (#17515)
     new efbc1e3  feat(dashboard): Add divider component in native filters (#17410)
     new 2cf0c28  feat: Certify Charts and Dashboards (#17335)
     new 68e4e0e  fix(explore): Metric control breaks when saved metric deleted from dataset (#17503)
     new ecea115  Add functionality is now working (#17578)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5070f63)
            \
             N -- N -- N   refs/heads/refactorReports (ecea115)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 135 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 superset-frontend/src/components/ReportModal/index.tsx             | 4 ++++
 superset-frontend/src/dashboard/components/Header/index.jsx        | 7 +++++++
 .../src/explore/components/ExploreChartHeader/index.jsx            | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)