Skip to content

SNPRC Scheduler project updates#858

Merged
labkey-martyp merged 38 commits intorelease25.7-SNAPSHOTfrom
25.7_fb_scheduler_updates
Apr 16, 2026
Merged

SNPRC Scheduler project updates#858
labkey-martyp merged 38 commits intorelease25.7-SNAPSHOTfrom
25.7_fb_scheduler_updates

Conversation

@labkey-martyp
Copy link
Copy Markdown
Contributor

@labkey-martyp labkey-martyp commented Nov 18, 2025

Rationale

Bring SNPRC Scheduler React project up to date with update packages and webpack build.

Changes

  • Factor out unnecessary and unsupported packages
  • Update all other packages to latest versions (including react, redux and react-dnd)
  • Update webpack build to use standard @labkey/build
  • Update entrypoint and production/dev server entry points
  • Many refactors associated with package updates including bootstrap and react-data-grid updates
  • Refactor all grids using react-bootstrap-table to instead use react-data-grid
  • Start conversion of JS and JSX files to TS and TSX
  • Update jest tests to new libraries and webpack

@labkey-martyp labkey-martyp self-assigned this Nov 19, 2025
@labkey-robert labkey-robert added this to the 25.07 milestone Jan 2, 2026
"addTimelineItem(timelineId: " +
timeline.TimelineId +
", animalId: " +
id +
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

What is this id variable? I don't see it declared

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Must have been a copy paste error. Fixed now.

INNER JOIN ehr.project as ep on p.ReferenceId = ep.project
INNER JOIN study.assignment as a on ep.protocol = a.protocol
LEFT JOIN study.deaths as d on d.Id = a.Id
LEFT JOIN study.departure as dep on dep.Id = a.Id
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

If an animal has multiple departure records, a left join could be bringing back multiple rows for one animal

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok got it. I didn't know you guys supported multiple departures. I updated this to grab the most recent departure. Let me know if that's not what you'd want to see.

Comment thread snprc_scheduler/package.json
export function filterAnimals(pattern) {
if (verboseOutput) console.log("filterAnimals(" + pattern + ")");
return (dispatch) => {
dispatch(createAction(ANIMAL_LIST_FILTERED, pattern));
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

ANIMAL_LIST_FILTERED is not a declared const. Possibly missed this one after a name change to the variable?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this was part of some dead code that is now removed

// New items must be within the current revision's start/end dates
if (scheduleDate.before(startDate) || scheduleDate.after(endDate))
{
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This dateFormat is re-instantiated multiple times inside this for loop but can be a single local variable outside the loop

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fixed

@RameshRapa RameshRapa self-requested a review April 14, 2026 14:48
@labkey-martyp labkey-martyp merged commit a5e080f into release25.7-SNAPSHOT Apr 16, 2026
11 checks passed
@labkey-martyp labkey-martyp deleted the 25.7_fb_scheduler_updates branch April 16, 2026 02:01
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.

4 participants