Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
687 commits
Select commit Hold shift + click to select a range
7dcbc0c
Test code review feedback
XingY Jul 27, 2016
d5dd0d3
Spec Issue 26850: fix test after changing to auto refresh upon insert
XingY Jul 27, 2016
6b49685
Spec Issue 26850: work around for test failure...
XingY Jul 27, 2016
f2d0bdd
Merge pull request #24 from LabKey/rfb_studyaccess_26850
labkey-susanh Jul 28, 2016
af57690
Merge branch 'release16.2' into develop
labkey-susanh Jul 28, 2016
8ba54c9
remove unused imports
labkey-susanh Jul 28, 2016
6c7241f
Issue 27363: Update default filtering on ITN's data finder to select …
XingY Aug 4, 2016
280ab34
Issue 27363: Update default filtering on ITN's data finder to select …
XingY Aug 4, 2016
e7fcfdf
Rename clickHeaderButton -> clickHeaderMenu
labkey-tchad Aug 11, 2016
1d28c37
Issue 27426: remove selection of font from HTML editor fields
labkey-susanh Aug 15, 2016
a8d75d2
Merge pull request #25 from LabKey/rfb_issue_27363
labkey-susanh Aug 15, 2016
e5f9639
Issue 27363: fix test
XingY Aug 15, 2016
4757479
Issue 27426: change field name for abstractText so it is saved.
labkey-susanh Aug 15, 2016
1c8b9af
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 17, 2016
117106c
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 17, 2016
590ce30
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 17, 2016
fd7f2c4
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 17, 2016
2ddce0f
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 18, 2016
2bfac82
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 18, 2016
11c027d
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 18, 2016
a1a4c1c
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 18, 2016
195a37c
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 18, 2016
0f7223b
Issue 27538: remove HTML editor from external URL description
labkey-susanh Aug 19, 2016
45f81a2
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 19, 2016
4ab6fe8
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 19, 2016
de72a97
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 22, 2016
c35ff27
Issue 27549: strip out the 'font="null"' values from HTML editor text…
labkey-susanh Aug 22, 2016
ffea8b7
Spec 27199: update styling on workbench button
labkey-susanh Aug 23, 2016
61b4c35
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 23, 2016
e617f8d
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 23, 2016
f0d1c62
Spec 27199: Integrate publication form with workbench
labkey-eyounske Aug 23, 2016
296930a
Merge pull request #26 from LabKey/rfb_issue27426
labkey-klum Aug 24, 2016
0e517d6
Merge from release16.2
labkey-eyounske Aug 24, 2016
ff1824f
Merge pull request #27 from LabKey/rfb_formworkbench_27199
labkey-susanh Aug 25, 2016
f76890b
Merge branch 'release16.2' into develop
labkey-susanh Aug 25, 2016
757b831
Update button text: "Insert New Row"
labkey-tchad Sep 1, 2016
04e6603
Fix for Insert New -> Insert New Rows
Kristjansson Sep 1, 2016
9651343
Issue 27740: add "Insert New" link on DataFinder UI
labkey-susanh Sep 6, 2016
a25b160
Issue 27740: update class for insert new link
labkey-susanh Sep 6, 2016
f0e9240
Issue 27740: add a wait for the page title
labkey-susanh Sep 7, 2016
986be72
Issue 27740: add another wait for the slow Windows tests
labkey-susanh Sep 7, 2016
59a8dc1
Merge pull request #28 from LabKey/rfb_issue27740
labkey-susanh Sep 13, 2016
3cfe405
Merge pull request #29 from LabKey/release16.2
labkey-susanh Sep 13, 2016
bd0d6ee
Issue 27901: remove "Insert New" link from studies interface
labkey-susanh Sep 19, 2016
6b875e8
Issue 27901: remove setting of access list id that is not needed (and…
labkey-susanh Sep 20, 2016
08dff74
Merge pull request #30 from LabKey/rfb_issue27901
Sep 21, 2016
8f0bdb5
Merge pull request #31 from LabKey/release16.2
labkey-susanh Sep 21, 2016
74279f9
Issue 27990: Finder wizard dropdowns pull from /home lists instead of…
XingY Sep 29, 2016
e8fa1c8
Issue 27990: Finder wizard dropdowns pull from /home lists instead of…
XingY Sep 29, 2016
5bb82a7
Issue 27999: Finder wizard not saving publications
XingY Sep 29, 2016
b92815a
Merge pull request #32 from LabKey/rfb_issue_27990
labkey-susanh Sep 30, 2016
13cde72
Issue 28503 - prevent double encoding of space in URL
labkey-susanh Oct 4, 2016
0706fb9
Merge branch 'release16.2' into develop
labkey-susanh Oct 4, 2016
5959e6c
Updating Trial Share test to validate that work bench button is encod…
labkey-danield Oct 5, 2016
ad07ccf
Merge pull request #33 from LabKey/rfb_issue28053
labkey-klum Oct 5, 2016
cfc746a
Merge pull request #34 from LabKey/rfb_issue28053
labkey-klum Oct 5, 2016
f6d22a6
Issue 28199 - fix foreign key for therapeutic area.
labkey-susanh Oct 17, 2016
de3de89
Issue 28199 - add automated tests for checking count updates
labkey-susanh Oct 19, 2016
31be66a
Issue 28199 - add tests for study counts
labkey-susanh Oct 19, 2016
a81e78c
Issue 28241 - add returnUrl for cube object edit page; make all tests…
labkey-susanh Oct 21, 2016
106a165
Issue 28199 - update automated test with proper assertions for fresh …
labkey-susanh Oct 21, 2016
0ac0a73
Issue 28241 - update insertAndDelete tests to go to data project when…
labkey-susanh Oct 21, 2016
c379eb3
Merge pull request #35 from LabKey/rfb_issue28199
labkey-klum Oct 21, 2016
06d2ff9
Issue 28241 make separate data projects for each test
labkey-susanh Oct 24, 2016
6194d8c
Issue 28241 avoid concurrent modification problem when deleting proje…
labkey-susanh Oct 24, 2016
7028379
Issue 28241 wait for mask to disappear before choosing object type in…
labkey-susanh Oct 24, 2016
59d3722
Spec #27882: Add summary statistics to data grids
cnathe Oct 24, 2016
6239135
Merge branch 'release16.2' into rfb_issue_28241
labkey-susanh Oct 25, 2016
965fe4a
Merge pull request #36 from LabKey/rfb_issue_28241
labkey-susanh Oct 26, 2016
fe06135
Merge branch 'release16.2' into develop
labkey-susanh Oct 26, 2016
9f298f6
Spec 27883: Update all source code copyrights & licenses
labkey-eyounske Oct 28, 2016
916685b
Remove useless XML namespaces to clean up files
labkey-jeckels Nov 10, 2016
6f9d189
Issue 23582: Issues with loading & caching module-based reports
labkey-adam Nov 12, 2016
5b5b857
Issue 28475: Use natural sort in study/publication form drop downs
XingY Dec 1, 2016
d8e5542
Issue 28475: switch to use addClientDependencies
XingY Dec 2, 2016
786b6ff
Don't subclass org.labkey.test.Locators
labkey-tchad Dec 13, 2016
2b6007a
Issue 28475: code review
XingY Dec 14, 2016
3ce925c
Merge pull request #37 from LabKey/hf16.2_issue_28475
labkey-susanh Dec 15, 2016
cb44698
Merge branch 'release16.2' into release16.3
XingY Dec 15, 2016
b990367
Merge branch 'release16.3' into develop
XingY Dec 15, 2016
aa069ac
add distribution build files for custom, external, and optional modules
labkey-susanh Feb 22, 2017
d7f8300
Add fileTransfer module to distribution
labkey-tchad Mar 7, 2017
960b13b
Merge pull request #38 from LabKey/rfb_updateDistribution
labkey-tchad Mar 8, 2017
20ad566
Issue 29810: Add natural sort for containers in ITN's data finder
XingY Mar 22, 2017
8b870e6
Issue 28423: Return URL in data finder edit pages is additive
XingY Mar 22, 2017
0d3093b
Merge pull request #40 from LabKey/hf16.2_issue_28423
labkey-susanh Mar 23, 2017
278297a
Merge pull request #39 from LabKey/hf16.2_issue_29810
labkey-susanh Mar 23, 2017
4f11405
Merge pull request #41 from LabKey/release16.2
Mar 23, 2017
ae289f9
Issue 29824: Add blank field to Permissions Container for manuscripts
XingY Mar 24, 2017
26f48f2
Merge pull request #43 from LabKey/hf16.2_issue_29824
labkey-susanh Mar 28, 2017
5ca41a4
Merge pull request #44 from LabKey/release16.2
Mar 28, 2017
54c35eb
Switch SimpleDocumentResource to take String for body parameter for c…
labkey-adam Apr 2, 2017
e7eff79
Merge branch 'develop' of https://github.com/LabKey/trialShare into d…
labkey-adam Apr 2, 2017
e953762
SearchService.get() for convenience
labkey-adam Apr 4, 2017
537e131
Spec #29597: hide admin console link for troubleshooter
cnathe Apr 7, 2017
06a4c42
ServiceRegistry.get().getService(SearchService.class) -> SearchServic…
labkey-adam Apr 10, 2017
232f482
Merge branch 'develop' into fb_appadmin_29597
cnathe Apr 11, 2017
9843092
throw ConfigurationException instead of just logging error
labkey-susanh Apr 12, 2017
f1b9977
Merge pull request #45 from LabKey/fb_appadmin_29597
cnathe Apr 12, 2017
651c591
Issue 30243: do not enumerate documents if not in the trialShare cube…
labkey-susanh May 1, 2017
280bb7a
Remove old IntelliJ module files from optionalModules
labkey-tchad May 11, 2017
5ee9e77
Remove obsolete IntelliJ module files
labkey-tchad May 11, 2017
c721106
Remove ant build files for distributions
labkey-susanh May 22, 2017
b556666
Merge pull request #46 from LabKey/fb_issue30243
Jun 12, 2017
00b6a76
Add fileTransfer module to distribution
labkey-susanh Jun 12, 2017
a3b2a41
Merge remote-tracking branch 'origin/develop' into develop
labkey-susanh Jun 12, 2017
4e64d08
remove jar files for scharp modules; jstl.jar and standard.jar are no…
labkey-susanh Jun 13, 2017
961e47d
17.2 Update all copyrights & licenses
labkey-eyounske Jun 22, 2017
d16b6bb
Don't use Locator.* constructors
labkey-tchad Jun 23, 2017
dc4f4f0
Fixing ManagePublicationTest hack to find element in DataRegion.
labkey-danield Jul 25, 2017
2b588ea
Issue 31071: remove row limit from query for menus in edit forms
labkey-susanh Aug 1, 2017
068b42f
Issue 31071: remove row limit for study query as well
labkey-susanh Aug 1, 2017
8a4848b
Merge pull request #48 from LabKey/rfb_issue31071
labkey-klum Aug 8, 2017
5e5a991
Merge pull request #49 from LabKey/release17.2
Aug 8, 2017
3ffe89a
add missing Ext4 dependency
labkey-susanh Aug 22, 2017
6c08c0d
updates to auto-resizing for new UX
labkey-susanh Aug 23, 2017
7fd36c9
Issue 31311: Remove custom rendering for edit and details links
labkey-susanh Aug 29, 2017
4e9c39e
Rename labId column as requested by HVTN
langles Aug 30, 2017
0770baf
30924: Test updates 17.3.2
labkey-sweta Sep 5, 2017
331cf24
Issue 31354:
Kristjansson Sep 11, 2017
cf584d9
30924: Test updates 17.3.3
labkey-sweta Sep 12, 2017
ab16108
fix whitelisted test to use admin page helper
labkey-chrisj Sep 25, 2017
4217644
Use helper to click edit link in new UX
labkey-tchad Sep 27, 2017
a76117a
Merge remote-tracking branch 'origin/release17.1' into develop
labkey-tchad Oct 3, 2017
56b1e49
Inline and remove deprecated methods
labkey-tchad Oct 20, 2017
fa3200c
Inline and remove redundant, deprecated WebTestHelper.getHttpGetResponse
labkey-tchad Oct 20, 2017
6fdb11c
Update button locators and cache elements
labkey-tchad Oct 23, 2017
6729098
Need to refind buttons; they become stale when enabling/disabling
labkey-tchad Oct 23, 2017
c2ed8bc
Fix argument order for assertEquals
labkey-tchad Oct 25, 2017
8feba37
Remove test flags for new UX
labkey-tchad Oct 27, 2017
77401ab
Make sure form has fully updated before navigating away
labkey-tchad Oct 27, 2017
abb57d0
Update copyrights for 17.3
labkey-eyounske Nov 1, 2017
a94ab3c
Add a bit of sleeping to allow time for updated value to update in store
labkey-susanh Nov 2, 2017
a9f9c3f
RT#149703: Change the display of "SEQUENCE ID" to "PEPTIDE NUMBER" as…
langles Nov 15, 2017
f1d6467
Move distribution projects to separate git repository
labkey-susanh Mar 7, 2018
dbb1700
Test timing fixes (#50)
labkey-tchad Mar 28, 2018
42a41b8
Wait for specific field to be focused
labkey-tchad Mar 29, 2018
1850387
Standard set/get pattern for more services and their usages: Activity…
labkey-adam Apr 11, 2018
da8c649
Remove NameLocator
labkey-tchad Apr 30, 2018
4636369
Simplify some this._member references to _member
labkey-adam Jun 8, 2018
3f2dca5
Add user to method signature so implementations don't have to grab it…
labkey-jeckels Jun 19, 2018
4decf4a
Temporarily rollback 58756 to avoid having to chase down all the Git …
labkey-jeckels Jun 20, 2018
12d992e
Fix build for Selenium 3
labkey-tchad Jul 11, 2018
5a8a947
Issue 34406: Revisit Connection reuse without opening a full DbScope.…
labkey-adam Sep 9, 2018
40ee4f6
34867: Ignore JavaScript error when 'document.activeElement' is null
labkey-tchad Oct 4, 2018
d51ea84
34867: Click close button in the middle, not at the edge
labkey-tchad Oct 5, 2018
32259fb
Copyright and license updates
labkey-eyounske Nov 9, 2018
a248a12
Copyright and license updates
labkey-eyounske Nov 13, 2018
5b64f23
Merge remote-tracking branch 'origin/master' into selenium3
labkey-tchad Dec 5, 2018
f025221
Handle bad parameters more explicitly
labkey-tchad Feb 7, 2019
a743af6
Don't trigger server error from bad user input
labkey-tchad Feb 7, 2019
df31255
Item 5351: ApiAction review and migration (#51)
labkey-ankurj Mar 14, 2019
6a42ae4
Fix two NPEs for crawler during ManageStudiesTest
labkey-eyounske Apr 11, 2019
8f73035
Merge pull request #52 from LabKey/fb_managestudiestest_fix
labkey-eyounske Apr 11, 2019
5d6afe7
Create .gitattributes
labkey-klum Apr 17, 2019
5491381
Fix build - followup from issue 37278 (#53)
labkey-jeckels Apr 22, 2019
cab5ab0
immutable tableinfo
May 15, 2019
abd3243
@Overrides
labkey-adam May 18, 2019
356910d
Migrate textLink() to link() builder pattern
labkey-adam May 26, 2019
4cb81fb
Switch h(String) to return HtmlString. Introduce OldJspBase which res…
labkey-adam May 29, 2019
ca98e33
Move PepDB and Peptide tests into their respective modules
labkey-tchad Jun 4, 2019
9b47fdf
Item 5760: update copyrights to 2019
labkey-ankurj Jun 17, 2019
6bce078
Issue 37707: Fix hopscotch tour target and id (#56)
labkey-susanh Jun 21, 2019
c8b578d
Merge pull request #57 from LabKey/release18.2
labkey-tchad Jun 24, 2019
c685d56
Merge changes from 19.1.8 (#58)
labkey-tchad Jun 25, 2019
ad6d1c2
Fix NoSuchMessageException from bad publication ID (#59)
labkey-tchad Jul 18, 2019
7e4b0fc
Shift appendNavTrail() implementations away from relying on NavTree.a…
labkey-adam Aug 17, 2019
dc1a61c
@Override in some Module* classes, fix a few other warnings
labkey-adam Aug 28, 2019
c32e26f
Migrate from @Deprecated textLink() static methods to direct use of L…
labkey-adam Sep 4, 2019
1db159a
Grid actions use full select by default
RosalineP Sep 9, 2019
419ac64
Merge pull request #61 from LabKey/fb_Issue37818
RosalineP Sep 10, 2019
2769249
Migrate more attributes() usages to new simple setters (#63)
labkey-adam Sep 20, 2019
3f88cab
Explicitly declare script and version properties for external modules
labkey-tchad Sep 23, 2019
7829be9
Remove unused reference to WikiService (#64)
labkey-adam Sep 26, 2019
c6ed784
Rename method to reflect new link text
labkey-jeckels Oct 8, 2019
da40e0d
Merge pull request #65 from LabKey/fb_updateAdminConsoleLink
labkey-jeckels Oct 8, 2019
e3641dd
Item 6167: integrate ITN changes into core codebase (#66)
labkey-jeckels Oct 15, 2019
a1c537a
Close more ExcelWriters
labkey-adam Oct 17, 2019
668ed6e
Use absolute JSP paths
labkey-adam Nov 16, 2019
bf537d8
Migrate to correctly named method
labkey-adam Nov 19, 2019
ff52a4e
Add page title (#67)
labkey-bpatel Dec 16, 2019
cb141d5
Make sure we don't try to create users that already exist (#68)
labkey-tchad Dec 30, 2019
026c8b6
Migrate to getSchemaVersion(). Remove ConsolidateScripts.
labkey-adam Feb 7, 2020
8c61dca
Normalizing line endings to .gitattributes file
Sigmonia Apr 24, 2020
4bfc693
Create pull_request_template.md
labkey-klum Apr 30, 2020
441c9a2
Create pull_request_template.md
labkey-klum Apr 30, 2020
b15412c
ContainerFilter is now constructed with a container (#69)
labkey-matthewb May 15, 2020
ed2fed4
appendNavTrail() to addNavTrail() migration (#1)
labkey-adam May 27, 2020
8be0b00
appendNavTrail() to addNavTrail() migration (#70)
labkey-adam May 27, 2020
8f080c4
Add release workflow definitions (#2)
labkey-tchad Jun 25, 2020
46e2c5d
Add release workflow definitions (#71)
labkey-tchad Jun 25, 2020
6d7b195
Item 7490: upgrade log4j (#3)
labkey-ankurj Aug 5, 2020
67e5fef
Item 7490: upgrade log4j (#72)
labkey-ankurj Aug 5, 2020
a6cd41e
Eliminate all remaining out.print(String) uses in pepdb JSPs (#4)
labkey-adam Aug 24, 2020
94f656b
Add SafeToRender marker interface. Adjust enums, URLhelper, builders,…
labkey-adam Sep 1, 2020
3cb01b3
Fb jsp print (#73)
labkey-adam Sep 1, 2020
7a2ea9a
Use urlFor() instead of hard-coded strings (#6)
labkey-adam Sep 10, 2020
94d1ed1
Switch to DisplayColumn.getFormattedHtml() and use HtmlString (#7)
labkey-jeckels Sep 27, 2020
0871532
Add some missing module dependencies and move some dependency declara…
labkey-susanh Oct 14, 2020
beda53b
Remove all DataFinder code from trialShare repo (#75)
labkey-adam Nov 2, 2020
579ebf7
exclude Notebooks from the trial share export test (#76)
labkey-klum Nov 17, 2020
f678bdf
Add PR validation workflow (#77)
labkey-tchad Dec 15, 2020
a628d44
Add PR validation workflow (#8)
labkey-tchad Dec 15, 2020
9b2839e
add sample types to expected export types (#78)
labkey-klum Dec 18, 2020
0e8912b
add plugins block in anticipation of removal of modules/build.gradle …
labkey-susanh Dec 23, 2020
d29026f
automated test fixes (#80)
labkey-klum Dec 29, 2020
80b597e
Issue 38722: Migrate ExcelWriter, TSVGridWriter, DataRegion, et al to…
labkey-adam Jan 6, 2021
fe54edf
test fix (#82)
labkey-klum Jan 12, 2021
2ea536a
Adjust for specimen refactor (#81)
labkey-adam Jan 14, 2021
68006fb
TrialShareController.TrialShareExportTest fix to add "Inventory locat…
cnathe Jan 27, 2021
dae733c
Item 8294: Job Template Import and Export (#84)
XingY Jan 29, 2021
5925b40
Add build.gradle file to apply plugin (#10)
labkey-susanh Feb 9, 2021
53d714a
Add dependency on specimen module (#85)
labkey-adam Feb 12, 2021
32db4f5
Rename action branch to develop (#86)
labkey-tchad Apr 22, 2021
01aaa11
Rename action branch to develop (#11)
labkey-tchad Apr 22, 2021
c81c9d2
Fix TrialShareController.TrialShareExportTest - match dataset export …
labkey-jeckels Jun 7, 2021
393962b
Migrate use of boxed primitive constructors (#12)
labkey-adam Jul 7, 2021
9c9ab6a
Move all remaining specimen actions (i.e., specimen comments) to spec…
labkey-adam Jul 8, 2021
6cddad7
Update and Enable PepDB module test (#13)
labkey-tchad Aug 18, 2021
ca112a8
Update qcStateSettings description based on sample status availabilit…
labkey-susanh Nov 16, 2021
e401345
Remove unnecessary usage of deprecated method (#14)
labkey-tchad Dec 23, 2021
cda4203
Data finder enhancements for ITN (#91)
labkey-adam Dec 28, 2021
b1d6a46
Merge 21.11.4 to develop
labkey-teamcity Dec 29, 2021
d374885
Waiting for the link before clicking (#95)
labkey-sweta Jan 12, 2022
b91c55c
Merge 21.11 to develop
labkey-teamcity Jan 20, 2022
0aabeb6
Refactor import/export context and writer hierarchies (#99)
labkey-adam Apr 7, 2022
fbfe51e
Add PanoramaQC to expected list of export options (#100)
labkey-jeckels May 3, 2022
e3b95a1
Add PanoramaQC to expected list of export options (#100) (#101)
labkey-jeckels May 4, 2022
3308259
Merge 22.3 to 22.5
labkey-teamcity May 10, 2022
12bf0c0
Merge 22.5 to develop
labkey-teamcity May 11, 2022
4e1a8eb
Issue 46060: Excel exports are leaving permanent 'temporary poifiles'…
labkey-adam Aug 12, 2022
c2ff00a
Manipulate and pass around ActionURLs, not Strings (#16)
labkey-adam Aug 13, 2022
de25d36
Refactor Java remote API hierarchy (#106)
labkey-adam Jan 25, 2023
caddbf0
Update GitHub workflows to use checkout v3 (#17)
labkey-tchad May 31, 2023
65a2e34
Update GitHub workflows to use checkout v3 (#107)
labkey-tchad May 31, 2023
c8e6800
PepDB needs object deserialization (#18)
labkey-adam Jun 13, 2023
2195ad3
Stop relying on de-serialization (#19)
labkey-adam Jun 15, 2023
4b7acd0
Issue 47818 : export options to containing metadata only (#108)
labkey-klum Jun 28, 2023
d4a27af
Migrate User.isInSiteAdminGroup() -> User.hasSiteAdminPermission() (#…
labkey-adam Oct 7, 2023
5945d0f
Tomcat 10 - Update namespace of Jakarta EE packages (#21)
labkey-tchad Feb 1, 2024
3b1996f
Add nonce to script tag (#22)
labkey-adam Feb 19, 2024
dee7507
Generalize experimental features to optional features (#110)
labkey-adam Jul 9, 2024
ceedc8c
SupportedDatabases property consistency for easier tracking (#23)
labkey-adam Nov 14, 2024
34310d8
Mark modules that support both databases (#111)
labkey-adam Nov 18, 2024
c205646
Remove SupportedDatabases property now that default is PostgreSQL-onl…
labkey-adam Nov 19, 2024
f7ac8aa
Add ManageVersion property to all module.properties files (#112)
labkey-adam Jan 9, 2025
01b8d54
Rehome pepdb module
labkey-tchad Feb 24, 2025
ffe8842
Rehome trialShare module
labkey-tchad Feb 24, 2025
36700e5
Merge pepdb module
labkey-tchad Feb 24, 2025
625073a
Merge trialShare module
labkey-tchad Feb 24, 2025
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
47 changes: 47 additions & 0 deletions pepdb/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Convert text files to OS line-endings on checkout, and LF on check-in
* text=auto !eol

# Text files to convert
*.css text diff=css
*.htm text diff=html
*.html text diff=html
*.java text diff=java
*.js text
*.json text
*.jsp text
*.jspf text
*.jspx text
*.properties text
*.py text diff=python
*.sql text
*.tld text
*.ts text
*.txt text
*.xml text
*.yml text

# Keep unix endings
*.bash text eol=lf
*.sh text eol=lf

# Keep Windows endings
*.bat text eol=crlf
*.cmd text eol=crlf

# Known binary files -- Don't change (binary is a macro for -text -diff)
*.bin binary
*.class binary
*.dll binary
*.ear binary
*.exe binary
*.gif binary
*.gz binary
*.ico binary
*.jar binary
*.jpg binary
*.jpeg binary
*.png binary
*.so binary
*.tar binary
*.war binary
*.zip binary
3 changes: 3 additions & 0 deletions pepdb/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id 'org.labkey.build.module'
}
2 changes: 2 additions & 0 deletions pepdb/module.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ModuleClass: org.scharp.atlas.pepdb.PepDBModule
ManageVersion: false
228 changes: 228 additions & 0 deletions pepdb/resources/schemas/dbscripts/postgresql/pepdb-0.00-0.02.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
/*
* Copyright (c) 2003-2005 Fred Hutchinson Cancer Research Center
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

BEGIN;

CREATE SCHEMA pepdb;

CREATE TABLE pepdb.clade (
clade_id serial NOT NULL,
clade_desc text,

CONSTRAINT PK_clade PRIMARY KEY (clade_id)
);

CREATE TABLE pepdb.pathogen (
pathogen_id serial NOT NULL,
pathogen_desc text,

CONSTRAINT PK_pathogen PRIMARY KEY (pathogen_id)
);

CREATE TABLE pepdb.group_type (
group_type_id serial NOT NULL,
group_type_desc text,

CONSTRAINT PK_group_type PRIMARY KEY (group_type_id)
);

CREATE TABLE pepdb.pep_align_ref (
pep_align_ref_id serial NOT NULL,
pep_align_ref_desc text,

CONSTRAINT PK_pep_align_ref PRIMARY KEY (pep_align_ref_id)
);

CREATE TABLE pepdb.peptide_group (
_ts TIMESTAMP DEFAULT now(),
CreatedBy USERID,
Created TIMESTAMP,
ModifiedBy USERID,
Modified TIMESTAMP,

peptide_group_id serial NOT NULL,
peptide_group_name text NOT NULL UNIQUE,
pathogen_id integer,
seq_ref text,
clade_id integer,
pep_align_ref_id integer,
group_type_id integer,

CONSTRAINT PK_peptide_group PRIMARY KEY (peptide_group_id),
CONSTRAINT FK_peptide_group1 FOREIGN KEY(pathogen_id) REFERENCES pepdb.pathogen(pathogen_id),
CONSTRAINT FK_peptide_group2 FOREIGN KEY(clade_id) REFERENCES pepdb.clade(clade_id),
CONSTRAINT FK_peptide_group3 FOREIGN KEY(group_type_id) REFERENCES pepdb.group_type(group_type_id),
CONSTRAINT FK_peptide_group4 FOREIGN KEY(pep_align_ref_id) REFERENCES pepdb.pep_align_ref(pep_align_ref_id)
);

CREATE TABLE pepdb.protein_category (
protein_cat_id serial NOT NULL,
protein_cat_desc text,

CONSTRAINT PK_protein_category PRIMARY KEY (protein_cat_id)
);

CREATE TABLE pepdb.optimal_epitope_list(
optimal_epitope_list_id serial NOT NULL,
optimal_epitope_list_desc text,

CONSTRAINT PK_optimal_epitope_list PRIMARY KEY (optimal_epitope_list_id)
);


CREATE TABLE pepdb.peptides (
_ts TIMESTAMP DEFAULT now(),
CreatedBy USERID,
Created TIMESTAMP,
ModifiedBy USERID,
Modified TIMESTAMP,

peptide_id serial NOT NULL,
peptide_sequence text NOT NULL UNIQUE,
protein_cat_id integer,
amino_acid_start_pos integer,
amino_acid_end_pos integer,
sequence_length integer,
child boolean,
parent boolean DEFAULT false NOT NULL,
src_file_name text,
storage_location text,
optimal_epitope_list_id integer,
hla_restriction text,

CONSTRAINT PK_peptides PRIMARY KEY (peptide_id),
CONSTRAINT FK_peptides1 FOREIGN KEY(protein_cat_id) REFERENCES pepdb.protein_category(protein_cat_id),
CONSTRAINT FK_peptides2 FOREIGN KEY(optimal_epitope_list_id) REFERENCES pepdb.optimal_epitope_list(optimal_epitope_list_id)
);


CREATE TABLE pepdb.peptide_group_assignment (
_ts TIMESTAMP DEFAULT now(),
CreatedBy USERID,
Created TIMESTAMP,
ModifiedBy USERID,
Modified TIMESTAMP,

peptide_group_assignment_id serial NOT NULL UNIQUE,
peptide_id integer NOT NULL,
peptide_group_id integer NOT NULL,
peptide_id_in_group integer,
frequency_number float,
frequency_number_date date,
in_current_file boolean DEFAULT false,

CONSTRAINT PK_peptide_group_assignment PRIMARY KEY (peptide_id,peptide_group_id),
CONSTRAINT FK_peptide_group_assignment1 FOREIGN KEY(peptide_id) REFERENCES pepdb.peptides(peptide_id),
CONSTRAINT FK_peptide_group_assignment2 FOREIGN KEY(peptide_group_id) REFERENCES pepdb.peptide_group(peptide_group_id)
);

CREATE TABLE pepdb.parent (
_ts TIMESTAMP DEFAULT now(),
CreatedBy USERID,
Created TIMESTAMP,
ModifiedBy USERID,
Modified TIMESTAMP,

peptide_id integer NOT NULL,
linked_parent integer NOT NULL,

CONSTRAINT PK_parent PRIMARY KEY (peptide_id,linked_parent),
CONSTRAINT FK_parent1 FOREIGN KEY(peptide_id) REFERENCES pepdb.peptides(peptide_id),
CONSTRAINT FK_parent2 FOREIGN KEY(linked_parent) REFERENCES pepdb.peptides(peptide_id)
);

CREATE TABLE pepdb.pool_type (
pool_type_id serial NOT NULL,
pool_type_desc text,

CONSTRAINT PK_pool_type PRIMARY KEY (pool_type_id)
);

CREATE TABLE pepdb.peptide_pool (
_ts TIMESTAMP DEFAULT now(),
CreatedBy USERID,
Created TIMESTAMP,
ModifiedBy USERID,
Modified TIMESTAMP,

peptide_pool_id serial NOT NULL,
peptide_pool_name text,
pool_type_id integer,
comment text,

CONSTRAINT PK_peptide_pool PRIMARY KEY (peptide_pool_id),
CONSTRAINT FK_peptide_pool1 FOREIGN KEY(pool_type_id) REFERENCES pepdb.pool_type(pool_type_id)
);


CREATE TABLE pepdb.peptide_pool_assignment (
_ts TIMESTAMP DEFAULT now(),
CreatedBy USERID,
Created TIMESTAMP,
ModifiedBy USERID,
Modified TIMESTAMP,

peptide_pool_assignment_id serial NOT NULL UNIQUE,
peptide_pool_id integer NOT NULL,
peptide_id integer NOT NULL,

CONSTRAINT PK_peptide_pool_assignment PRIMARY KEY (peptide_pool_id,peptide_id),
CONSTRAINT FK_peptide_pool_assignment1 FOREIGN KEY(peptide_pool_id) REFERENCES pepdb.peptide_pool(peptide_pool_id),
CONSTRAINT FK_peptide_pool_assignment2 FOREIGN KEY(peptide_id) REFERENCES pepdb.peptides(peptide_id)
);

CREATE VIEW pepdb.parent_child_details AS
select par.peptide_id AS child_id,pchild.peptide_sequence AS child_sequence,
pchild.protein_cat_id AS child_protein,pchild.sequence_length AS child_seq_length,
pchild.amino_acid_start_pos AS child_AAStart,pchild.amino_acid_end_pos AS child_AAEnd,
pchild.optimal_epitope_list_id AS child_optimal_epitope_list_id,pchild.hla_restriction AS child_hla_restriction,
par.linked_parent AS parent_id,pparent.peptide_sequence AS parent_sequence,
pparent.protein_cat_id AS parent_protein,pparent.sequence_length AS parent_seq_length,
pparent.amino_acid_start_pos AS parent_AAStart,pparent.amino_acid_end_pos AS parent_AAEnd
from pepdb.parent par LEFT JOIN pepdb.peptides pchild ON (par.peptide_id = pchild.peptide_id)
LEFT JOIN pepdb.peptides pparent ON(par.linked_parent = pparent.peptide_id);

CREATE VIEW pepdb.group_peptides AS
SELECT src.peptide_id, src.peptide_group_id, src.peptide_id_in_group,
pgroup.peptide_group_name,pgroup.pathogen_id,
p.peptide_sequence,p.protein_cat_id,
p.sequence_length,p.amino_acid_start_pos,p.amino_acid_end_pos,
p.child, p.parent,p.optimal_epitope_list_id,p.hla_restriction,
src.frequency_number,src.frequency_number_date,src.in_current_file
FROM ((pepdb.peptide_group_assignment src LEFT JOIN pepdb.peptide_group pgroup ON ((src.peptide_group_id
= pgroup.peptide_group_id))) LEFT JOIN pepdb.peptides p ON ((src.peptide_id =
p.peptide_id)));

CREATE VIEW pepdb.pool_peptides AS
SELECT src.peptide_id, p.peptide_sequence, src.peptide_pool_id, pp.pool_type_id, pp.peptide_pool_name, pt.pool_type_desc
FROM
pepdb.peptides p,
pepdb.peptide_pool_assignment src
LEFT JOIN pepdb.peptide_pool pp
LEFT JOIN pepdb.pool_type pt ON(pp.pool_type_id = pt.pool_type_id) ON (src.peptide_pool_id = pp.peptide_pool_id)
WHERE (src.peptide_id = p.peptide_id);

SELECT pg_catalog.setval(pg_catalog.pg_get_serial_sequence('pepdb.peptides', 'peptide_id'), 500000, true);
SELECT pg_catalog.setval(pg_catalog.pg_get_serial_sequence('pepdb.peptide_pool', 'peptide_pool_id'), 500000, true);

COMMIT;







Loading