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

Cove eula #362

Open
wants to merge 29 commits into
base: develop
Choose a base branch
from
Open

Cove eula #362

wants to merge 29 commits into from

Conversation

lwjameson
Copy link
Contributor

In this PR

  • This adds a feature which allows there to be a EULA that the user must accept before uploading and documents to the library.
    • If the ENV variable PUBLIC_EULA_URL is set, then the Accept EULA modal is displayed if the user has not yet accepted and tries to upload a document.

image

The user can choose to read the EULA and accept. If they do not accept, no upload is allowed. You only need to accept once.

rsimon and others added 23 commits February 25, 2025 11:48
* #84 - Refactoring "dashboard-projects" layout

* #84 - Fixing Typescript import/export errors

* #84 - Updating project filters labels

* #84 - Adding ability to create tag_definitions and tags for project groups

* #84 - Removing unused imports

* #84 - Adding "no matching records" message to SelectTagDefinitionsDialog

* #84 - Adding ability to rename and delete project groups; Refactoring TagDefinitionDialog

* #84 - Adding empty project group filter message

* #84 - Refactoring SelectRecordsDialog; Adding ability to add projects to group

* #84 - Updating to archive tag_definitions instead of delete

* Added DE labels

* #84 - Moving TagContext into /components

* #84 - Adding "description" prop to SelectRecordsDialog and TagDefinitionDialog component for a11y; Updating a11y warning on CreateProjectDialog and ProjectDetailsForm

* 85 - Adding drag and drop functionality to documents list

* #85 - Removing unused imports

* 85 - Adding icon for drag/drop handle

* #83 - Refactoring document library to use a side bar instead of tabs

* #83 - Adding DocumentGrid view component; Adding selection state to DocumentCard

* #83 - Re-generating package-lock.json

* #83 - Updating DocumentGrid to handle disabledIds prop

* #84 - Replacing h1 with span tag in TagDefinitionDialog

* #84 - Adding missing imports to DocumentCard component

* #83 - Refactoring MetadataModal into EditMetadataModal and ViewMetadataModal

* Added DE labels

