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

23.12 #267

Closed
wants to merge 6 commits into from
Closed

23.12 #267

wants to merge 6 commits into from

Conversation

HadleyKing
Copy link
Contributor

test PR to fix conflicts

HadleyKing and others added 6 commits November 28, 2023 08:43
Changes to be committed:
	modified:   client/src/components/builder/descriptionDomain.js
* Update for Login

Changes to be committed:
	modified:   client/src/components/bcodbs/SearchResults.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/slices/bcoSlice.js

* About update (#153)

* GA4 added

* For demostration use, updated GA4, updated Navigation header icons

* Changed all SAVE button to Next on the Builder page

* Switch Dinos's to Luis and moved Dinos to previous member

---------

Co-authored-by: tianywan819 <57418894+tianywan819@users.noreply.github.com>

* Update localDeployment.md

* Update localDeployment.md

* Icons reformatted for Nav Bar.
fix #164

* Add quickSearch to Nav bar
Changes to be committed:
	modified:   client/package-lock.json
	modified:   client/package.json
	modified:   client/src/components/bcodbs/SearchOptions.js
	new file:   client/src/components/quickSearch.js
	modified:   client/src/layouts/MainLayout/NavBar.js

* Fix messaging for extension domain errors

RE #149
Changes to be committed:
	modified:   client/src/components/builder/extension.js
	modified:   client/src/components/builder/extensionDomain.js
	modified:   client/src/services/bco.service.js
	modified:   client/src/slices/bcoSlice.js

* Update bco.service.js for HTTPS

Fix #149

* I/O domain error additional properties

Fix #140
Changes to be committed:
	modified:   client/src/components/builder/components.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/layouts/MainLayout/AppDropDown.js
	modified:   client/src/layouts/MainLayout/DocDropDown.js
	modified:   client/src/layouts/MainLayout/HelpDropDown.js

* Remove `object_id` from uploaded BCO

Fix #148
Changes to be committed:
	modified:   client/src/components/fileHandeling.js

* Description Domain Xref

Fix #139
Changes to be committed:
	modified:   client/src/components/builder/descriptionDomain.js

* Formatting for quickSearch

Changes to be committed:
	modified:   client/src/components/quickSearch.js
	modified:   client/src/layouts/MainLayout/NavBar.js

* Fix error

* 1st pass

Added new routs for viewers
removed styles from functions and added to App.css
reorganized styles directory
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/App.js
	modified:   client/src/components/builder/treeView.js
	modified:   client/src/components/prefix/PrefixSearch.js
	modified:   client/src/components/quickSearch.js
	renamed:    client/src/layouts/MainLayout/NavBar.js -> client/src/layouts/MainLayout/MainNavBar.js
	modified:   client/src/layouts/MainLayout/index.js
	deleted:    client/src/layouts/ObjectViewLayout/NavBar/NavItem.js
	deleted:    client/src/layouts/ObjectViewLayout/NavBar/ObjectOptions.js
	deleted:    client/src/layouts/ObjectViewLayout/NavBar/index.js
	new file:   client/src/layouts/ObjectViewLayout/ObjectNavBar.js
	modified:   client/src/layouts/ObjectViewLayout/index.js
	renamed:    client/src/layouts/MainLayout/AppDropDown.js -> client/src/layouts/shared/AppDropDown.js
	renamed:    client/src/layouts/MainLayout/DocDropDown.js -> client/src/layouts/shared/DocDropDown.js
	renamed:    client/src/layouts/MainLayout/HelpDropDown.js -> client/src/layouts/shared/HelpDropDown.js
	modified:   client/src/routes.js
	deleted:    client/src/styles.css

* Updates to NavBar
Changes to be committed:
	modified:   client/src/App.css
	renamed:    client/src/layouts/MainLayout/index.js -> client/src/layouts/MainLayout.js
	deleted:    client/src/layouts/MainLayout/MainNavBar.js
	new file:   client/src/layouts/MainNavBar.js
	renamed:    client/src/layouts/ObjectViewLayout/ObjectNavBar.js -> client/src/layouts/ObjectNavBar.js
	new file:   client/src/layouts/ObjectViewLayout.js
	deleted:    client/src/layouts/ObjectViewLayout/index.js

* Static Sidebar implemented

Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/builder/index.js
	new file:   client/src/components/builder/indexOld.js
	modified:   client/src/components/builder/rawJson.js
	modified:   client/src/components/viewer/cardViews.js
	modified:   client/src/components/viewer/index.js
	modified:   client/src/layouts/MainNavBar.js
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/layouts/ObjectViewLayout.js
	new file:   client/src/layouts/objectSideBar.js
	modified:   client/src/routes.js

* Update to MainLayout
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/quickSearch.js
	modified:   client/src/layouts/MainLayout.js

* Saving Changes
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/builder/components.js
	modified:   client/src/components/builder/descriptionDomain.js
	modified:   client/src/components/builder/executionDomain.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/components/builder/parametricDomain.js
	modified:   client/src/components/builder/provenanceDomain.js
	deleted:    client/src/components/fileHandeling.js
	modified:   client/src/components/quickSearch.js
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/layouts/ObjectViewLayout.js
	modified:   client/src/layouts/objectSideBar.js
	deleted:    client/src/layouts/shared/BottomBar.js
	deleted:    client/src/layouts/shared/NavItem.js
	deleted:    client/src/layouts/shared/NewsBar/index.js
	new file:   client/src/layouts/shared/ToolsDropDown.js
	deleted:    client/src/layouts/shared/TopBar.js
	modified:   client/src/slices/bcoSlice.js

* Added prefix select
Changes to be committed:
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/slices/prefixSlice.js

* Moved `Next` button
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/builder/components.js
	modified:   client/src/components/builder/descriptionDomain.js
	new file:   client/src/components/builder/errorDomain.js
	modified:   client/src/components/builder/executionDomain.js
	modified:   client/src/components/builder/extension.js
	modified:   client/src/components/builder/extensionDomain.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/components/builder/parametricDomain.js
	modified:   client/src/components/builder/provenanceDomain.js
	modified:   client/src/components/builder/rawJson.js
	modified:   client/src/components/builder/treeView.js
	modified:   client/src/components/builder/usabilityDomain.js
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/layouts/objectSideBar.js
	modified:   client/src/services/bco.service.js
	modified:   client/src/slices/bcoSlice.js

* Fix for Rendered more hooks than during the previous render.

Changes to be committed:
	modified:   client/src/components/quickSearch.js

* Fix "Rendered more hooks than during the previous render."

Changes to be committed:
	modified:   client/src/components/quickSearch.js

* Fix rendering issues.

Changes to be committed:
	modified:   client/src/components/builder/components.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/components/quickSearch.js
	modified:   client/src/layouts/shared/AppDropDown.js
	modified:   client/src/slices/bcoSlice.js

* Test views (#215)

* 1st pass

Added new routs for viewers
removed styles from functions and added to App.css
reorganized styles directory
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/App.js
	modified:   client/src/components/builder/treeView.js
	modified:   client/src/components/prefix/PrefixSearch.js
	modified:   client/src/components/quickSearch.js
	renamed:    client/src/layouts/MainLayout/NavBar.js -> client/src/layouts/MainLayout/MainNavBar.js
	modified:   client/src/layouts/MainLayout/index.js
	deleted:    client/src/layouts/ObjectViewLayout/NavBar/NavItem.js
	deleted:    client/src/layouts/ObjectViewLayout/NavBar/ObjectOptions.js
	deleted:    client/src/layouts/ObjectViewLayout/NavBar/index.js
	new file:   client/src/layouts/ObjectViewLayout/ObjectNavBar.js
	modified:   client/src/layouts/ObjectViewLayout/index.js
	renamed:    client/src/layouts/MainLayout/AppDropDown.js -> client/src/layouts/shared/AppDropDown.js
	renamed:    client/src/layouts/MainLayout/DocDropDown.js -> client/src/layouts/shared/DocDropDown.js
	renamed:    client/src/layouts/MainLayout/HelpDropDown.js -> client/src/layouts/shared/HelpDropDown.js
	modified:   client/src/routes.js
	deleted:    client/src/styles.css

* Updates to NavBar
Changes to be committed:
	modified:   client/src/App.css
	renamed:    client/src/layouts/MainLayout/index.js -> client/src/layouts/MainLayout.js
	deleted:    client/src/layouts/MainLayout/MainNavBar.js
	new file:   client/src/layouts/MainNavBar.js
	renamed:    client/src/layouts/ObjectViewLayout/ObjectNavBar.js -> client/src/layouts/ObjectNavBar.js
	new file:   client/src/layouts/ObjectViewLayout.js
	deleted:    client/src/layouts/ObjectViewLayout/index.js

* Static Sidebar implemented

Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/builder/index.js
	new file:   client/src/components/builder/indexOld.js
	modified:   client/src/components/builder/rawJson.js
	modified:   client/src/components/viewer/cardViews.js
	modified:   client/src/components/viewer/index.js
	modified:   client/src/layouts/MainNavBar.js
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/layouts/ObjectViewLayout.js
	new file:   client/src/layouts/objectSideBar.js
	modified:   client/src/routes.js

* Update to MainLayout
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/quickSearch.js
	modified:   client/src/layouts/MainLayout.js

* Saving Changes
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/builder/components.js
	modified:   client/src/components/builder/descriptionDomain.js
	modified:   client/src/components/builder/executionDomain.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/components/builder/parametricDomain.js
	modified:   client/src/components/builder/provenanceDomain.js
	deleted:    client/src/components/fileHandeling.js
	modified:   client/src/components/quickSearch.js
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/layouts/ObjectViewLayout.js
	modified:   client/src/layouts/objectSideBar.js
	deleted:    client/src/layouts/shared/BottomBar.js
	deleted:    client/src/layouts/shared/NavItem.js
	deleted:    client/src/layouts/shared/NewsBar/index.js
	new file:   client/src/layouts/shared/ToolsDropDown.js
	deleted:    client/src/layouts/shared/TopBar.js
	modified:   client/src/slices/bcoSlice.js

* Added prefix select
Changes to be committed:
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/slices/prefixSlice.js

* Moved `Next` button
Changes to be committed:
	modified:   client/src/App.css
	modified:   client/src/components/builder/components.js
	modified:   client/src/components/builder/descriptionDomain.js
	new file:   client/src/components/builder/errorDomain.js
	modified:   client/src/components/builder/executionDomain.js
	modified:   client/src/components/builder/extension.js
	modified:   client/src/components/builder/extensionDomain.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/components/builder/parametricDomain.js
	modified:   client/src/components/builder/provenanceDomain.js
	modified:   client/src/components/builder/rawJson.js
	modified:   client/src/components/builder/treeView.js
	modified:   client/src/components/builder/usabilityDomain.js
	modified:   client/src/layouts/ObjectNavBar.js
	modified:   client/src/layouts/objectSideBar.js
	modified:   client/src/services/bco.service.js
	modified:   client/src/slices/bcoSlice.js

* Fix for Rendered more hooks than during the previous render.

Changes to be committed:
	modified:   client/src/components/quickSearch.js

* Fix "Rendered more hooks than during the previous render."

Changes to be committed:
	modified:   client/src/components/quickSearch.js

* Fix rendering issues.

Changes to be committed:
	modified:   client/src/components/builder/components.js
	modified:   client/src/components/builder/index.js
	modified:   client/src/components/builder/ioDomain.js
	modified:   client/src/components/quickSearch.js
	modified:   client/src/layouts/shared/AppDropDown.js
	modified:   client/src/slices/bcoSlice.js

* Initial commit
Changes to be committed:
	deleted:    server/tests/db.test.sqlite3
	new file:   server/tests/fixtures/test_data.json
	deleted:    server/tests/test_authentication.py
	deleted:    server/tests/test_bcodb.py
	deleted:    server/tests/test_users.py
	new file:   server/tests/test_views/__init__.py
	new file:   server/tests/test_views/test_auth_register.py
	modified:   server/users/apis.py

* Test and document `/users/auth/register/`

Fix #200
Changes to be committed:
	modified:   server/tests/test_views/test_auth_register.py
	modified:   server/users/apis.py

* Fix quickSearch

Changes to be committed:
	modified:   client/src/components/quickSearch.js

* Password reset email fixes

Routs.js updated because of conflict with Django, settings.py and .secrets changed to have server_URL, link for email changed
Changes to be committed:
	modified:   client/src/routes.js
	modified:   server/.secrets.example
	modified:   server/authentication/apis.py
	modified:   server/portaluserdb/settings.py

* Create .gitgaurdian

* Update .gitgaurdian

* Added fixture for testing on test.portal
Changes to be committed:
	renamed:    server/admin/db.sqlite3.dev -> admin/db.sqlite3.dev
	renamed:    server/admin/users.tsv -> admin/users.tsv
	new file:   server/portaluserdb/fixtures/test_portal.json
	renamed:    server/tests/fixtures/test_data.json -> server/tests/fixtures/testing_data.json
	modified:   server/tests/test_views/test_auth_register.py

* Update test_portal.json
Changes to be committed:
	modified:   server/portaluserdb/fixtures/test_portal.json

* Css Update

* /users/bcodb/reset_token

* package-lock.json add

* TW CSS updates

* Ogranized CSS for each domain and modified formik on Provenance Domain.

* Organize CSS version_1, incorporate changes on main branch

* Implanted Checkbox for multi selection

* Minor updates on Multiselect

* minor edits

* New SAVE button in progress

* Additional conflicts from merge
Changes to be committed:
	modified:   client/src/components/resources/index.js
	modified:   client/src/components/viewer/cardViews.js
	modified:   client/src/slices/bcoSlice.js

* Fix bad testing file
Changes to be committed:
	renamed:    server/tests/test_views/test_users_bcodb_reset_token.py -> server/tests/test_views/bad_test_users_bcodb_reset_token.py

---------

Co-authored-by: tianywan819 <57418894+tianywan819@users.noreply.github.com>
Co-authored-by: ChinweokeO <127264259+ChinweokeO@users.noreply.github.com>
Co-authored-by: Reeya Gupta <guptareeya53@gmail.com>
Changes to be committed:
	modified:   client/src/App.js
Fix #265
Changes to be committed:
	modified:   client/src/components/account/Servers.js
	modified:   server/tests/fixtures/testing_data.json
Copy link

gitguardian bot commented Dec 19, 2023

⚠️ GitGuardian has uncovered 3 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id Secret Commit Filename
5477442 Generic High Entropy Secret 709894a server/tests/fixtures/testing_data.json View secret
8267001 Generic High Entropy Secret df506e6 server/tests/test_views/bad_test_users_bcodb_reset_token.py View secret
8267001 Generic High Entropy Secret 709894a server/tests/fixtures/testing_data.json View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@HadleyKing HadleyKing closed this Jan 3, 2024
@HadleyKing HadleyKing deleted the 23.12 branch February 14, 2024 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant