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

Commit

Permalink
Extension domain (#95)
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

* Saving incomplete work
Changes to be committed:
	modified:   package.json
	modified:   src/views/builder/BuilderView/ColorCoded/ExtensionDomain.js
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/builder/BuilderView/index.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

* Fix for Extension Domain

also added some changes for the Validation function.

* initial changes to remove out the blank object created (#90)

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

* Revert "Fix for Extension Domain"

This reverts commit 1ae1dfc.

* Revert "Revert "Fix for Extension Domain""

This reverts commit 480eb3a.

* partial fixes
Changes to be committed:
	modified:   src/views/builder/BuilderView/ColorCoded/index.js
	modified:   src/views/builder/BuilderView/JsonView.js

* Etag
Changes to be committed:
	modified:   src/views/builder/BuilderView/ColorCoded/Meta.js

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 4620de8 commit a162019
Show file tree
Hide file tree
Showing 23 changed files with 279 additions and 302 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/build

# misc
.idea/
.DS_Store
/.env
/.env.local
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.56",
"@material-ui/styles": "^4.10.0",
"@rjsf/core": "^3.2.1",
"ajv": "^6.12.6",
"clsx": "^1.1.1",
"crypto-js": "^4.1.1",
Expand Down
17 changes: 12 additions & 5 deletions src/components/API/ModifyDraftObject.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,19 @@ export default function ModifyDraftObject(objectInformation) {
}
})
.then((response) => {
if (response.status === 200) {
console.log('POST_api_objects_drafts_modify: Success!');
alert(`${objectInformation.owner} has saved ${objectInformation.object_id} successfully!`);
if (!response.ok) {
throw new Error(response.status);
} else {
console.log('POST_api_objects_drafts_modify: FAILED!');
alert('POST_api_objects_drafts_modify: FAILED!');
return response.json()
.then((data) => {
localStorage.removeItem('bco');
console.log('POST_api_objects_drafts_modify: Success!');
alert(`${objectInformation.owner} has saved ${objectInformation.object_id} successfully!`);
});
}
})
.catch((error) => {
console.log(`error: ${error}`);
alert(`Save Draft FAILED! ${error}`);
});
}
2 changes: 0 additions & 2 deletions src/components/PermissionTools.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export default function PermissionTools({
// setDeletingDraft(true);
}
}
console.log('objectInformation', objectInformation);

// ----- INITIAL RENDER ----- //

Expand All @@ -98,7 +97,6 @@ export default function PermissionTools({
useEffect(() => {
// Logged in and has servers?
const userInfoCheck = JSON.parse(localStorage.getItem('user'));
console.log('userInfoCheck: ', userInfoCheck);

if (userInfoCheck !== null) {
if (userInfoCheck.apiinfo.length > 0) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/ValidateSchema.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
/* validates a JSON against a SCHEMA */

import Ajv from 'ajv';
import object from '../utils/ieee2791/alt2791object';
import object from 'src/utils/ieee2791/2791object';

const ajv = Ajv();

export default function ValidateSchema(contents, setPublish, publish) {
const BcoSchema = object;

console.log('objectContents', setPublish, BcoSchema);
console.log('objectContents', setPublish, contents);
// 'https://opensource.ieee.org/2791-object/ieee-2791-schema/raw/master/2791object.json';
// 'https://w3id.org/ieee/ieee-2791-schema/2791object.json';
// fetch(BcoSchema, { mode: 'no-cors' });
Expand Down
6 changes: 3 additions & 3 deletions src/layouts/shared/TopBar.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// src/layouts/shared/TopBar.js

import React, { useContext } from 'react';
import { NavLink as RouterLink, useNavigate } from 'react-router-dom';
import { Link as RouterLink, useNavigate } from 'react-router-dom';
import clsx from 'clsx';
import PropTypes from 'prop-types';
import {
Expand All @@ -14,12 +14,12 @@ import {
} from '@material-ui/core';
import MenuIcon from '@material-ui/icons/Menu';
import Logo from 'src/components/Logo';
import { FetchContext } from '../../App';

import {
User as UserIcon,
Users as UsersIcon
} from 'react-feather';
import { FetchContext } from '../../App';

import NavItem from './NavItem';

// Navigation.
Expand Down
27 changes: 0 additions & 27 deletions src/utils/AddCondition.js
View file

This file was deleted.

52 changes: 0 additions & 52 deletions src/utils/userProfilePopup.js
View file

This file was deleted.

8 changes: 4 additions & 4 deletions src/views/builder/BuilderView/ColorCoded/DescriptionDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ export default function DescriptionDomain({
<TextField InputProps={{ className: classes.root }} error={!!missingKeywords} fullWidth variant="outlined" value={cF(items.ddKeywords)} onChange={(e) => items.setDdKeywords([e.target.value])} />
</StyledCell>
<TableCell>
<Typography variant="h3">
<Typography>
Platform
</Typography>
</TableCell>
Expand Down Expand Up @@ -810,7 +810,7 @@ export default function DescriptionDomain({
aria-controls="panel1a-content"
id="panel1a-header"
>
<Typography className={missingStepsOutputUri ? classes.missingHeader : classes.header} variant="h3">
<Typography className={missingStepsOutputUri ? classes.missingHeader : classes.header} >
Show Prerequisites
</Typography>
</AccordionSummary>
Expand Down Expand Up @@ -874,7 +874,7 @@ export default function DescriptionDomain({
aria-controls="panel1a-content"
id="panel1a-header"
>
<Typography className={missingStepsInputUri ? classes.missingHeader : classes.header} variant="h3">
<Typography className={missingStepsInputUri ? classes.missingHeader : classes.header} >
Show Inputs
</Typography>
</AccordionSummary>
Expand Down Expand Up @@ -934,7 +934,7 @@ export default function DescriptionDomain({
aria-controls="panel1a-content"
id="panel1a-header"
>
<Typography className={missingStepsOutputUri ? classes.missingHeader : classes.header} variant="h3">
<Typography className={missingStepsOutputUri ? classes.missingHeader : classes.header} >
Show Outputs
</Typography>
</AccordionSummary>
Expand Down
4 changes: 2 additions & 2 deletions src/views/builder/BuilderView/ColorCoded/ErrorDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ export default function ErrorDomain({ items, cF }) {
<Table size="small">
<TableHead className={classes.tabled}>
<TableRow>
<StyledCell colSpan="5">
<StyledCell colSpan="6">
<Button
variant="contained"
// color="D5D8DC"
fullWidth
onClick={() => window.open('https://docs.biocomputeobject.org/error-domain/')}
>
<Typography variant="h3">
<Typography variant="h1">
Error Domain &nbsp;
<HelpIcon />
</Typography>
Expand Down
2 changes: 1 addition & 1 deletion src/views/builder/BuilderView/ColorCoded/ExecutionDomain.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ export default function ExecutionDomain({ items, cF }) {
<TableBody>
<TableRow>
<StyledCell>
<Typography className={missingScriptDriver ? classes.missingHeader : classes.header} variant="h3">
<Typography className={missingScriptDriver ? classes.missingHeader : classes.header}>
Script Driver
</Typography>
</StyledCell>
Expand Down
Loading

0 comments on commit a162019

Please sign in to comment.