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

[To Main] Feature/DESENG-445: engagement filtering by metadata #2444

Merged
merged 43 commits into from
Apr 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7be03fc
Engagement Metadata Management - API changes
NatSquared Feb 9, 2024
f8bc363
DESENG-452 : Applying pending migrations (#2378)
ratheesh-aot Feb 9, 2024
f764cb1
DESENG-484: Adding max age for cors (#2379)
VineetBala-AOT Feb 12, 2024
6c946ba
Engagement Metadata Management - API changes
NatSquared Feb 9, 2024
21ba1e2
edit migration order to merge with migration changes
NatSquared Feb 13, 2024
4ff5307
Backend changes for DESENG-443
NatSquared Mar 7, 2024
9871f57
Frontend changes for deseng-443
NatSquared Mar 7, 2024
202ade8
Remove metadata references from frontend unit tests
NatSquared Mar 7, 2024
95b095c
Update Changelog
NatSquared Mar 7, 2024
85f7233
Update unit tests to handle metadata as an array
NatSquared Mar 7, 2024
3fd43ea
Clean up unused imports from frontend files
NatSquared Mar 7, 2024
942a009
Add ticket links to changelog
NatSquared Mar 8, 2024
c3c5041
Merge branch 'main' into feature/deseng-443/ui-implementation
NatSquared Mar 9, 2024
b933803
Adapt metadata to changes from main
NatSquared Mar 9, 2024
09462ed
Format and save date properly
NatSquared Mar 11, 2024
4e2bfcc
Save changes stably without re-renders
NatSquared Mar 11, 2024
abb99d1
Merge changes from main
NatSquared Mar 11, 2024
a2e6162
Python: fix lint errors
NatSquared Mar 11, 2024
331a540
Apply suggestions from JS linter; update migration file
NatSquared Mar 11, 2024
43127af
More lint errors fixed
NatSquared Mar 11, 2024
b649ae7
Hopefully the final lint errors fixed
NatSquared Mar 11, 2024
9c303f7
String conversion hotfix
NatSquared Mar 11, 2024
bcbdddb
Flake8 validation - attempt 1
NatSquared Mar 11, 2024
d9bc58b
Flake8 validation - attempt 2
NatSquared Mar 11, 2024
60cda11
Patch jest tests
NatSquared Mar 11, 2024
31bcd8b
Patch jest tests again (sorry)
NatSquared Mar 11, 2024
3fb3746
Fix lint warnings, remove commented code, enhance accessibility (PR r…
NatSquared Mar 13, 2024
3dfb1da
Merge branch 'main' into feature/deseng-443/ui-implementation... again
NatSquared Mar 13, 2024
bf6abb1
Fix sonarcloud linting; aria accessibility tweaks
NatSquared Mar 13, 2024
1db888f
Ensure proper sequence of flask migration files
NatSquared Mar 13, 2024
ce29ef5
[To Feature] DESENG-445/backend (#2430)
NatSquared Apr 2, 2024
a2662e6
[To Feature] DESENG-445/frontend (#2436)
NatSquared Apr 4, 2024
1a4a1b0
Merge branch 'main' into feature/DESENG-445-engagement-filtering-by-m…
NatSquared Apr 4, 2024
c8623ac
Remove newly extraneous translation keys
NatSquared Apr 4, 2024
7564167
Duplicate filter translation components into gdx.json :<
NatSquared Apr 4, 2024
5347d98
Move metadata revision to after other revisions
NatSquared Apr 4, 2024
f34150b
Fix merge from main
NatSquared Apr 5, 2024
26d966a
Stop admin users being redirected to a language URL on login
NatSquared Apr 5, 2024
2165a19
Fix some linter errors
NatSquared Apr 5, 2024
cc93b0b
Merge branch 'main' into feature/DESENG-445-engagement-filtering-by-m…
NatSquared Apr 5, 2024
37fb21f
"isort"ed my files
NatSquared Apr 5, 2024
57824ab
remove duplicate date heading from changelog
NatSquared Apr 5, 2024
e2eb80b
Apply MET styleguide colors to MUI Select element
NatSquared Apr 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move metadata revision to after other revisions
NatSquared committed Apr 4, 2024
commit 5347d984979e1504bedd1680846f9533439143b3
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Add metadata filters to the engagement metadata taxa table.

Revision ID: f8bc8ce202f3
Revises: c4f7189494ed
Revises: 734f160dd120
Create Date: 2024-03-21 13:02:12.680363

"""
@@ -11,7 +11,7 @@

# revision identifiers, used by Alembic.
revision = 'f8bc8ce202f3'
down_revision = 'c4f7189494ed'
down_revision = '734f160dd120'
branch_labels = None
depends_on = None