* Rebase feature-galleries (#344)

* Dependency updates

* Updated PDF annotator + PDFjs to latest version

* WIP

* Addresses issue performant-software/vico#349

* Addresses performant-software/vico#326

* Updates to latest Annotorious/Text-/PDF-Annotator dependencies, addresses performant-software/vico#350

* Correct host in reset

* Logging

* Get session

* Removed code

* Updated annotorious-supabase package, issue performant-software/vico#351

* WIP

* WIP

* WIP

* Fix for password reset

* Remove logging

* WIP

* WIP

* Fix

* Updates to collaboration screen

* Fix for overflowing assignment title

* Added DE label

* First pass: modified TEI serialization

* Rendering embedded TEI annotations: changed selector to new standOff location

* Fixed insert position for multiple standOff blocks

* Added @type='recogito_studio_annotations' to TEI standOff export

* Serializing Notes as TEI annotations without a target

* Preparatory plumbing for (future) re-generation of embedded notes

* package.json

* Cleanup

* PR comment resolution

* Added support for displaying 'embedded notes' from TEI markup

* Added error logging

* Updated to bugfixed Annotorious Supabase plugin

* v1.2.0

* Fix for delete assignment

* More aggressive download filename sanitization

* package.json version number

* Email template for self hosting

* Fixing duplicate notes + JS exception when sorting embedded notes

* Extra safety net for AnnotationCardSection

* Minor regression fix

* More robust handling for IIIF image info.json URLs

* Keycloak fix

* more logging

* Update callback

* remove logging

* logging

* SSO redirect

* Logging

* Fix for redirect

* Another fix

* redirect

* redirect

* Remove some logging

* Fix for SSO and Keycloak redirects

* Fix for Keycloak

* Fix for redirect on logout

* Redirect bug

* redirect issue

* Redirect issue

* Redirect issue

* Redirect problem

* redirect

* Logging

* Back to implicit

* Remove implicit flow

* Another hack

* Again with NAVSA

* Keycloak fix

* Keycloak fix

* Keycloak fix

* Keycloak fix

* Keycloak fix

* remove logging

* Updated to bugfixed @recogito/text + pdf annotator versions

* Taxonomy serialization: first working version

* Making sure that taxonomies never have duplicate IDs

* Embedded layers: resolving taxonomy tags

* CSS bugfix

* Hiding TEI taxonomy element via CSS

* Removed debug log

* Naming

* Removed Todo

* TEI serialization change: moved tags to annotation ana attribute

* Put taxonomy element in its proper place

---------

Co-authored-by: Rainer Simon <[email protected]>
Co-authored-by: lorinjameson <[email protected]>
Co-authored-by: Rainer Simon <[email protected]>

---------

Co-authored-by: dleadbetter <[email protected]>
Co-authored-by: Rainer Simon <[email protected]>
Co-authored-by: Derek Leadbetter <[email protected]>
Co-authored-by: Rainer Simon <[email protected]>
* WIP

* WIP

* WIP

* remove logging

* Lock file update

* Package lock update

* Trying to fix build

* Build fixes

* Build fix

* DE labels

---------

Co-authored-by: Rainer Simon <[email protected]>
…taModal; Updating to allow for arbitrary metadata to be entered

* #139 - Adding ability to view/edit document metadata from annotations view

* Added DE labels

* #139 - Adjusting style of MetadataList and MetadataModal to allow for longer content; Updating to format URLs

---------

Co-authored-by: Rainer Simon <[email protected]>
* #84 - Refactoring "dashboard-projects" layout

* #84 - Fixing Typescript import/export errors

* #84 - Updating project filters labels

* #84 - Adding ability to create tag_definitions and tags for project groups

* #84 - Removing unused imports

* #84 - Adding "no matching records" message to SelectTagDefinitionsDialog

* #84 - Adding ability to rename and delete project groups; Refactoring TagDefinitionDialog

* #84 - Adding empty project group filter message

* #84 - Refactoring SelectRecordsDialog; Adding ability to add projects to group

* #84 - Updating to archive tag_definitions instead of delete

* Added DE labels

* #84 - Moving TagContext into /components

* #84 - Adding "description" prop to SelectRecordsDialog and TagDefinitionDialog component for a11y; Updating a11y warning on CreateProjectDialog and ProjectDetailsForm

* 85 - Adding drag and drop functionality to documents list

* #85 - Removing unused imports

* 85 - Adding icon for drag/drop handle

* #83 - Refactoring document library to use a side bar instead of tabs

* #83 - Adding DocumentGrid view component; Adding selection state to DocumentCard

* #83 - Re-generating package-lock.json

* #83 - Updating DocumentGrid to handle disabledIds prop

* #84 - Replacing h1 with span tag in TagDefinitionDialog

* #84 - Adding missing imports to DocumentCard component

* #83 - Refactoring MetadataModal into EditMetadataModal and ViewMetadataModal

* Added DE labels

* Rebase feature-galleries (#344)

* Dependency updates

* Updated PDF annotator + PDFjs to latest version

* WIP

* Addresses issue performant-software/vico#349

* Addresses performant-software/vico#326

* Updates to latest Annotorious/Text-/PDF-Annotator dependencies, addresses performant-software/vico#350

* Correct host in reset

* Logging

* Get session

* Removed code

* Updated annotorious-supabase package, issue performant-software/vico#351

* WIP

* WIP

* WIP

* Fix for password reset

* Remove logging

* WIP

* WIP

* Fix

* Updates to collaboration screen

* Fix for overflowing assignment title

* Added DE label

* First pass: modified TEI serialization

* Rendering embedded TEI annotations: changed selector to new standOff location

* Fixed insert position for multiple standOff blocks

* Added @type='recogito_studio_annotations' to TEI standOff export

* Serializing Notes as TEI annotations without a target

* Preparatory plumbing for (future) re-generation of embedded notes

* package.json

* Cleanup

* PR comment resolution

* Added support for displaying 'embedded notes' from TEI markup

* Added error logging

* Updated to bugfixed Annotorious Supabase plugin

* v1.2.0

* Fix for delete assignment

* More aggressive download filename sanitization

* package.json version number

* Email template for self hosting

* Fixing duplicate notes + JS exception when sorting embedded notes

* Extra safety net for AnnotationCardSection

* Minor regression fix

* More robust handling for IIIF image info.json URLs

* Keycloak fix

* more logging

* Update callback

* remove logging

* logging

* SSO redirect

* Logging

* Fix for redirect

* Another fix

* redirect

* redirect

* Remove some logging

* Fix for SSO and Keycloak redirects

* Fix for Keycloak

* Fix for redirect on logout

* Redirect bug

* redirect issue

* Redirect issue

* Redirect issue

* Redirect problem

* redirect

* Logging

* Back to implicit

* Remove implicit flow

* Another hack

* Again with NAVSA

* Keycloak fix

* Keycloak fix

* Keycloak fix

* Keycloak fix

* Keycloak fix

* remove logging

* Updated to bugfixed @recogito/text + pdf annotator versions

* Taxonomy serialization: first working version

* Making sure that taxonomies never have duplicate IDs

* Embedded layers: resolving taxonomy tags

* CSS bugfix

* Hiding TEI taxonomy element via CSS

* Removed debug log

* Naming

* Removed Todo

* TEI serialization change: moved tags to annotation ana attribute

* Put taxonomy element in its proper place

---------

Co-authored-by: Rainer Simon <[email protected]>
Co-authored-by: lorinjameson <[email protected]>
Co-authored-by: Rainer Simon <[email protected]>

---------

Co-authored-by: dleadbetter <[email protected]>
Co-authored-by: Rainer Simon <[email protected]>
Co-authored-by: Derek Leadbetter <[email protected]>
Co-authored-by: Rainer Simon <[email protected]>
* WIP

* WIP

* WIP

* remove logging

* Lock file update

* Package lock update

* Trying to fix build

* Build fixes

* Build fix

* DE labels

---------

Co-authored-by: Rainer Simon <[email protected]>
…taModal; Updating to allow for arbitrary metadata to be entered

* #139 - Adding ability to view/edit document metadata from annotations view

* Added DE labels

* #139 - Adjusting style of MetadataList and MetadataModal to allow for longer content; Updating to format URLs

---------

Co-authored-by: Rainer Simon <[email protected]>
* HTML in meta

* Sanitize
Copy link

netlify bot commented Feb 25, 2025

Deploy Preview for recogito-cloud-staging ready!

Name Link
🔨 Latest commit b94581b
🔍 Latest deploy log https://app.netlify.com/sites/recogito-cloud-staging/deploys/67c74149215f820008ae5a79
😎 Deploy Preview https://deploy-preview-362--recogito-cloud-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

netlify bot commented Feb 25, 2025

Deploy Preview for vico-design ready!

Name Link
🔨 Latest commit b94581b
🔍 Latest deploy log https://app.netlify.com/sites/vico-design/deploys/67c74149e894df0008abf0e3
😎 Deploy Preview https://deploy-preview-362--vico-design.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@lwjameson lwjameson marked this pull request as draft February 25, 2025 18:30
@lwjameson lwjameson requested a review from rsimon February 25, 2025 20:42
@lwjameson lwjameson marked this pull request as ready for review February 25, 2025 20:42
Copy link
Member

@rsimon rsimon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

I added DE labels. I think they might be a bit too long and may need shortening to fit the buttons. But couldn't test it myself (errors because the accepted_eula column isn't on the staging DB yet). Can take another look & tweak once the DB is updated on staging.

@@ -18,6 +18,7 @@ import type {
JoinRequest,
MyProfile,
Translations,
UserProfile,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one's showing as an unused import in my IDE. (I guess MyProfile is used instead.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

@@ -80,6 +83,12 @@ export const ProjectHome = (props: ProjectHomeProps) => {
}
}, [props.availableLayers]);

useEffect(() => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this ever used? The props shouldn't ever change, since this is the root component, and the state is already initialized with props.user.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its a habit. I never trust initialized state ;-) Been caught too many times by a component being re-rendered with stale state because of some upstream change, though in this case I agree...Unlikely. Removed.

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.

3 participants