Autoconversion Fixes (#462) · simularium/simularium-website@efc3f61

Commit

Autoconversion Fixes (#462)

* add convert file redux functions and constants

* add convert file redux logic

* add ConversionProcessingData type

* check and set conversionstatus in trajectory handler

* set conversion file contents and file name

* cancel conversion via import path on overlay

* render conversion processing overlay in sim container

* conversion form will run convert file action and navigate to viewer

* set conversion status after any failed health check

* add health checks

* add import routing and interval health checks to sim container

* some testing logs in redux logic

* remove import route

* render conversion form in sim container

* render overlay in conversion form

* update trajectory handler for new conversion status

* handle conversion status in load file menu

* restore cancel processing as prop in conversion processing overlay

* style conversion form for new context

* remove light theme from overlay component

* consolidate octopus config for logics

* clean up comments and imports

* provide onclick function for cancel conversion button

* add light theme text primary color

* remove interval checks for server health

* update overlay style

* remove controller prop

* no need to try to pause the simulation, it's abandoned at this point

* use octopus for autoconversion and for loading files

* remove unused imports

* fix merge artifact that broke orthographic and perspective icons

* add comment indicating that octopus network config will need to be changed in the future

* Squashed commit of the following:

commit 04c2186e7b687a454c44f2b8d1c756dea8e44766
Author: Joe Heffernan <[email protected]>
Date:   Thu Feb 15 16:56:06 2024 -0800

    commit lock file

commit 05bba98e610ddae6292c0668299f4aebed0a81d3
Author: Joe Heffernan <[email protected]>
Date:   Thu Feb 15 09:38:03 2024 -0800

    Squashed commit of the following:

    commit f3527626a0e12b131ef7c551785e6f95cbbf6b95
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Feb 14 17:42:55 2024 -0800

        Fix/bump react (#461)

        * bump react, react-waypoint, react dom, @types/react

        * declare children in sider and upload props for react 18 compatibility

        * bump @types/react-dom

        * use createRoot API to render App

        * commit lock file

        * bump to viewer 3.7.0 with react 18

        * use non-null assertion on container in createRoot call

    commit 39a6f7b7e63206bf842d9f74b6f8098d4973c86c
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Jan 29 19:28:31 2024 -0800

        Bump follow-redirects from 1.15.2 to 1.15.4 (#460)

        Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
        - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
        - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

        ---
        updated-dependencies:
        - dependency-name: follow-redirects
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 6b26307fb3ea8151e2718f95e01047da67ed5db3
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Jan 29 19:28:19 2024 -0800

        Bump plotly.js from 2.20.0 to 2.25.2 (#457)

        Bumps [plotly.js](https://github.com/plotly/plotly.js) from 2.20.0 to 2.25.2.
        - [Release notes](https://github.com/plotly/plotly.js/releases)
        - [Changelog](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md)
        - [Commits](https://github.com/plotly/plotly.js/compare/v2.20.0...v2.25.2)

        ---
        updated-dependencies:
        - dependency-name: plotly.js
          dependency-type: direct:production
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 38dda7c1349d8e044c70c839d6c8bb18eedbf34f
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jan 4 10:27:17 2024 -0800

        open aics homepage in new tab (#454)

    commit 106935b771feebabf47c0b3912a58c7068e49ab0
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Dec 19 11:51:35 2023 -0800

        Feature/color picker (#432)

        * initial components and styling

        * shrink checkbox to expose swatch

        * shrink chexbox to make swatch clickable

        * pass data into color swatch

        * remove unused styling

        * handleColorChange in picker

        * pass props and helders to color picker modal

        * add colorPicker to color swatch

        * types actions constants selectors for colorChanges

        * selector in viewer panel

        * preserve initial color in swatch

        * style parent swatch when children dont match

        * recent colors into redux

        * change modal to popover

        * update import

        * clean up stylesheets

        * tidy css and imports

        * bump viewer version

        * remove extra ?

        * update viewer

        * viewerpanel selector test update

        * update dependecies

        * add tests for getColorChanges

        * fix type imports in selectors

        * web app version

        * remove comment

        * consolidate colorpicker and popover

        * organize props and style rules

        * pointer on color swatch

        * formatting

        * color picker tooltip color to constant

        * swap replace for slice

        * debounce color selection

        * implement orthographic camera

        * initial styling of camera controls

        * ortho/perspective icons

        * define viewer button color variables

        * focus:hover state on home button

        * playback control styling

        * fix button exceeding border

        * orth/persp icons swapped

        * remove redundant ternary

        * rename set camera

        * audit fix (#437)

        * change check for if a file is shareable (#439)

        * change check for if a file is shareable

        * use constant for trajFileName

        * use selector instead of type guard

        * add unit test

        * remove accidental auto import

        * Update ux_issue.md (#433)

        * menu item and modal

        * removing logs

        * remove unneeded jsx fragment wrappers

        * remove commented code

        * styling update

        * remove comments

        * typo

        * prevent bg color change after click

        * Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

        * fix menus offsets (#440)

        * fix menus offsets

        * move version info

        * update viewer to 3.6.3

        * update viewer and fix types (#445)

        * 0.10.0

        * remove redunant line

        * implement orthographic camera

        * initial styling of camera controls

        * define viewer button color variables

        * focus:hover state on home button

        * playback control styling

        * orth/persp icons swapped

        * remove redundant ternary

        * install new viewer version

        * rename set camera

        * menu item and modal

        * removing logs

        * remove unneeded jsx fragment wrappers

        * remove commented code

        * styling update

        * remove comments

        * typo

        * Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

        * fix menus offsets (#440)

        * fix menus offsets

        * move version info

        * update viewer to 3.6.3

        * update viewer and fix types (#445)

        * pass down actions from model panel to picker

        * add hover state rules

        * pass in debouncedColor

        * [to undo] - local install

        * remove colorChangesMap

        * prevent color assignment on first opening picker

        * fix typing and save all color changes

        * make color change an object

        * install

        * store colors for correct rendering

        * add a done call

        * change interface

        * install viewer

        * update viewer

        * remove old style sheet

        * clean up styles and change order on parents

        * style children selection row

        * style labels

        * style sub menu better

        * clean up styles

        * revert change

        * make sure colors are consistently cased

        * fix imports

        * wip - not have popover move up

        * remove color swatch component and get color picker aligned with swatch

        * flx classnames

        * fix typo

        * fix checkall button

        * fix classname

        * make render functions for colorpicker

        * keep swatch constant until color is set, change label to "previous"

        * adjusting labels

        * Update src/components/CheckBoxTree/style.css

        Co-authored-by: Peyton Lee <[email protected]>

        * rename colors

        * sync children remove log

        * Fix/viewer imports (#453)

        * fix imports to be from the top level

        * update viewer

        * Update src/components/SharedCheckbox/style.css

        Co-authored-by: Cameron Fraser <[email protected]>

        * remove return

        * clean up styling

        * change names of checkboxtree components

        ---------

        Co-authored-by: Megan Riel-Mehan <[email protected]>
        Co-authored-by: Lyndsay <[email protected]>
        Co-authored-by: Blair Lyons <[email protected]>
        Co-authored-by: Peyton Lee <[email protected]>
        Co-authored-by: Cameron Fraser <[email protected]>

    commit 7bfdc1f9a394bd67ea56f8ff40ca63b2e290fab4
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Fri Dec 8 14:21:10 2023 -0800

        Bump @adobe/css-tools from 4.3.1 to 4.3.2 (#449)

        Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2.
        - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
        - [Commits](https://github.com/adobe/css-tools/commits)

        ---
        updated-dependencies:
        - dependency-name: "@adobe/css-tools"
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 37a5fee141d3b523fb6de69642c2119a84615558
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 14:18:05 2023 -0800

        Update test-coverage.yml

    commit f9267547f03c707b4cf3c91130658b78e35da67c
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 14:15:46 2023 -0800

        Update test-coverage.yml

    commit 16de0a0461fb7e9107fa1e0ea3bda52472e83aaa
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Fri Dec 8 14:03:32 2023 -0800

        Bump axios from 0.21.4 to 1.6.0 (#447)

        Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0.
        - [Release notes](https://github.com/axios/axios/releases)
        - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
        - [Commits](https://github.com/axios/axios/compare/v0.21.4...v1.6.0)

        ---
        updated-dependencies:
        - dependency-name: axios
          dependency-type: direct:production
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
        Co-authored-by: meganrm <[email protected]>

    commit 8fad286617be73b7b03ac9b108c8b2eef1bc203d
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 13:53:25 2023 -0800

        check if it's a dependabot PR (#450)

    commit 4d149c8b99e72959d9ac2ff001efc5cf314d9661
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Dec 4 13:35:30 2023 -0800

        Bump @babel/traverse from 7.20.5 to 7.23.2 (#442)

        Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.20.5 to 7.23.2.
        - [Release notes](https://github.com/babel/babel/releases)
        - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
        - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

        ---
        updated-dependencies:
        - dependency-name: "@babel/traverse"
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit b432dff1b97833e5bfc94e9b5cac7dc0fbb19711
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Nov 29 13:34:18 2023 -0800

        Fix/share download styling (#448)

        * add color

        * remove pipe and fix button order

        * fix download button styling

        * fix share button styling

        * remove whitespace

        * change hover state selector to sync with tooltip

        * turn functions to boolean constants

        * streamline tooltip constants

        * move btn styles to appheader

    commit c6eaea3d3c81c88c240ee1e8c1e4825d8fe5545e
    Author: Blair Lyons <[email protected]>
    Date:   Mon Oct 23 11:06:47 2023 -0700

        0.10.0

    commit f13dcb01b32c16f2d0f5853c7f890ab566a06244
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Oct 20 12:46:48 2023 -0700

        update viewer and fix types (#445)

    commit 4baff29420c6a06647a08b5c57e64ad88ad09a86
    Author: Blair Lyons <[email protected]>
    Date:   Thu Oct 19 14:49:46 2023 -0700

        update viewer to 3.6.3

    commit ca5ac248433cc26a66fa09a546332cae8d80c2b5
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Oct 16 10:41:45 2023 -0700

        fix menus offsets (#440)

        * fix menus offsets

        * move version info

    commit 244e7268c91a42d2dcfb9da61bc28f2b6b423689
    Merge: 60326cf 836510a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Oct 11 13:32:07 2023 -0700

        Merge pull request #423 from simularium/feature/version-info

        Feature/version info

    commit 836510a92366a61ef1dbc455f17838f92a638322
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Oct 11 11:47:54 2023 -0700

        Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

    commit caac57be991dc3dfaf79ff426e13ba6854c6ab03
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Oct 10 12:51:42 2023 -0700

        prevent bg color change after click

    commit 23be0d4f7ed526a3853889940727a9dd21cbbc19
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 15:27:12 2023 -0700

        typo

    commit 141b0370f42b3ee2b4345d56fe2e4db9e6fff2ab
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:34:44 2023 -0700

        remove comments

    commit 8dcccc1a3688e7528923670aa8f0611ae7283376
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:34:28 2023 -0700

        styling update

    commit 4c215c7ab876e546ec546b3712d88a83cfa79393
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:14:01 2023 -0700

        remove commented code

    commit 72c2e8d2ab548ee36829775a608e0dda5d3116f4
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:10:35 2023 -0700

        remove unneeded jsx fragment wrappers

    commit dcff5c8b8fd4842b72e53e100c76e1b79d23c178
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:27:55 2023 -0700

        removing logs

    commit 3e9d57898ff065c37ea5bc2dcacf9deda19442af
    Author: Joe Heffernan <[email protected]>
    Date:   Tue May 23 10:56:42 2023 -0700

        menu item and modal

    commit 60326cfa9649737d21bae5388626c5fd1bfa0d65
    Author: Lyndsay <[email protected]>
    Date:   Mon Oct 9 12:57:20 2023 -0700

        Update ux_issue.md (#433)

    commit 72f1a233d73b64eabc86b30426cace6c727bee2c
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Oct 9 12:57:08 2023 -0700

        change check for if a file is shareable (#439)

        * change check for if a file is shareable

        * use constant for trajFileName

        * use selector instead of type guard

        * add unit test

        * remove accidental auto import

    commit 67f2f582cffb3537bd1d47ad37caf0866f1137bf
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu Oct 5 13:28:50 2023 -0700

        audit fix (#437)

    commit af14d0126f590813ee1afab5ec39ad1b91727235
    Merge: 1314eed a78dee4
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Sep 8 14:50:10 2023 -0700

        Merge pull request #430 from simularium/feature/orthographic-ui

        Feature/orthographic UI

    commit a78dee40c3be10ee554e2e13e0aef260845d4775
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Sep 8 09:21:09 2023 -0700

        rename set camera

    commit 49598cce511597bd3a4e0c15d55349f20ffb5226
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 28 19:00:29 2023 -0700

        install new viewer version

    commit d5b84407f5bcb81e3d7391b14ee69d286a0d4924
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 17 16:16:45 2023 -0700

        remove redundant ternary

    commit aa0fc41db95e9c76ee400f8f8a236d9acc23bd02
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 17 16:15:09 2023 -0700

        orth/persp icons swapped

    commit 1b92d704738a9cee82e5b102f46890790d72d23c
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Aug 16 13:50:33 2023 -0700

        fix button exceeding border

    commit 4969ca95427ba0ba1901cd8950eab975cd28a636
    Merge: 29137a3 1314eed
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Aug 16 13:28:05 2023 -0700

        Merge branch 'main' into feature/orthographic-ui
        merging main

    commit 29137a35c6bc9bc8b03c2da7c639da36d390a3ed
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 14 13:01:55 2023 -0700

        playback control styling

    commit 8756d054f27ed2c5e14af0d2f0f9410e81a9dd53
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 14 13:00:59 2023 -0700

        focus:hover state on home button

    commit 4506ce9a66fd55978cbdc27d4bf08dbacce98fcb
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:26:56 2023 -0700

        define viewer button color variables

    commit f3cc830f8f9aa341b57a7da9459ab2cbab7d63ed
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:25:50 2023 -0700

        ortho/perspective icons

    commit b23d847486f97313b163895ca4fdd28014e9ea7a
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:25:26 2023 -0700

        initial styling of camera controls

    commit fab18400bbefc0d77ec38c9654abd061da539b7f
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:23:15 2023 -0700

        implement orthographic camera

    commit 1314eed2438057c99f4781aea5701ae030073435
    Merge: 2c949aa b9c37b2
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jul 20 16:37:06 2023 -0700

        Merge pull request #424 from simularium/feature/share-time-url

        Feature/share time url

    commit b9c37b25a5b0b204b038bc30f3273462667b6f4c
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jul 20 13:19:13 2023 -0700

        tooltip handler edit, fix alignment on time input

    commit 2c949aa0dd71ddd3910a7b388ae31dcf67d4677e
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Jul 17 14:56:28 2023 -0700

        Update CODEOWNERS

    commit 81bce369c106e6c1988086b36c98667297e917f5
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Jul 11 16:17:20 2023 -0700

        change gh-deploy to be a dev build (#426)

    commit 01468c302c6036a6b2f8e1f94912cd5514367c23
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Jul 11 16:17:03 2023 -0700

        Update CONTRIBUTING.md (#425)

    commit 5ad5660739b4d9146248ef761373c4a45d81c725
    Merge: 0b79159 5dda5da
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 17:41:25 2023 -0700

        Merge branch 'feature/share-time-url' of https://github.com/simularium/simularium-website into feature/share-time-url

    commit 0b791599d674a611fc8b51e723459cdb476253cf
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 17:41:18 2023 -0700

        reduce annotations

    commit 5dda5da83e2ce5916053e73c6db3221f9be5ae5c
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 15:13:51 2023 -0700

        update return type receiveTimeChange

    commit 5113dfe6354ca147638230ad1a826749089df6df
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 13:57:59 2023 -0700

        update test

    commit 1e226e8568f770b1da7bb55de34c91637f45988e
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 13:48:29 2023 -0700

        test for editUrlParams and clean up

    commit b93f789f62b53ff63071d1fefc1efc2de04990fd
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 12:19:00 2023 -0700

        changed names of functions

    commit 6dfe513646e789a4e1b974c27baa0d94b276db79
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:58:00 2023 -0700

        gh actions from ubuntu to macos

    commit 1d1b73acbb480ab348ef122ac73e9bae5496b789
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:57:14 2023 -0700

        add jest coverage reporters

    commit 9a62549b0ac8603734d1dc8f9e8d83c6a53460cf
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:50:41 2023 -0700

        update jest

    commit d58b4c6d8140ded3934014caf0bec8a5a2bf97b8
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:48:56 2023 -0700

        update jest coverage

    commit 0da60eba553c7963e7dc1da32cac2835d0c6614e
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Jun 26 12:15:10 2023 -0700

        ternary -> object, styling names, add href

    commit b0f81cef84ae7de2b29cc537d132a5305e33f521
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 23 15:17:45 2023 -0700

        initial unit test

    commit ecb0b9af9424f61628ab905d14c813490be407bd
    Merge: fb2a54f 918556c
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:48:15 2023 -0700

        Merge branch 'main' into feature/share-time-url

    commit fb2a54fd82bbaabe469777d48d4e05f7e893a347
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:11:04 2023 -0700

        space share and download buttons

    commit 0245f777780f49d9f228313ce194c347904f985a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:07:33 2023 -0700

        move tooltip

    commit f92904682d012882b6c4da3263716d0e07f5d308
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 04deea2157e7f2a24f1784bb5401629955c1c6a2
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit ee811e772efbd977f06c0a0c6a4684a1946f4ffc
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 9e177810a6ba3ef44bb156dcf953bc45e0ce45aa
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit 2166dc1d9bdcf5b6758990b74cad2cd9f6d38a3b
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 820afcab6247673362326e568b893e83dc1d59f6
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit ce60a9d48719915b05311eada47c512983952487
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 41ea8875e6f5389cc0007951b2e1c827ee35d577
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit 305955e3752d46981780046fdb9fee9ab27c68b8
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 20 15:48:53 2023 -0700

        move tooltip and unessary async

    commit 6b21353a71def1829d825ac62613aa74f4d9cdac
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:06:24 2023 -0700

        remove comment

    commit f794da1d1ceb797420f074ca3843df286299a429
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:41:10 2023 -0700

        removing isDownloading

    commit 70db90b4cd5951d005a30bd0b94e3222d5b64d19
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:29:04 2023 -0700

        removing styling typo

    commit 5b516c044054ef0fa9046c21fc2047e9ae026449
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:29:15 2023 -0700

        clean up comment

    commit 8c2ac5e02225ff63e0cba32f6006fbc8f80f87aa
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 10:36:47 2023 -0700

        use viewer getasblob method, bump viewer

    commit a1dfdb1d9e774e79a1bf9cacd765e59f62ece676
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu May 18 22:23:10 2023 +0000

        use href for direct download if remote file

    commit b2e1bad5aaeb4d23454e539667c73250199bf62d
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:56:07 2023 -0700

        removing comments

    commit 8ff2ad88358540251c55d21610ef599913342489
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:51:47 2023 -0700

        disable button during downloading

    commit 4448920df8e72875244e14f3c44b7c3a0a5fdd53
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:04:22 2023 -0700

        cleaning

    commit 2a7b3d18da5b9df45ff4ac2bddf4806bb060b8f9
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:03:06 2023 -0700

        cleanup

    commit 00fcfb43689221e1725e0413679161c4753e3f07
    Author: Joe Heffernan <[email protected]>
    Date:   Thu May 4 11:53:55 2023 -0700

        styling, adding pipe divider

    commit dbd6322e7de895ce4779716e6b3afd5fbab31c89
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 14:04:03 2023 -0700

        added download functionality

    commit 13d0057ef7ee76beb57b5895fae42b015567f438
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 09:15:09 2023 -0700

        intial ui components

    commit 918556ca7c6d40c8637ceaaf9d01ff77ccd9ed3d
    Merge: 0749f1a f995097
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 09:12:17 2023 -0700

        Merge pull request #422 from simularium/feature/download-trajectory

        Feature/download trajectory

    commit f99509782c90e51caf8cf78517c691ab3de77f7f
    Merge: 39a70ca 0749f1a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 09:09:55 2023 -0700

        Merge branch 'main' into feature/download-trajectory

    commit 39a70cad2a44f4bdb6e6ef2eddf85599b71bddb7
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 8319dc779d2cf137aff0e7f5c4757c2cb34abf4e
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit 054e67082861884e502f3033744dba9ba1d4dd3e
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit cec3e9b962543131f7d07302c8b2c100c31c3b3f
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit bb103348d65bc9c1bb52fc3317da62fa206e6fe7
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 20 15:48:53 2023 -0700

        move tooltip and unessary async

    commit 79938891b2d395ccc96bc451294982c0d74ad5e6
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 14 15:24:34 2023 -0700

        remove redundant action from reducer

    commit 67a2a63d92d149796577d4ad07ae1ab001db84fc
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 14 15:22:33 2023 -0700

        remove blue text class

    commit 225ebfd1395622c5b5a27e7b721c787c3f08ecc3
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 14 14:52:42 2023 -0700

        shift style rules, add light theme, remove buffer

    commit 0749f1aba62d01e67e9fd0597acff8c35bcc9796
    Merge: cc135e8 ac22916
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 15:58:13 2023 -0700

        Merge pull request #417 from simularium/feature/updated-looping-playback

        looping playback and tooltip styling

    commit 96eca5c5ea728864f9b06f72fed6cc3ec3dcf919
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 10:30:15 2023 -0700

        clean up

    commit f2ba682ece52baa2b4e3e8a9748976e600a10a5b
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 10:09:16 2023 -0700

        consolidate redundant functions

    commit 57c1e4ec760608af66a43dfe5fc051249d7068a0
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 09:56:47 2023 -0700

        move clear and rest params to utils

    commit b5a9bbe0e8c9d8f548e363cfd6e199d2a0bb5214
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 17:37:34 2023 -0700

        clear old params before setting url

    commit 8f668d6aa689bc9cefec45223c1265ba58f427fc
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 13:54:24 2023 -0700

        cleaning

    commit 7a954ca0fdc7449e5b6641d23733be5374a6db21
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 13:52:52 2023 -0700

        mapping prop to dispatch

    commit 8b8aa1b56518b4a8379d3e8e0c2f83bd39e2d828
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 10:22:02 2023 -0700

        update viewer

    commit c8bb39919f303dac6a575a5c2f032ac8c6fc59bb
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:06:24 2023 -0700

        remove comment

    commit 164a6c0e7e35793fc809a4b003efd3bd16c5669c
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:02:57 2023 -0700

        remove unused imports

    commit 3a8920090074be8989d7e26a56c4cd98bf3e6025
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:00:09 2023 -0700

        hover styling

    commit 63013b0ba79a0f86eb6faa486c317a1cb87d3672
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:17:22 2023 -0700

        nested ternary -> if/else

    commit ac22916ede152783b20d6daea533708afd79cc64
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 903c09ef28f09b4d764387c630f494840f51d88f
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 6 16:25:41 2023 -0700

        add util func, move logic trigger to viewer panel

        Co-authored-by: Megan Riel-Mehan <[email protected]>

    commit c1d63648b33f26239bc0c6dbcf10c8ab40d3fe29
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Jun 5 09:09:44 2023 -0700

        update viewer version

    commit 48537b5658b6097bd676af4927a1219fbfe681a8
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:41:10 2023 -0700

        removing isDownloading

    commit e14f33214b9686cafc3efab3c20f250ee1f1d583
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:29:04 2023 -0700

        removing styling typo

    commit c87f78b4ec209ee227b70be3925774fb1c75d715
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:29:15 2023 -0700

        clean up comment

    commit d2f56914693f27febf85353816c13bd1dc70d15d
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 10:36:47 2023 -0700

        use viewer getasblob method, bump viewer

    commit 73bba1a3917ec6a39e38422cb1f1d8a1110a1b6d
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 31 10:58:46 2023 -0700

        update viewer

    commit e5a1a701236c89ee8d389591cc941a2c13cb08dc
    Author: Joe Heffernan <[email protected]>
    Date:   Tue May 23 15:09:04 2023 -0700

        refactor to use displayTimes

    commit 43913670e5f6ad460c6785a8a92cdb09be086612
    Author: Joe Heffernan <[email protected]>
    Date:   Mon May 22 13:06:31 2023 -0700

        truncating decimals in url

    commit c06702d8efd9f681b727c2c38eac090a22f70836
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 19 14:53:02 2023 -0700

        rename components and clean up functions

    commit 6a5ed732537cef510276bb47002601416ce741de
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu May 18 22:23:10 2023 +0000

        use href for direct download if remote file

    commit 9e50b00371b6d0edd98f266ac83c233154551932
    Author: Joe Heffernan <[email protected]>
    Date:   Thu May 18 13:18:43 2023 -0700

        ui components for share time in url

    commit 12836f56003ddd94a6aadd28e222321ea16f9a80
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:56:07 2023 -0700

        removing comments

    commit d6ebc41a3d198bfa8555b20361215301f585176d
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit 84b3681848c758bf7fb686240eda0b815185845e
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:51:47 2023 -0700

        disable button during downloading

    commit 6a14428d4d4f2910a970f4b235b5f56966b4a7f6
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:04:22 2023 -0700

        cleaning

    commit 2faf8d2f441f470587b425f6fb5cdb55b9cbb76e
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:03:06 2023 -0700

        cleanup

    commit e318c4df11cad4f3620a135cbb6af2566cc55c2c
    Author: Joe Heffernan <[email protected]>
    Date:   Thu May 4 11:53:55 2023 -0700

        styling, adding pipe divider

    commit 3538d1f15a7769f9c5f4aee54fc5db98b533e685
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 14:04:03 2023 -0700

        added download functionality

    commit 57b5c1f6c656de73a04e8b7f2ad9eecd199e28bf
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 09:15:09 2023 -0700

        intial ui components

    commit f320abe8ea3d6af93839ddd7fe244e6f7eab1960
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 0221067a635450acdef9bcbf335f30b4a80e40df
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit cc135e814a78a547edef31bcee688c35e9068112
    Author: ascibisz <[email protected]>
    Date:   Fri Apr 21 13:53:12 2023 -0700

        update version for add-to-project action

    commit ec1b5f0f741f6abab276736f913d4e388698f21a
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Apr 18 12:13:10 2023 -0700

        Update CODEOWNERS

    commit dbe5b585a8a6e56d383cc38ee1f73a40c705e484
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Apr 10 11:07:06 2023 -0700

        Bump json5 from 1.0.1 to 1.0.2 (#404)

        Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
        - [Release notes](https://github.com/json5/json5/releases)
        - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
        - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

        ---
        updated-dependencies:
        - dependency-name: json5
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* remove duplicate declaration of camera icons

* call custom request in file selection handler to account for delated state update

* Squashed commit of the following:

commit 3da20181e31c99145b711f11115b2a7d750d6d24
Author: Joe Heffernan <[email protected]>
Date:   Fri Feb 16 11:26:41 2024 -0800

    Fix/cancel file icon (#456)

    * add custom icon for remove file button

    * add color var for remove file icon

    * styling for remove file icon

    * apply background color to upload span

    * organize the stylesheet

    * change import alias and set remove icon to false

    * remove duplicate color variable

    * rename caret icon variables and imports

    * add caret svg asset

    * resize section header text

    * declare orth and persp camera icon consts

    * change remove file div to button

    * define unique icon const for cancel

    * distinguish uses of same antd icon in icons file with inline styling

commit 04c2186e7b687a454c44f2b8d1c756dea8e44766
Author: Joe Heffernan <[email protected]>
Date:   Thu Feb 15 16:56:06 2024 -0800

    commit lock file

commit 05bba98e610ddae6292c0668299f4aebed0a81d3
Author: Joe Heffernan <[email protected]>
Date:   Thu Feb 15 09:38:03 2024 -0800

    Squashed commit of the following:

    commit f3527626a0e12b131ef7c551785e6f95cbbf6b95
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Feb 14 17:42:55 2024 -0800

        Fix/bump react (#461)

        * bump react, react-waypoint, react dom, @types/react

        * declare children in sider and upload props for react 18 compatibility

        * bump @types/react-dom

        * use createRoot API to render App

        * commit lock file

        * bump to viewer 3.7.0 with react 18

        * use non-null assertion on container in createRoot call

    commit 39a6f7b7e63206bf842d9f74b6f8098d4973c86c
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Jan 29 19:28:31 2024 -0800

        Bump follow-redirects from 1.15.2 to 1.15.4 (#460)

        Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
        - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
        - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

        ---
        updated-dependencies:
        - dependency-name: follow-redirects
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 6b26307fb3ea8151e2718f95e01047da67ed5db3
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Jan 29 19:28:19 2024 -0800

        Bump plotly.js from 2.20.0 to 2.25.2 (#457)

        Bumps [plotly.js](https://github.com/plotly/plotly.js) from 2.20.0 to 2.25.2.
        - [Release notes](https://github.com/plotly/plotly.js/releases)
        - [Changelog](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md)
        - [Commits](https://github.com/plotly/plotly.js/compare/v2.20.0...v2.25.2)

        ---
        updated-dependencies:
        - dependency-name: plotly.js
          dependency-type: direct:production
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 38dda7c1349d8e044c70c839d6c8bb18eedbf34f
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jan 4 10:27:17 2024 -0800

        open aics homepage in new tab (#454)

    commit 106935b771feebabf47c0b3912a58c7068e49ab0
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Dec 19 11:51:35 2023 -0800

        Feature/color picker (#432)

        * initial components and styling

        * shrink checkbox to expose swatch

        * shrink chexbox to make swatch clickable

        * pass data into color swatch

        * remove unused styling

        * handleColorChange in picker

        * pass props and helders to color picker modal

        * add colorPicker to color swatch

        * types actions constants selectors for colorChanges

        * selector in viewer panel

        * preserve initial color in swatch

        * style parent swatch when children dont match

        * recent colors into redux

        * change modal to popover

        * update import

        * clean up stylesheets

        * tidy css and imports

        * bump viewer version

        * remove extra ?

        * update viewer

        * viewerpanel selector test update

        * update dependecies

        * add tests for getColorChanges

        * fix type imports in selectors

        * web app version

        * remove comment

        * consolidate colorpicker and popover

        * organize props and style rules

        * pointer on color swatch

        * formatting

        * color picker tooltip color to constant

        * swap replace for slice

        * debounce color selection

        * implement orthographic camera

        * initial styling of camera controls

        * ortho/perspective icons

        * define viewer button color variables

        * focus:hover state on home button

        * playback control styling

        * fix button exceeding border

        * orth/persp icons swapped

        * remove redundant ternary

        * rename set camera

        * audit fix (#437)

        * change check for if a file is shareable (#439)

        * change check for if a file is shareable

        * use constant for trajFileName

        * use selector instead of type guard

        * add unit test

        * remove accidental auto import

        * Update ux_issue.md (#433)

        * menu item and modal

        * removing logs

        * remove unneeded jsx fragment wrappers

        * remove commented code

        * styling update

        * remove comments

        * typo

        * prevent bg color change after click

        * Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

        * fix menus offsets (#440)

        * fix menus offsets

        * move version info

        * update viewer to 3.6.3

        * update viewer and fix types (#445)

        * 0.10.0

        * remove redunant line

        * implement orthographic camera

        * initial styling of camera controls

        * define viewer button color variables

        * focus:hover state on home button

        * playback control styling

        * orth/persp icons swapped

        * remove redundant ternary

        * install new viewer version

        * rename set camera

        * menu item and modal

        * removing logs

        * remove unneeded jsx fragment wrappers

        * remove commented code

        * styling update

        * remove comments

        * typo

        * Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

        * fix menus offsets (#440)

        * fix menus offsets

        * move version info

        * update viewer to 3.6.3

        * update viewer and fix types (#445)

        * pass down actions from model panel to picker

        * add hover state rules

        * pass in debouncedColor

        * [to undo] - local install

        * remove colorChangesMap

        * prevent color assignment on first opening picker

        * fix typing and save all color changes

        * make color change an object

        * install

        * store colors for correct rendering

        * add a done call

        * change interface

        * install viewer

        * update viewer

        * remove old style sheet

        * clean up styles and change order on parents

        * style children selection row

        * style labels

        * style sub menu better

        * clean up styles

        * revert change

        * make sure colors are consistently cased

        * fix imports

        * wip - not have popover move up

        * remove color swatch component and get color picker aligned with swatch

        * flx classnames

        * fix typo

        * fix checkall button

        * fix classname

        * make render functions for colorpicker

        * keep swatch constant until color is set, change label to "previous"

        * adjusting labels

        * Update src/components/CheckBoxTree/style.css

        Co-authored-by: Peyton Lee <[email protected]>

        * rename colors

        * sync children remove log

        * Fix/viewer imports (#453)

        * fix imports to be from the top level

        * update viewer

        * Update src/components/SharedCheckbox/style.css

        Co-authored-by: Cameron Fraser <[email protected]>

        * remove return

        * clean up styling

        * change names of checkboxtree components

        ---------

        Co-authored-by: Megan Riel-Mehan <[email protected]>
        Co-authored-by: Lyndsay <[email protected]>
        Co-authored-by: Blair Lyons <[email protected]>
        Co-authored-by: Peyton Lee <[email protected]>
        Co-authored-by: Cameron Fraser <[email protected]>

    commit 7bfdc1f9a394bd67ea56f8ff40ca63b2e290fab4
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Fri Dec 8 14:21:10 2023 -0800

        Bump @adobe/css-tools from 4.3.1 to 4.3.2 (#449)

        Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2.
        - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
        - [Commits](https://github.com/adobe/css-tools/commits)

        ---
        updated-dependencies:
        - dependency-name: "@adobe/css-tools"
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 37a5fee141d3b523fb6de69642c2119a84615558
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 14:18:05 2023 -0800

        Update test-coverage.yml

    commit f9267547f03c707b4cf3c91130658b78e35da67c
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 14:15:46 2023 -0800

        Update test-coverage.yml

    commit 16de0a0461fb7e9107fa1e0ea3bda52472e83aaa
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Fri Dec 8 14:03:32 2023 -0800

        Bump axios from 0.21.4 to 1.6.0 (#447)

        Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0.
        - [Release notes](https://github.com/axios/axios/releases)
        - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
        - [Commits](https://github.com/axios/axios/compare/v0.21.4...v1.6.0)

        ---
        updated-dependencies:
        - dependency-name: axios
          dependency-type: direct:production
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
        Co-authored-by: meganrm <[email protected]>

    commit 8fad286617be73b7b03ac9b108c8b2eef1bc203d
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 13:53:25 2023 -0800

        check if it's a dependabot PR (#450)

    commit 4d149c8b99e72959d9ac2ff001efc5cf314d9661
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Dec 4 13:35:30 2023 -0800

        Bump @babel/traverse from 7.20.5 to 7.23.2 (#442)

        Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.20.5 to 7.23.2.
        - [Release notes](https://github.com/babel/babel/releases)
        - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
        - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

        ---
        updated-dependencies:
        - dependency-name: "@babel/traverse"
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit b432dff1b97833e5bfc94e9b5cac7dc0fbb19711
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Nov 29 13:34:18 2023 -0800

        Fix/share download styling (#448)

        * add color

        * remove pipe and fix button order

        * fix download button styling

        * fix share button styling

        * remove whitespace

        * change hover state selector to sync with tooltip

        * turn functions to boolean constants

        * streamline tooltip constants

        * move btn styles to appheader

    commit c6eaea3d3c81c88c240ee1e8c1e4825d8fe5545e
    Author: Blair Lyons <[email protected]>
    Date:   Mon Oct 23 11:06:47 2023 -0700

        0.10.0

    commit f13dcb01b32c16f2d0f5853c7f890ab566a06244
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Oct 20 12:46:48 2023 -0700

        update viewer and fix types (#445)

    commit 4baff29420c6a06647a08b5c57e64ad88ad09a86
    Author: Blair Lyons <[email protected]>
    Date:   Thu Oct 19 14:49:46 2023 -0700

        update viewer to 3.6.3

    commit ca5ac248433cc26a66fa09a546332cae8d80c2b5
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Oct 16 10:41:45 2023 -0700

        fix menus offsets (#440)

        * fix menus offsets

        * move version info

    commit 244e7268c91a42d2dcfb9da61bc28f2b6b423689
    Merge: 60326cf 836510a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Oct 11 13:32:07 2023 -0700

        Merge pull request #423 from simularium/feature/version-info

        Feature/version info

    commit 836510a92366a61ef1dbc455f17838f92a638322
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Oct 11 11:47:54 2023 -0700

        Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

    commit caac57be991dc3dfaf79ff426e13ba6854c6ab03
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Oct 10 12:51:42 2023 -0700

        prevent bg color change after click

    commit 23be0d4f7ed526a3853889940727a9dd21cbbc19
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 15:27:12 2023 -0700

        typo

    commit 141b0370f42b3ee2b4345d56fe2e4db9e6fff2ab
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:34:44 2023 -0700

        remove comments

    commit 8dcccc1a3688e7528923670aa8f0611ae7283376
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:34:28 2023 -0700

        styling update

    commit 4c215c7ab876e546ec546b3712d88a83cfa79393
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:14:01 2023 -0700

        remove commented code

    commit 72c2e8d2ab548ee36829775a608e0dda5d3116f4
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:10:35 2023 -0700

        remove unneeded jsx fragment wrappers

    commit dcff5c8b8fd4842b72e53e100c76e1b79d23c178
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:27:55 2023 -0700

        removing logs

    commit 3e9d57898ff065c37ea5bc2dcacf9deda19442af
    Author: Joe Heffernan <[email protected]>
    Date:   Tue May 23 10:56:42 2023 -0700

        menu item and modal

    commit 60326cfa9649737d21bae5388626c5fd1bfa0d65
    Author: Lyndsay <[email protected]>
    Date:   Mon Oct 9 12:57:20 2023 -0700

        Update ux_issue.md (#433)

    commit 72f1a233d73b64eabc86b30426cace6c727bee2c
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Oct 9 12:57:08 2023 -0700

        change check for if a file is shareable (#439)

        * change check for if a file is shareable

        * use constant for trajFileName

        * use selector instead of type guard

        * add unit test

        * remove accidental auto import

    commit 67f2f582cffb3537bd1d47ad37caf0866f1137bf
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu Oct 5 13:28:50 2023 -0700

        audit fix (#437)

    commit af14d0126f590813ee1afab5ec39ad1b91727235
    Merge: 1314eed a78dee4
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Sep 8 14:50:10 2023 -0700

        Merge pull request #430 from simularium/feature/orthographic-ui

        Feature/orthographic UI

    commit a78dee40c3be10ee554e2e13e0aef260845d4775
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Sep 8 09:21:09 2023 -0700

        rename set camera

    commit 49598cce511597bd3a4e0c15d55349f20ffb5226
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 28 19:00:29 2023 -0700

        install new viewer version

    commit d5b84407f5bcb81e3d7391b14ee69d286a0d4924
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 17 16:16:45 2023 -0700

        remove redundant ternary

    commit aa0fc41db95e9c76ee400f8f8a236d9acc23bd02
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 17 16:15:09 2023 -0700

        orth/persp icons swapped

    commit 1b92d704738a9cee82e5b102f46890790d72d23c
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Aug 16 13:50:33 2023 -0700

        fix button exceeding border

    commit 4969ca95427ba0ba1901cd8950eab975cd28a636
    Merge: 29137a3 1314eed
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Aug 16 13:28:05 2023 -0700

        Merge branch 'main' into feature/orthographic-ui
        merging main

    commit 29137a35c6bc9bc8b03c2da7c639da36d390a3ed
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 14 13:01:55 2023 -0700

        playback control styling

    commit 8756d054f27ed2c5e14af0d2f0f9410e81a9dd53
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 14 13:00:59 2023 -0700

        focus:hover state on home button

    commit 4506ce9a66fd55978cbdc27d4bf08dbacce98fcb
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:26:56 2023 -0700

        define viewer button color variables

    commit f3cc830f8f9aa341b57a7da9459ab2cbab7d63ed
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:25:50 2023 -0700

        ortho/perspective icons

    commit b23d847486f97313b163895ca4fdd28014e9ea7a
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:25:26 2023 -0700

        initial styling of camera controls

    commit fab18400bbefc0d77ec38c9654abd061da539b7f
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:23:15 2023 -0700

        implement orthographic camera

    commit 1314eed2438057c99f4781aea5701ae030073435
    Merge: 2c949aa b9c37b2
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jul 20 16:37:06 2023 -0700

        Merge pull request #424 from simularium/feature/share-time-url

        Feature/share time url

    commit b9c37b25a5b0b204b038bc30f3273462667b6f4c
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jul 20 13:19:13 2023 -0700

        tooltip handler edit, fix alignment on time input

    commit 2c949aa0dd71ddd3910a7b388ae31dcf67d4677e
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Jul 17 14:56:28 2023 -0700

        Update CODEOWNERS

    commit 81bce369c106e6c1988086b36c98667297e917f5
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Jul 11 16:17:20 2023 -0700

        change gh-deploy to be a dev build (#426)

    commit 01468c302c6036a6b2f8e1f94912cd5514367c23
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Jul 11 16:17:03 2023 -0700

        Update CONTRIBUTING.md (#425)

    commit 5ad5660739b4d9146248ef761373c4a45d81c725
    Merge: 0b79159 5dda5da
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 17:41:25 2023 -0700

        Merge branch 'feature/share-time-url' of https://github.com/simularium/simularium-website into feature/share-time-url

    commit 0b791599d674a611fc8b51e723459cdb476253cf
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 17:41:18 2023 -0700

        reduce annotations

    commit 5dda5da83e2ce5916053e73c6db3221f9be5ae5c
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 15:13:51 2023 -0700

        update return type receiveTimeChange

    commit 5113dfe6354ca147638230ad1a826749089df6df
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 13:57:59 2023 -0700

        update test

    commit 1e226e8568f770b1da7bb55de34c91637f45988e
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 13:48:29 2023 -0700

        test for editUrlParams and clean up

    commit b93f789f62b53ff63071d1fefc1efc2de04990fd
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 12:19:00 2023 -0700

        changed names of functions

    commit 6dfe513646e789a4e1b974c27baa0d94b276db79
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:58:00 2023 -0700

        gh actions from ubuntu to macos

    commit 1d1b73acbb480ab348ef122ac73e9bae5496b789
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:57:14 2023 -0700

        add jest coverage reporters

    commit 9a62549b0ac8603734d1dc8f9e8d83c6a53460cf
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:50:41 2023 -0700

        update jest

    commit d58b4c6d8140ded3934014caf0bec8a5a2bf97b8
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:48:56 2023 -0700

        update jest coverage

    commit 0da60eba553c7963e7dc1da32cac2835d0c6614e
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Jun 26 12:15:10 2023 -0700

        ternary -> object, styling names, add href

    commit b0f81cef84ae7de2b29cc537d132a5305e33f521
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 23 15:17:45 2023 -0700

        initial unit test

    commit ecb0b9af9424f61628ab905d14c813490be407bd
    Merge: fb2a54f 918556c
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:48:15 2023 -0700

        Merge branch 'main' into feature/share-time-url

    commit fb2a54fd82bbaabe469777d48d4e05f7e893a347
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:11:04 2023 -0700

        space share and download buttons

    commit 0245f777780f49d9f228313ce194c347904f985a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:07:33 2023 -0700

        move tooltip

    commit f92904682d012882b6c4da3263716d0e07f5d308
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 04deea2157e7f2a24f1784bb5401629955c1c6a2
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit ee811e772efbd977f06c0a0c6a4684a1946f4ffc
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 9e177810a6ba3ef44bb156dcf953bc45e0ce45aa
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit 2166dc1d9bdcf5b6758990b74cad2cd9f6d38a3b
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 820afcab6247673362326e568b893e83dc1d59f6
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit ce60a9d48719915b05311eada47c512983952487
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 41ea8875e6f5389cc0007951b2e1c827ee35d577
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit 305955e3752d46981780046fdb9fee9ab27c68b8
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 20 15:48:53 2023 -0700

        move tooltip and unessary async

    commit 6b21353a71def1829d825ac62613aa74f4d9cdac
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:06:24 2023 -0700

        remove comment

    commit f794da1d1ceb797420f074ca3843df286299a429
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:41:10 2023 -0700

        removing isDownloading

    commit 70db90b4cd5951d005a30bd0b94e3222d5b64d19
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:29:04 2023 -0700

        removing styling typo

    commit 5b516c044054ef0fa9046c21fc2047e9ae026449
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:29:15 2023 -0700

        clean up comment

    commit 8c2ac5e02225ff63e0cba32f6006fbc8f80f87aa
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 10:36:47 2023 -0700

        use viewer getasblob method, bump viewer

    commit a1dfdb1d9e774e79a1bf9cacd765e59f62ece676
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu May 18 22:23:10 2023 +0000

        use href for direct download if remote file

    commit b2e1bad5aaeb4d23454e539667c73250199bf62d
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:56:07 2023 -0700

        removing comments

    commit 8ff2ad88358540251c55d21610ef599913342489
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:51:47 2023 -0700

        disable button during downloading

    commit 4448920df8e72875244e14f3c44b7c3a0a5fdd53
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:04:22 2023 -0700

        cleaning

    commit 2a7b3d18da5b9df45ff4ac2bddf4806bb060b8f9
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:03:06 2023 -0700

        cleanup

    commit 00fcfb43689221e1725e0413679161c4753e3f07
    Author: Joe Heffernan <[email protected]>
    Date:   Thu May 4 11:53:55 2023 -0700

        styling, adding pipe divider

    commit dbd6322e7…

Loading branch information

3 people authored Mar 22, 2024

1 parent b27e6fe commit efc3f61

src/components/ConversionProcessingOverlay/index.tsx

-Original file line number
+Diff line change
@@ -1,19 +1,19 @@
     import React, { useState } from "react";
     import { Button, Divider, Spin } from "antd";
+    import ConversionCancelModal from "../ConversionCancelModal";
     import { UpRightArrow, LeftArrow } from "../Icons";
     import styles from "./style.css";
-    import ConversionCancelModal from "../ConversionCancelModal";
     interface ConversionProcessingOverlayProps {
-        toggleProcessing: () => void;
         fileName: string | null;
+        cancelProcessing: () => void;
     }
     const ConversionProcessingOverlay = ({
-        toggleProcessing,
         fileName,
+        cancelProcessing,
     }: ConversionProcessingOverlayProps): JSX.Element | null => {
         const [cancelModalOpen, setCancelModalOpen] = useState(false);
@@ Expand All / @@ -26,7 +26,7 @@ const ConversionProcessingOverlay = ({ @@
                 {cancelModalOpen ? (
                     <ConversionCancelModal
                         continueProcessing={toggleCancelling}
-                        cancelProcessing={toggleProcessing}
+                        cancelProcessing={cancelProcessing}
                     />
                 ) : null}
                 <h2 className={styles.title}> File conversion in progress </h2>
@@ Expand Down @@

src/components/LoadFileMenu/index.tsx

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -10,9 +10,10 @@ import {
  
        ConversionStatus,

        RequestLocalFileAction,

        RequestNetworkFileAction,

        SetConversionStatusAction,

    } from "../../state/trajectory/types";

    import { TrajectoryDisplayData } from "../../constants/interfaces";

    import { IMPORT_PATHNAME, VIEWER_PATHNAME } from "../../routes";

    import { VIEWER_PATHNAME } from "../../routes";

    import FileUploadModal from "../FileUploadModal";

    import { DownArrow } from "../Icons";

    import {

    @@ -21,7 +22,10 @@ import {
  
    } from "../../state/viewer/types";

    import styles from "./style.css";

    import { CONVERSION_INACTIVE } from "../../state/trajectory/constants";

    import {

        CONVERSION_INACTIVE,

        CONVERSION_NO_SERVER,

    } from "../../state/trajectory/constants";

    interface LoadFileMenuProps {

        isBuffering: boolean;

    @@ -31,6 +35,7 @@ interface LoadFileMenuProps {
  
        setViewerStatus: ActionCreator<SetViewerStatusAction>;

        setError: ActionCreator<SetErrorAction>;

        conversionStatus: ConversionStatus;

        setConversionStatus: ActionCreator<SetConversionStatusAction>;

    }

    const LoadFileMenu = ({

    @@ -41,6 +46,7 @@ const LoadFileMenu = ({
  
        setViewerStatus,

        setError,

        conversionStatus,

        setConversionStatus,

    }: LoadFileMenuProps): JSX.Element => {

        const [isModalVisible, setIsModalVisible] = useState(false);

        const location = useLocation();

    @@ -53,6 +59,10 @@ const LoadFileMenu = ({
  
            setIsModalVisible(true);

        };

        const openConversionForm = () => {

            setConversionStatus({ status: CONVERSION_NO_SERVER });

        };

        const onClick = (trajectoryData: TrajectoryDisplayData) => {

            if (location.pathname === VIEWER_PATHNAME) {

                selectFile({

    @@ -96,9 +106,8 @@ const LoadFileMenu = ({
  
                key: "file-convert",

                label: (

                    <Link

                        to={{

                            pathname: IMPORT_PATHNAME,

                        }}

                        onClick={openConversionForm}

                        to={{ pathname: VIEWER_PATHNAME }}

                    >

                        Import other file type

                    </Link>

src/containers/AppHeader/index.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ import { @@
         NetworkedSimFile,
         RequestLocalFileAction,
         RequestNetworkFileAction,
+        SetConversionStatusAction,
     } from "../../state/trajectory/types";
     import LoadFileMenu from "../../components/LoadFileMenu";
     import ViewerTitle from "../../components/ViewerTitle";
@@ Expand Down Expand Up / @@ -39,6 +40,7 @@ interface AppHeaderProps { @@
         setViewerStatus: ActionCreator<SetViewerStatusAction>;
         setError: ActionCreator<SetErrorAction>;
         conversionStatus: ConversionStatus;
+        setConversionStatus: ActionCreator<SetConversionStatusAction>;
     }
     class AppHeader extends React.Component<AppHeaderProps> {
@@ Expand All / @@ -53,6 +55,7 @@ class AppHeader extends React.Component<AppHeaderProps> { @@
                 setError,
                 isNetworkedFile,
                 conversionStatus,
+                setConversionStatus,
             } = this.props;
             let lastModified = 0;
             let displayName = "";
@@ Expand Down Expand Up / @@ -92,6 +95,7 @@ class AppHeader extends React.Component<AppHeaderProps> { @@
                             isBuffering={isBuffering}
                             setError={setError}
                             conversionStatus={conversionStatus}
+                            setConversionStatus={setConversionStatus}
                         />
                         <HelpMenu key="help" />
                         <div className={styles.actionButtons}>
@@ Expand Down Expand Up / @@ -130,6 +134,7 @@ const dispatchToPropsMap = { @@
         clearSimulariumFile: trajectoryStateBranch.actions.clearSimulariumFile,
         setViewerStatus: viewerStateBranch.actions.setStatus,
         setError: viewerStateBranch.actions.setError,
+        setConversionStatus: trajectoryStateBranch.actions.setConversionStatus,
     };
     export default connect(mapStateToProps, dispatchToPropsMap)(AppHeader);

src/containers/ConversionForm/custom-request.ts

-Original file line number
+Diff line change
@@ -1,19 +1,22 @@
-    import {
-        UploadRequestOption,
-    } from "rc-upload/lib/interface";
+    import { UploadRequestOption } from "rc-upload/lib/interface";
     import { ViewerError } from "../../state/viewer/types";
     import { ErrorLevel, FrontEndError } from "@aics/simularium-viewer";
     import { ReceiveFileToConvertAction } from "../../state/trajectory/types";
     export default async (
         fileToConvert: any,
-        receiveFileToConvert: (file: string) => ReceiveFileToConvertAction,
+        receiveFileToConvert: (
+            fileContents: string,
+            fileName: string
+        ) => ReceiveFileToConvertAction,
         setError: (error: ViewerError) => void,
         rcRequest?: UploadRequestOption
     ) => {
         try {
             const unpackedFileText = await fileToConvert.originFileObj.text();
-            receiveFileToConvert(unpackedFileText);
+            const fileExtensionRegex = /\.[^/.]+$/;
+            const fileName = fileToConvert.name.replace(fileExtensionRegex, "");
+            receiveFileToConvert(unpackedFileText, fileName);
             if (rcRequest?.onSuccess) {
                 rcRequest.onSuccess(
                     {
@@ Expand All / @@ -35,8 +38,5 @@ export default async ( @@
                 message = String(error);
             }
             setError({ level, message, htmlData: "" });
         }
-    }
+    };

src/containers/ConversionForm/index.tsx

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -10,39 +10,41 @@ import trajectoryStateBranch from "../../state/trajectory";
  
    import viewerStateBranch from "../../state/viewer";

    import {

        ConversionStatus,

        ConvertFileAction,

        InitializeConversionAction,

        ReceiveFileToConvertAction,

        SetConversionEngineAction,

        SetConversionStatusAction,

    } from "../../state/trajectory/types";

    import { SetErrorAction } from "../../state/viewer/types";

    import {

        AvailableEngines,

        ConversionProcessingData,

        ExtensionMap,

        Template,

        TemplateMap,

    } from "../../state/trajectory/conversion-data-types";

    import ConversionServerErrorModal from "../../components/ConversionServerErrorModal";

    import ConversionProcessingOverlay from "../../components/ConversionProcessingOverlay";

    import ConversionServerErrorModal from "../../components/ConversionServerErrorModal";

    import ConversionFileErrorModal from "../../components/ConversionFileErrorModal";

    import { Cancel, DownCaret } from "../../components/Icons";

    import { CONVERSION_NO_SERVER } from "../../state/trajectory/constants";

    import {

        CONVERSION_ACTIVE,

        CONVERSION_INACTIVE,

        CONVERSION_NO_SERVER,

    } from "../../state/trajectory/constants";

    import customRequest from "./custom-request";

    import theme from "../../components/theme/light-theme.css";

    import styles from "./style.css";

    interface ConversionProps {

        setConversionEngine: ActionCreator<SetConversionEngineAction>;

        conversionProcessingData: {

            template: Template;

            templateMap: TemplateMap;

            fileToConvert: string;

            engineType: AvailableEngines;

        };

        conversionProcessingData: ConversionProcessingData;

        receiveFileToConvert: ActionCreator<ReceiveFileToConvertAction>;

        setError: ActionCreator<SetErrorAction>;

        initializeConversion: ActionCreator<InitializeConversionAction>;

        convertFile: ActionCreator<ConvertFileAction>;

        conversionStatus: ConversionStatus;

        setConversionStatus: ActionCreator<SetConversionStatusAction>;

    }

    const validFileExtensions: ExtensionMap = {

    @@ -70,40 +72,52 @@ const ConversionForm = ({
  
        receiveFileToConvert,

        initializeConversion,

        conversionStatus,

        convertFile,

        setConversionStatus,

    }: ConversionProps): JSX.Element => {

        const [fileToConvert, setFileToConvert] = useState<UploadFile | null>();

        const [engineSelected, setEngineSelected] = useState<boolean>(false);

        const [serverDownModalOpen, setServerIsDownModalOpen] =

            useState<boolean>(false);

        const [isProcessing, setIsProcessing] = useState<boolean>(false);

        const [serverErrorModalOpen, setServerErrorModalOpen] =

            useState<boolean>(false);

        const [fileTypeErrorModalOpen, setFileTypeErrorModalOpen] = useState(false);

        const engineSelected = !!conversionProcessingData.engineType;

        useEffect(() => {

            // on page load assume server is down until we hear back from it

            setConversionStatus({ status: CONVERSION_NO_SERVER });

            initializeConversion();

        }, []);

        // TODO delete after development, useEffect to log a change in server health

        useEffect(() => {

            console.log(conversionStatus);

            // this is to account for the server going down while a conversion is in process

            if (isProcessing && conversionStatus === CONVERSION_NO_SERVER) {

                setIsProcessing(false);

                setServerErrorModalOpen(true);

            }

        }, [conversionStatus]);

        // callbacks for state variables

        const toggleServerCheckModal = () => {

            setServerIsDownModalOpen(!serverDownModalOpen);

            setServerErrorModalOpen(!serverErrorModalOpen);

        };

        const toggleFileTypeModal = () => {

            setFileTypeErrorModalOpen(!fileTypeErrorModalOpen);

        };

        const toggleProcessing = () => {

            setIsProcessing(!isProcessing);

        const cancelProcessing = () => {

            setIsProcessing(false);

            setConversionStatus({ status: CONVERSION_NO_SERVER });

        };

        const cancelConversion = () => {

            setConversionStatus({ status: CONVERSION_INACTIVE });

        };

        const handleEngineChange = (selectedValue: string) => {

            const selectedEngine = selectedValue as AvailableEngines;

            setConversionEngine(selectedEngine);

            setEngineSelected(true);

        };

        const handleRemoveFile = () => {

    @@ -130,17 +144,20 @@ const ConversionForm = ({
  
            return false;

        };

        const advanceIfServerIsHealthy = () => {

        const sendFileToConvert = () => {

            if (

                engineSelected &&

                fileToConvert &&

                validateFileType(fileToConvert.name)

            ) {

                if (conversionStatus === CONVERSION_NO_SERVER) {

                    setServerIsDownModalOpen(true);

                    setServerErrorModalOpen(true);

                } else {

                    // at this point: engine selected, file uploaded, file type valid, server health received

                    // we now use this local state lets us distinguish between arriving on this page normally

                    // and arriving here because the server went down while a conversion was in process

                    setIsProcessing(true);

                    setConversionStatus({ status: CONVERSION_ACTIVE });

                    convertFile();

                }

            }

        };

    @@ -154,7 +171,7 @@ const ConversionForm = ({
  
        console.log("conversion form data", conversionProcessingData);

        const conversionForm = (

            <div className={classNames(styles.container, theme.lightTheme)}>

                {serverDownModalOpen && (

                {serverErrorModalOpen && (

                    <ConversionServerErrorModal

                        closeModal={toggleServerCheckModal}

                    />

    @@ -165,10 +182,10 @@ const ConversionForm = ({
  
                        engineType={conversionProcessingData.engineType}

                    />

                )}

                {isProcessing && (

                {conversionStatus === CONVERSION_ACTIVE && (

                    <ConversionProcessingOverlay

                        toggleProcessing={toggleProcessing}

                        fileName={fileToConvert ? fileToConvert?.name : null}

                        fileName={conversionProcessingData.fileName}

                        cancelProcessing={cancelProcessing}

                    />

                )}

                <div className={styles.formContent}>

    @@ -219,12 +236,14 @@ const ConversionForm = ({
  
                            </button>

                        )}

                    </div>

                    <Divider orientation="right" orientationMargin={400}/>

                    <Button ghost>Cancel</Button>

                    <Divider orientation="right" orientationMargin={400} />

                    <Button ghost onClick={cancelConversion}>

                        Cancel

                    </Button>

                    <Button

                        type="primary"

                        disabled={!fileToConvert || !engineSelected}

                        onClick={advanceIfServerIsHealthy}

                        onClick={sendFileToConvert}

                    >

                        Next

                    </Button>

    @@ -249,6 +268,8 @@ const dispatchToPropsMap = {
  
        setError: viewerStateBranch.actions.setError,

        setConversionEngine: trajectoryStateBranch.actions.setConversionEngine,

        initializeConversion: trajectoryStateBranch.actions.initializeConversion,

        convertFile: trajectoryStateBranch.actions.convertFile,

        setConversionStatus: trajectoryStateBranch.actions.setConversionStatus,

    };

    export default connect(mapStateToProps, dispatchToPropsMap)(ConversionForm);

src/containers/ConversionForm/style.css

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     .container {
+        position: absolute;
         background-color: var(--overlay-purple);
         height: calc(100vh - var(--header-height));
         width: 100%;
@@ Expand Down @@

0 comments on commit `efc3f61`

Please sign in to comment.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

0 comments on commit `efc3f61`

Commit

There are no files selected for viewing

0 comments on commit efc3f61

0 comments on commit `efc3f61`