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.

Sign up for GitHub

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

Jump to bottom

Sequence Templates #1638

Draft
wants to merge 96 commits into
base: develop
Choose a base branch
from
Draft

Sequence Templates #1638

wants to merge 96 commits into from

Conversation

cartermak
Copy link
Member

@cartermak cartermak commented Mar 3, 2025 •
edited
Loading

  • Merge strategy: Merge (no squash)
    -->

Description

Verification

Manual Testing Procedure

  • Make a fresh Aerie deployment
  • Use the corresponding UI branch in local development mode
  • Upload a mission model (e.g. banananation)
  • Upload a command dictionary
  • Make a parcel
  • Make a new template with the contents R00:00:00 GROW_BANANA 0 0
  • Make a plan
  • Add an activity
  • Simulate
  • Navigate to sequencing panel
  • Create a sequence filter
  • ... etc

Documentation

Outstanding Work

What do we need to do before this is ready to go?

  • Testing
  • Code cleanup (var naming, clean up commits, rebase or merge from develop)

Future work

Open tickets for:

  • Refactor SeqN parsing to a separate NPM package that can be shared by UI and sequencing server (I started this on the side: https://github.com/cartermak/aerie-seq-utils)
  • Clean up the Parcels story (set "language" as a property of parcels?)
  • Some user research/feedback?

@mattdailis mattdailis changed the base branch from develop to feature/external-source-event-attributes March 3, 2025 23:04
pranav-super and others added 25 commits March 4, 2025 13:21
@pranav-super @mattdailis
sequence template route WIP
994eebb
@pranav-super @mattdailis
expand mustache/handlebar functionality from https://github.com/NASA-…
b91c7a9 
…AMMOS/sequence-template-mustache-prototype
@JosephVolosin @mattdailis
Add filter to sequence
d4728dc
@JosephVolosin @mattdailis
Initial association attempt for sequences => model/plan
22e66aa
@JosephVolosin @mattdailis
Fix bad permissions on user sequence specifications
c515307
@JosephVolosin @mattdailis
Initial draft of sequence_definition table
4b96e61
@pranav-super @mattdailis
add sequence_template table
7b976a7
@pranav-super @mattdailis
sequence templates now pulled from database
372f0c4
@JosephVolosin @mattdailis
Refactor SequenceDefintiion => SequenceFilter
03a64e0
@pranav-super @mattdailis
add sequenceTemplateBatchLoader.ts
f532a47
@pranav-super @mattdailis
introduce expanded template table and persist results to it
ed2c6d4
@pranav-super @mattdailis
introduce filtering logic, WIP
1064cc5
@pranav-super @mattdailis
refactor filtering and database logic, effectively only using new tab…
51167fd 
…les and removing references to legacy sequence logic
@pranav-super @mattdailis
add parcelId as necessary and uniquely identifying parameter to templ…
63cd4cc 
…ate expansion
@pranav-super @mattdailis
add uniqueness constraints to expanded_templates.sql and sequence_tem…
cdfa6fc 
…plate.sql
@pranav-super @mattdailis
update template expansion
98e7877
@pranav-super @mattdailis
add assignActivitiesByFilter endpoint
cff6308
@pranav-super @mattdailis
make expandTemplates use seqId
a729a02
@pranav-super @mattdailis
add time range filtration
ffa0f2e
@pranav-super @mattdailis
figure out a more comprehensive activity parameter handling scheme in…
3b57e53 
… expansion
@pranav-super @mattdailis
forgot this file
f8776ff
@pranav-super @mattdailis
expanded_template should be a string, not jsonb
472c682
@cartermak @mattdailis
WIP bodging in SeqN to SeqJSON parsing...
547a3e7
@cartermak @mattdailis
Cleaned up bodge a bit
b615d30
@cartermak @mattdailis
More bodging
9c0c5ca
@cartermak
Expected test changes from seqJsonBuilder
cc215a1 
We modified the logic shared between legacy CE and template expansion for merging SeqJSON fragments to run time conversion and sorting even on single-activity expansions. Beforehand, single-activity expansions would not get their times converted, nor would their commands be sorted.
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@DavidLegg DavidLegg self-requested a review March 13, 2025 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattdailis mattdailis mattdailis left review comments

@DavidLegg DavidLegg Awaiting requested review from DavidLegg

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cartermak @mattdailis @JosephVolosin @pranav-super