Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
4.0.0 (#87)
Browse files Browse the repository at this point in the history 
* Fix account page

Updated the react on the account page to parse the new user object correctly.
Changes to be committed:
	modified:   views/account/AccountView/Permissions.js
	modified:   views/account/AccountView/ServerInfo.js

* 1st fix for account page

Account page will now load. it is still not functional for account details or groups and permissions
Changes to be committed:
	modified:   views/account/AccountView/AddServer.js
	modified:   views/account/AccountView/Permissions.js
	modified:   views/account/AccountView/Profile.js
	modified:   views/account/AccountView/ServerInfo.js

* Commit before re-factoring the object listing page.

* Some more fixes.

* update (#46)

* Add versioning to bottom bar

App.js now has a version object to indicate the version for each of the repositories associated with BCO portal and db
Changes to be committed:
	modified:   App.js
	deleted:    layouts/DashboardLayout/index.js
	deleted:    layouts/ObjectViewLayout/BottomBar.js
	modified:   layouts/shared/BottomBar.js
	modified:   routes.js

* fix bad url
Changes to be committed:
	modified:   layouts/shared/BottomBar.js

* Initialize 4.0.0
On branch 4.0.0
Changes to be committed:
	modified:   src/App.js

* Prefix int (#57)

* bottom bar (#49)

* Add versioning to bottom bar

App.js now has a version object to indicate the version for each of the repositories associated with BCO portal and db
Changes to be committed:
	modified:   App.js
	deleted:    layouts/DashboardLayout/index.js
	deleted:    layouts/ObjectViewLayout/BottomBar.js
	modified:   layouts/shared/BottomBar.js
	modified:   routes.js

* fix bad url
Changes to be committed:
	modified:   layouts/shared/BottomBar.js

* Fix Published object page
Changes to be committed:
	modified:   .env.example
	modified:   src/layouts/shared/BottomBar.js
	modified:   src/views/builder/BuilderView/Tools/ServerList.js
	modified:   src/views/builder/BuilderView/index.js
	modified:   src/views/objects/ObjectView/Views.js

* Object View page
Changes to be committed:
	modified:   src/App.js
	new file:   src/components/API/ModifyDraftObject.js
	new file:   src/components/API/RetrieveDraftObject.js
	new file:   src/components/API/RetrieveDraftObjectPermissions.js
	new file:   src/components/API/RetrieveObjectsFromToken.js
	new file:   src/components/API/untitled.txt
	renamed:    src/views/objects/ObjectsListView/Linker.js -> src/components/Linker.js
	renamed:    src/views/objects/ObjectsListView/Toolbar.js -> src/components/ObjectsListViewToolbar.js
	new file:   src/components/PermissionTools.js
	modified:   src/routes.js
	new file:   src/utils/AddCondition.js
	new file:   src/utils/Groups.js
	new file:   src/utils/LogicField.js
	new file:   src/utils/PublishDialog.js
	new file:   src/utils/RegexBox.js
	new file:   src/utils/SearchField.js
	new file:   src/utils/ServerList.js
	new file:   src/utils/Sharing.js
	modified:   src/views/builder/BuilderView/Tools.js
	modified:   src/views/builder/BuilderView/index.js
	deleted:    src/views/objects/ObjectView/ProductCard.js
	modified:   src/views/objects/ObjectsListView/Results.js
	modified:   src/views/objects/ObjectsListView/index.js
	new file:   src/views/permissions/PermissionView/index.js

* Update to API calls for User accounts

Separate API components created for new accounts, login, and profile.
Changes to be committed:
	new file:   src/components/API/ApiNewAccount.js
	new file:   src/components/API/TokenAuthentication.js
	new file:   src/components/API/UserdbNewAccount.js
	new file:   src/components/API/UserdbTokenAuth.js
	modified:   src/components/PermissionTools.js
	modified:   src/views/account/AccountView/AccountDetails.js
	modified:   src/views/account/AccountView/ProfileDetails.js
	modified:   src/views/account/AccountView/index.js
	modified:   src/views/auth/LoginView.js
	modified:   src/views/auth/RegisterView.js

* Account updates
Changes to be committed:
	modified:   package.json
	modified:   src/App.js
	new file:   src/components/API/CreateDraftObject.js
	modified:   src/components/API/RetrieveObjectsFromToken.js
	modified:   src/components/API/UserdbNewAccount.js
	new file:   src/components/API/UserdbUpdateAccount.js
	modified:   src/components/Linker.js
	modified:   src/components/PermissionTools.js
	modified:   src/views/account/AccountView/AccountDetails.js
	modified:   src/views/account/AccountView/Profile.js
	deleted:    src/views/account/AccountView/ProfileDetails.js
	modified:   src/views/account/AccountView/index.js
	modified:   src/views/auth/RegisterView.js
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ProvenanceDomain.js
	new file:   src/views/builder/BuilderView/Raw/RawOld/index.js
	renamed:    src/views/builder/BuilderView/Raw/json2.js -> src/views/builder/BuilderView/Raw/RawOld/json2.js
	renamed:    src/views/builder/BuilderView/Raw/jsonlint.js -> src/views/builder/BuilderView/Raw/RawOld/jsonlint.js
	modified:   src/views/builder/BuilderView/Raw/index.js
	new file:   src/views/builder/BuilderView/SaveDraft.js
	modified:   src/views/builder/BuilderView/Tools/Sharing.js
	modified:   src/views/builder/BuilderView/Views.js
	new file:   src/views/builder/BuilderView/index copy.js
	modified:   src/views/builder/BuilderView/index.js
	modified:   src/views/objects/ObjectsListView/index.js

* Updates to Provenance Domain

Fixed Reviewer fields
Added local storage on changes

Changes to be committed:
	modified:   package.json
	modified:   src/App.js
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ProvenanceDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/builder/BuilderView/index.js
	modified:   src/views/objects/ObjectView/ColorCoded/index.js
	modified:   src/views/objects/ObjectsListView/index.js

* Prefix int (#58)

* bottom bar (#49)

* Add versioning to bottom bar

App.js now has a version object to indicate the version for each of the repositories associated with BCO portal and db
Changes to be committed:
	modified:   App.js
	deleted:    layouts/DashboardLayout/index.js
	deleted:    layouts/ObjectViewLayout/BottomBar.js
	modified:   layouts/shared/BottomBar.js
	modified:   routes.js

* fix bad url
Changes to be committed:
	modified:   layouts/shared/BottomBar.js

* Fix Published object page
Changes to be committed:
	modified:   .env.example
	modified:   src/layouts/shared/BottomBar.js
	modified:   src/views/builder/BuilderView/Tools/ServerList.js
	modified:   src/views/builder/BuilderView/index.js
	modified:   src/views/objects/ObjectView/Views.js

* Object View page
Changes to be committed:
	modified:   src/App.js
	new file:   src/components/API/ModifyDraftObject.js
	new file:   src/components/API/RetrieveDraftObject.js
	new file:   src/components/API/RetrieveDraftObjectPermissions.js
	new file:   src/components/API/RetrieveObjectsFromToken.js
	new file:   src/components/API/untitled.txt
	renamed:    src/views/objects/ObjectsListView/Linker.js -> src/components/Linker.js
	renamed:    src/views/objects/ObjectsListView/Toolbar.js -> src/components/ObjectsListViewToolbar.js
	new file:   src/components/PermissionTools.js
	modified:   src/routes.js
	new file:   src/utils/AddCondition.js
	new file:   src/utils/Groups.js
	new file:   src/utils/LogicField.js
	new file:   src/utils/PublishDialog.js
	new file:   src/utils/RegexBox.js
	new file:   src/utils/SearchField.js
	new file:   src/utils/ServerList.js
	new file:   src/utils/Sharing.js
	modified:   src/views/builder/BuilderView/Tools.js
	modified:   src/views/builder/BuilderView/index.js
	deleted:    src/views/objects/ObjectView/ProductCard.js
	modified:   src/views/objects/ObjectsListView/Results.js
	modified:   src/views/objects/ObjectsListView/index.js
	new file:   src/views/permissions/PermissionView/index.js

* Update to API calls for User accounts

Separate API components created for new accounts, login, and profile.
Changes to be committed:
	new file:   src/components/API/ApiNewAccount.js
	new file:   src/components/API/TokenAuthentication.js
	new file:   src/components/API/UserdbNewAccount.js
	new file:   src/components/API/UserdbTokenAuth.js
	modified:   src/components/PermissionTools.js
	modified:   src/views/account/AccountView/AccountDetails.js
	modified:   src/views/account/AccountView/ProfileDetails.js
	modified:   src/views/account/AccountView/index.js
	modified:   src/views/auth/LoginView.js
	modified:   src/views/auth/RegisterView.js

* Account updates
Changes to be committed:
	modified:   package.json
	modified:   src/App.js
	new file:   src/components/API/CreateDraftObject.js
	modified:   src/components/API/RetrieveObjectsFromToken.js
	modified:   src/components/API/UserdbNewAccount.js
	new file:   src/components/API/UserdbUpdateAccount.js
	modified:   src/components/Linker.js
	modified:   src/components/PermissionTools.js
	modified:   src/views/account/AccountView/AccountDetails.js
	modified:   src/views/account/AccountView/Profile.js
	deleted:    src/views/account/AccountView/ProfileDetails.js
	modified:   src/views/account/AccountView/index.js
	modified:   src/views/auth/RegisterView.js
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ProvenanceDomain.js
	new file:   src/views/builder/BuilderView/Raw/RawOld/index.js
	renamed:    src/views/builder/BuilderView/Raw/json2.js -> src/views/builder/BuilderView/Raw/RawOld/json2.js
	renamed:    src/views/builder/BuilderView/Raw/jsonlint.js -> src/views/builder/BuilderView/Raw/RawOld/jsonlint.js
	modified:   src/views/builder/BuilderView/Raw/index.js
	new file:   src/views/builder/BuilderView/SaveDraft.js
	modified:   src/views/builder/BuilderView/Tools/Sharing.js
	modified:   src/views/builder/BuilderView/Views.js
	new file:   src/views/builder/BuilderView/index copy.js
	modified:   src/views/builder/BuilderView/index.js
	modified:   src/views/objects/ObjectsListView/index.js

* Updates to Provenance Domain

Fixed Reviewer fields
Added local storage on changes

Changes to be committed:
	modified:   package.json
	modified:   src/App.js
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ProvenanceDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/builder/BuilderView/index.js
	modified:   src/views/objects/ObjectView/ColorCoded/index.js
	modified:   src/views/objects/ObjectsListView/index.js

* Docs
Changes to be committed:
	new file:   docs/App.js.html
	new file:   docs/FetchContext.html
	new file:   docs/fonts/OpenSans-Bold-webfont.eot
	new file:   docs/fonts/OpenSans-Bold-webfont.svg
	new file:   docs/fonts/OpenSans-Bold-webfont.woff
	new file:   docs/fonts/OpenSans-BoldItalic-webfont.eot
	new file:   docs/fonts/OpenSans-BoldItalic-webfont.svg
	new file:   docs/fonts/OpenSans-BoldItalic-webfont.woff
	new file:   docs/fonts/OpenSans-Italic-webfont.eot
	new file:   docs/fonts/OpenSans-Italic-webfont.svg
	new file:   docs/fonts/OpenSans-Italic-webfont.woff
	new file:   docs/fonts/OpenSans-Light-webfont.eot
	new file:   docs/fonts/OpenSans-Light-webfont.svg
	new file:   docs/fonts/OpenSans-Light-webfont.woff
	new file:   docs/fonts/OpenSans-LightItalic-webfont.eot
	new file:   docs/fonts/OpenSans-LightItalic-webfont.svg
	new file:   docs/fonts/OpenSans-LightItalic-webfont.woff
	new file:   docs/fonts/OpenSans-Regular-webfont.eot
	new file:   docs/fonts/OpenSans-Regular-webfont.svg
	new file:   docs/fonts/OpenSans-Regular-webfont.woff
	new file:   docs/global.html
	new file:   docs/index.html
	new file:   docs/scripts/linenumber.js
	new file:   docs/scripts/prettify/Apache-License-2.0.txt
	new file:   docs/scripts/prettify/lang-css.js
	new file:   docs/scripts/prettify/prettify.js
	new file:   docs/styles/jsdoc-default.css
	new file:   docs/styles/prettify-jsdoc.css
	new file:   docs/styles/prettify-tomorrow.css
	new file:   jsdoc.conf.json
	modified:   src/App.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js

* Fix issue with public state (#72)

* fix issue with public state

* Return proper message when retrieving token and failed.

* Cleanup

* Make biocompute ojbect servers update on close of window to add server.

* Clean the hostname, email, server info, token on closing of the add server popover.  Write out failed message to log; update timeout to be a little quicker.

* Set success or error handle properly.

* Cleanup of result parsing, update state variable properly for changing information.  Add new API Account call for requesting a Token.

* Support for deleting API servers.

* Remove erroneous todo

Co-authored-by: John Torcivia <[email protected]>

Co-authored-by: John Torcivia <[email protected]>
Co-authored-by: John Torcivia <[email protected]>

* Added UI fixes from 3.96.3 to 4.0.0
Changes to be committed:
	modified:   src/views/account/AccountView/ServerInfo.js
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ProvenanceDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/builder/BuilderView/index.js
	renamed:    src/views/builder/BuilderView/index copy.js -> src/views/builder/BuilderView/index_bk.js
	modified:   src/views/objects/ObjectView/ColorCoded/DescriptionDomain.js
	modified:   src/views/objects/ObjectView/ColorCoded/ProvenanceDomain.js
	modified:   src/views/objects/ObjectsListView/index.js

* added dockerfile to cover build of web server in a container

* readme with some basic build instructions for docker

* Small tweaks to dockerfile

* support multiple different servers to return biocompute objects from

* Fix Add server button

Changes to be committed:
	modified:   src/views/account/AccountView/AddServer.js

* Some cleanup

* Updates to saving Builder View
Changes to be committed:
	modified:   src/components/API/CreateDraftObject.js
	modified:   src/components/API/ModifyDraftObject.js
	modified:   src/components/PermissionTools.js
	modified:   src/utils/Groups.js
	modified:   src/utils/ServerList.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	renamed:    src/views/builder/BuilderView/SaveDraft.js -> src/views/builder/BuilderView/JsonView.js
	deleted:    src/views/builder/BuilderView/Tools.js
	modified:   src/views/builder/BuilderView/Views.js
	modified:   src/views/builder/BuilderView/index.js
	deleted:    src/views/builder/BuilderView/index_bk.js

* Updating and Creating drafts now work
Changes to be committed:
	modified:   src/components/API/ModifyDraftObject.js
	modified:   src/components/PermissionTools.js
	modified:   src/views/builder/BuilderView/ColorCoded/UsabilityDomain.js
	modified:   src/views/builder/BuilderView/JsonView.js
	modified:   src/views/builder/BuilderView/Views.js
	modified:   src/views/builder/BuilderView/index.js

* fix issue where re-direct wasn't happening to login page, and token wasn't being set for the account settings from the BCO API

* Publishing, Styling, and Help Documentation

Fix #44, Fix #23, Fix #43, fix #82, Fix #15
Changes to be committed:
	modified:   package.json
	modified:   src/components/API/CreateDraftObject.js
	modified:   src/components/API/ModifyDraftObject.js
	new file:   src/components/API/PublishDraftObject.js
	modified:   src/components/PermissionTools.js
	new file:   src/components/ValidateSchema.js
	modified:   src/utils/ServerList.js
	new file:   src/utils/ieee2791/2791object.json
	new file:   src/utils/ieee2791/README.md
	new file:   src/utils/ieee2791/alt2791object.json
	new file:   src/utils/ieee2791/description_domain.json
	new file:   src/utils/ieee2791/error_domain.json
	new file:   src/utils/ieee2791/execution_domain.json
	new file:   src/utils/ieee2791/io_domain.json
	new file:   src/utils/ieee2791/parametric_domain.json
	new file:   src/utils/ieee2791/provenance_domain.json
	new file:   src/utils/ieee2791/usability_domain.json
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ErrorDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ExecutionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ExtensionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/IoDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/Meta.js
	modified:   src/views/builder/BuilderView/ColorCoded/ParametricDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ProvenanceDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/UsabilityDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/builder/BuilderView/Views.js
	modified:   src/views/builder/BuilderView/index.js

* Add FDA card on home page
Changes to be committed:
	modified:   package.json
	modified:   src/components/API/ApiNewAccount.js
	modified:   src/components/API/UserdbNewAccount.js
	modified:   src/utils/ieee2791/alt2791object.json
	new file:   src/views/home/HomeView/FdaBar.js
	modified:   src/views/home/HomeView/index.js

* Update App.js

Fix bad URLs

* Cosmetic changes on FrontEnd
Changes to be committed:
	modified:   src/layouts/shared/TopBar.js
	modified:   src/routes.js
	modified:   src/views/community/Community/TechnicalSteeringCommittee.js
	modified:   src/views/home/HomeView/BioComputeResources.js
	modified:   src/views/home/HomeView/Builder.js
	renamed:    src/views/home/HomeView/FdaBar.js -> src/views/home/HomeView/FdaBox.js
	renamed:    src/views/home/HomeView/Community.js -> src/views/home/HomeView/Tsc.js
	modified:   src/views/home/HomeView/index.js
	modified:   src/views/resources/Resources/Registry.js

* Fixes and removed old content.

Fix #14 Fix #18 Fix #24

* Update routes.js

Remove ValidatorView

* Update routes.js

* Fixes for 4.0.0 push to production
Changes to be committed:
	modified:   src/components/API/ModifyDraftObject.js
	modified:   src/components/API/PublishDraftObject.js
	modified:   src/components/API/UserdbNewAccount.js
	modified:   src/components/PermissionTools.js
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/HelpBar.js
	modified:   src/views/builder/BuilderView/ColorCoded/ProvenanceDomain.js
	deleted:    src/views/builder/BuilderView/Raw/RawOld/index.js
	deleted:    src/views/builder/BuilderView/Raw/RawOld/json2.js
	deleted:    src/views/builder/BuilderView/Raw/RawOld/jsonlint.js
	deleted:    src/views/builder/BuilderView/Tools/AddCondition.js
	deleted:    src/views/builder/BuilderView/Tools/Groups.js
	deleted:    src/views/builder/BuilderView/Tools/LogicField.js
	deleted:    src/views/builder/BuilderView/Tools/PublishDialog.js
	deleted:    src/views/builder/BuilderView/Tools/RegexBox.js
	deleted:    src/views/builder/BuilderView/Tools/SearchField.js
	deleted:    src/views/builder/BuilderView/Tools/ServerList.js
	deleted:    src/views/builder/BuilderView/Tools/Sharing.js
	renamed:    src/views/builder/BuilderView/Raw/index.js -> src/views/builder/BuilderView/TreeView.js
	modified:   src/views/builder/BuilderView/Views.js
	modified:   src/views/builder/BuilderView/index.js

* Disable Verify and Fix !Review for Object View
Changes to be committed:
	modified:   src/components/PermissionTools.js
	modified:   src/views/objects/ObjectView/ColorCoded/ProvenanceDomain.js
	modified:   src/views/objects/ObjectView/ColorCoded/index.js

* update messaging for registration
Changes to be committed:
	modified:   src/components/API/ApiNewAccount.js
	modified:   src/components/API/CreateDraftObject.js
	modified:   src/components/API/PublishDraftObject.js
	modified:   src/components/API/UserdbNewAccount.js
	modified:   src/components/Linker.js
	modified:   src/components/PermissionTools.js
	modified:   src/views/builder/BuilderView/Views.js

* update account creation message

Changes to be committed:
	modified:   src/components/API/ApiNewAccount.js

* Update API messages

Changes to be committed:
	modified:   src/components/API/ApiNewAccount.js
	modified:   src/components/API/ModifyDraftObject.js
	modified:   src/components/API/UserdbTokenAuth.js
	modified:   src/components/ValidateSchema.js
	modified:   src/views/auth/LoginView.js

* Added conditional rendering for Parametric Domain and minor formatting updates
Changes to be committed:
	modified:   src/views/builder/BuilderView/ColorCoded/IoDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/ParametricDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/components/Contribution.js
	modified:   src/views/builder/BuilderView/ColorCoded/components/ContributionReviewer.js
	modified:   src/views/builder/BuilderView/Views.js

* Fix account update with no API

Add methods for token verification
Changes to be committed:
	modified:   src/App.js
	modified:   src/components/API/ApiNewAccount.js
	deleted:    src/components/API/TokenAuthentication.js
	new file:   src/components/API/TokenVerify.js
	modified:   src/components/API/UserdbTokenAuth.js
	modified:   src/components/API/UserdbUpdateAccount.js
	modified:   src/layouts/shared/TopBar.js
	modified:   src/views/account/AccountView/AccountDetails.js
	modified:   src/views/account/AccountView/AddServer.js
	modified:   src/views/account/AccountView/Profile.js
	modified:   src/views/account/AccountView/ServerInfo.js

* Fix for 'failed to fetch' on object listing
Changes to be committed:
	modified:   src/views/objects/ObjectsListView/index.js

* Added "derive" feature to published objects.

Changes to be committed:
	new file:   .jshintrc
	modified:   package.json
	modified:   src/components/API/CreateDraftObject.js
	new file:   src/components/API/DeriveDraftObject.js
	modified:   src/components/API/TokenVerify.js
	modified:   src/components/PermissionTools.js
	modified:   src/utils/ServerList.js
	modified:   src/views/account/AccountView/AddServer.js
	modified:   src/views/account/AccountView/ServerInfo.js
	modified:   src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/objects/ObjectView/ColorCoded/ProvenanceDomain.js
	modified:   src/views/objects/ObjectView/ColorCoded/index.js
	modified:   src/views/objects/ObjectView/Tools.js
	modified:   src/views/objects/ObjectView/Views.js
	modified:   src/views/objects/ObjectView/index.js
	modified:   src/views/objects/ObjectsListView/index.js

* Fixed account page error:

TypeError: Cannot use 'in' operator to search for 'public' in null
Changes to be committed:
	modified:   src/views/account/AccountView/Profile.js

* Fix for object listing page

user without a user.apiinfo was not getting published BCOs
Changes to be committed:
	modified:   src/views/objects/ObjectsListView/index.js

* Added password reset functionality
Changes to be committed:
	modified:   src/App.js
	modified:   src/components/API/RetrieveDraftObject.js
	new file:   src/components/API/UserdbConfirmPasswordReset.js
	new file:   src/components/API/UserdbPasswordReset.js
	deleted:    src/components/API/untitled.txt
	modified:   src/routes.js
	modified:   src/views/auth/LoginView.js
	new file:   src/views/auth/ResetPassword.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/builder/BuilderView/index.js
	deleted:    src/views/objects/ObjectView/Tools/AddCondition.js
	deleted:    src/views/objects/ObjectView/Tools/LogicField.js
	deleted:    src/views/objects/ObjectView/Tools/RegexBox.js
	deleted:    src/views/objects/ObjectView/Tools/SearchField.js
	modified:   src/views/objects/ObjectView/index.js

* Add Password Change to account page
Changes to be committed:
	new file:   src/components/API/UserdbChangePassword.js
	new file:   src/components/ResetPassword.js
	new file:   src/views/account/AccountView/Password.js
	modified:   src/views/account/AccountView/index.js

* missing key warning

* bordered, missingheader, missingheaderoptional not supported properties for this

* can't have table etc., as nested under <p>, changed default to span instead of p for Typography

* color not valid on button here

* no activeClassName for this element since it is created by Link not NavLink

* noGutter not valid here

* color not valid for this button

* missing key values

* color not valid here

* color has to be primary, etc., here

* activeclassname not supported here

* color not supported here

* Fix duplicate 0 key

* unique key, and color not able to be set by hex value here

* color can't be set by hex here

* not quite removed out themissing unique key issue, but some cleanup

Co-authored-by: Chris Armstrong <[email protected]>
Co-authored-by: John Torcivia <[email protected]>
Co-authored-by: John Torcivia <[email protected]>
  • Loading branch information
@HadleyKing @syntheticgio
4 people authored Dec 28, 2021
1 parent faf3796 commit 4620de8
Show file tree
Hide file tree
Showing 36 changed files with 898 additions and 363 deletions.
7 changes: 6 additions & 1 deletion src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ function App() {
// TODO: This is assuming a host at 8000 and 8080 - should probably be set more dynamically
const hostnames = {
local: {
userdb: 'http://127.0.0.1:8080/users/',
bcoapi: 'http://127.0.0.1:8000/api/',
bcoapi_accounts_new: 'http://127.0.0.1:8000/api/accounts/new/',
// TODO: this v is not listed in the URLS for the bco API
bcoapi_description_permissions: 'http://127.0.0.1:8000/api/description/permissions/',
bcoapi_objects_create: 'http://127.0.0.1:8000/api/objects/create/',
bcoapi_objects_list: 'http://127.0.0.1:8000/api/objects/token/',
Expand All @@ -46,6 +47,8 @@ function App() {
]
},
test: {
userdb: 'https://test.portal.biochemistry.gwu.edu/users/',
bcoapi: 'https://test.portal.biochemistry.gwu.edu/api/',
bcoapi_accounts_new: 'https://test.portal.biochemistry.gwu.edu/api/accounts/new/',
bcoapi_description_permissions: 'https://test.portal.biochemistry.gwu.edu/api/description/permissions/',
bcoapi_objects_create: 'https://test.portal.biochemistry.gwu.edu/api/objects/create/',
Expand All @@ -66,6 +69,8 @@ function App() {
]
},
production: {
userdb: 'https://biocomputeobject.org/users/',
bcoapi: 'https://biocomputeobject.org/api/',
bcoapi_accounts_new: 'https://biocomputeobject.org/api/accounts/new/',
bcoapi_description_permissions: 'https://biocomputeobject.org/api/description/permissions/',
bcoapi_objects_create: 'https://biocomputeobject.org/api/objects/create/',
Expand Down
6 changes: 3 additions & 3 deletions src/components/API/RetrieveDraftObject.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
/* Retrievs a draft object using the current user's token and an object's
draft id */

export default function RetrieveDraftObject(objectId) {
export default function RetrieveDraftObject(objectId, setObjectContents) {
let objectContents = '';
let userToken = '';

JSON.parse(localStorage.getItem('user')).apiinfo.forEach((item) => {
userToken = item.token;
});

fetch(objectId, {
fetch(`DRAFT/${objectId}`, {
method: 'GET',
headers: {
Authorization: `Token ${userToken}`,
Expand All @@ -25,7 +25,7 @@ export default function RetrieveDraftObject(objectId) {
}))
.then((response) => {
if (response.status === 200) {
objectContents = response.data;
setObjectContents(response.data);
console.log('Server return contents33: ', objectContents);
localStorage.setItem('bco', JSON.stringify(objectContents));
}
Expand Down
37 changes: 37 additions & 0 deletions src/components/API/UserdbChangePassword.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// /src/components/API/UserdbChangePassword.js

/* Returns a JSON Web Token that can be used for authenticated requests. */

export default function UserdbChangePassword(values) {
fetch(`${values.userdb}change_password/`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
old_password: values.old_password,
new_password: values.new_password,
}),
headers: {
Authorization: `JWT ${localStorage.getItem('token')}`,
'Content-Type': 'application/json'
},
})
.then((response) => {
if (!response.ok) {
throw new Error(response.status);
} else {
return response.json()
.then((data) => {
alert('Your password has been updated.');
console.log('data', );
});
}
})
.catch((error) => {
// TODO: This needs to be fleshed out to get all errors and deal with them
alert(`The provided OLD PASSWORD was not correct. ${error}`);
console.log('error', error);
// return error;
});
}
34 changes: 34 additions & 0 deletions src/components/API/UserdbConfirmPasswordReset.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// /src/components/API/UserdbConfirmPasswordReset.js

/* Returns a JSON Web Token that can be used for authenticated requests. */

export default function UserdbConfirmPasswordReset(values) {
fetch(`${values.userdb}password_reset/confirm/`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
password: values.password,
token: values.token
})
})
.then((response) => {
if (!response.ok) {
throw new Error(response.status);
} else {
return response.json()
.then((data) => {
alert('Your password has been reset.');
console.log('data', data);
window.location.href = '/login';
});
}
})
.catch((error) => {
// TODO: This needs to be fleshed out to get all errors and deal with them
alert(`Unable to locate an account with those provided credentials. ${error}`);
console.log('error', error);
// return error;
});
}
33 changes: 33 additions & 0 deletions src/components/API/UserdbPasswordReset.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// /src/components/API/UserdbPasswordReset.js

/* Returns a JSON Web Token that can be used for authenticated requests. */

export default function UserdbPasswordReset(values, setAlternateView, alternateView) {
fetch(`${values.userdb}password_reset/`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
email: values.email
})
})
.then((response) => {
if (!response.ok) {
throw new Error(response.status);
} else {
return response.json()
.then((data) => {
alert('A password reset email has been sent to the provided email address.');
console.log('data', alternateView);
setAlternateView(true);
});
}
})
.catch((error) => {
// TODO: This needs to be fleshed out to get all errors and deal with them
alert(`Unable to locate an account with those provided credentials. ${error}`);
console.log('error', error);
// return error;
});
}
33 changes: 0 additions & 33 deletions src/components/API/untitled.txt
View file

This file was deleted.

Loading

0 comments on commit 4620de8

Please sign in to comment.