Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4768 commits
Select commit Hold shift + click to select a range
e9e9b27
Merge pull request #5866 from solgenomics/browser_alert
lukasmueller Feb 5, 2026
3e06af4
Fix linting errors
bm743 Feb 5, 2026
63c75c1
Adding ability to delete a page; add page that shows all the currentl…
lukasmueller Feb 5, 2026
02a8f0b
add a test.
lukasmueller Feb 6, 2026
22ab054
Fix more linting errors
bm743 Feb 6, 2026
7913a46
Merge branch 'master' into topic/manage_propagation
titima15 Feb 6, 2026
cf5b5af
Fix css prettier linting errors
bm743 Feb 6, 2026
3ad1c6c
Refresh phenotype matviews after analysis is saved, import sum function
bm743 Feb 6, 2026
483e1ff
check stock type and modify query
titima15 Feb 6, 2026
d6ade0a
fix: derived trait calculation engine bugfixes
Globgor Feb 8, 2026
aa1db1e
add correlation input data json to correlation output
isaak Feb 9, 2026
ee85147
adjust the origin
isaak Feb 9, 2026
673ab68
update heatmap args structure
isaak Feb 9, 2026
6a4a5ef
update heatmap args structure
isaak Feb 9, 2026
e29f122
New User Registration: add simple bot check
dwaring87 Feb 9, 2026
8613913
ci: remove changes to test workflow
ktmeaton Feb 9, 2026
305a067
import simple_statistics lib
isaak Feb 9, 2026
100899b
display correlation coefficient and p-value
isaak Feb 9, 2026
6fcbd0e
include genotyping plates
titima15 Feb 9, 2026
e22e6f6
include cross and family name in trials
titima15 Feb 9, 2026
2147474
Merge pull request #5889 from solgenomics/topic/change_treatment_backend
lukasmueller Feb 9, 2026
71f5100
Merge pull request #5875 from solgenomics/topic/vector_organism
lukasmueller Feb 9, 2026
6a243f2
Merge pull request #5890 from solgenomics/topic/fix_viewing_images
lukasmueller Feb 9, 2026
4f74992
Merge pull request #5869 from solgenomics/topic/fix_save_plants_in_de…
lukasmueller Feb 9, 2026
9287082
Bump super-linter/super-linter from 7.1.0 to 8.3.1 in /.github/workflows
dependabot[bot] Feb 9, 2026
e18360c
tests
titima15 Feb 9, 2026
58146ca
Merge pull request #5891 from solgenomics/topic/eggplant_pangenome
lukasmueller Feb 9, 2026
97e5b47
login: change callback uri_for to main_production_site_url
ktmeaton Feb 9, 2026
c2a4e70
simplify for readability..
isaak Feb 10, 2026
249f744
re-order trial page sections, put phenotype data related sections nex…
isaak Feb 10, 2026
7ce5fa8
abstract out analysis tools in to their own mason template
isaak Feb 10, 2026
af191f4
move analysis_tools_section template
isaak Feb 10, 2026
8ede8bf
move analysis_tools_section template
isaak Feb 10, 2026
ca1bcdd
Remove direct system calls to wc, which could include arbitrary commands
dwaring87 Feb 10, 2026
0f80eed
Sanitize user-provided arguments?
dwaring87 Feb 10, 2026
495022f
Fix linting errors
dwaring87 Feb 10, 2026
22ac9aa
Create protocols and matrix transcriptomics brapi endpoints
bm743 Feb 10, 2026
8a5d374
remove invalid phone contact.
lukasmueller Feb 10, 2026
f786ce7
fix base url redirect and count variable instead of num_rows
ktmeaton Feb 10, 2026
9a9f214
updaate analysis_tools_section location
isaak Feb 11, 2026
64acc57
display a scatter plot for the pair of traits on mouseover of a heatm…
isaak Feb 11, 2026
a048340
seedlot inventory upload generic
titima15 Feb 11, 2026
46ff8fd
option to use amount for seedlot inventory
titima15 Feb 11, 2026
43300bb
fix plugin
titima15 Feb 11, 2026
b7fbaa9
add a page that lists all wiki pages.
lukasmueller Feb 11, 2026
b13c1b3
add working test with some refactoring.
lukasmueller Feb 11, 2026
abea24e
update object state after new page creation.
lukasmueller Feb 11, 2026
1bf0850
fix test and tweak object state for Wiki object.
lukasmueller Feb 11, 2026
269e1f8
explicitly indicate amount or weight
titima15 Feb 11, 2026
1ccb036
modify spreadsheet info
titima15 Feb 11, 2026
4e32b23
Remove shell 'head' usage
dwaring87 Feb 12, 2026
640af16
remove special handling of WikiHome page.
lukasmueller Feb 12, 2026
0045c2c
add some debug info to STDERR
lukasmueller Feb 12, 2026
73696c4
remove debug alerts; tweak textarea size
lukasmueller Feb 12, 2026
991906b
add selenium test for the wiki.
lukasmueller Feb 12, 2026
98aa7b5
add db patch for wiki.
lukasmueller Feb 12, 2026
cc52379
login: fix count email query
ktmeaton Feb 12, 2026
603658c
modify plugin
titima15 Feb 12, 2026
8c2082a
Merge pull request #5899 from solgenomics/topic/remove_rce_vulnerability
lukasmueller Feb 12, 2026
3610293
Merge pull request #5897 from solgenomics/topic/experiment_usage
lukasmueller Feb 12, 2026
15c5f43
Merge pull request #5895 from solgenomics/topic/new_user_captcha
lukasmueller Feb 12, 2026
8f28972
Merge pull request #5892 from solgenomics/topic/fix_rank_accessions
lukasmueller Feb 12, 2026
38d7ea0
tests
titima15 Feb 12, 2026
cd5f25d
report errors from deletion using alert.
lukasmueller Feb 12, 2026
ba00d7b
let only curators create pages for now.
lukasmueller Feb 12, 2026
9514448
comment out unused function.
lukasmueller Feb 12, 2026
3b604da
improve error handling.
lukasmueller Feb 12, 2026
a2fcbdd
modify test
titima15 Feb 12, 2026
4da8fa8
Add generic file parser for spatial layout
ryan-preble Feb 13, 2026
6e60699
Finish up generic upload error handling
ryan-preble Feb 13, 2026
de9d619
modify plugin
titima15 Feb 13, 2026
0c0c6d7
include subplot in TrialDesignStore for plate
titima15 Feb 13, 2026
ec979db
Add job recording for spatial layout upload
ryan-preble Feb 13, 2026
833206c
Change file format note
ryan-preble Feb 13, 2026
79ce7e4
add missing files back for the docs.
lukasmueller Feb 13, 2026
06731ea
include subplots list type
titima15 Feb 13, 2026
d1754d8
Add test file
ryan-preble Feb 13, 2026
4e75af3
Merge pull request #5907 from solgenomics/topic/fix_deleted_manual_files
ryan-preble Feb 13, 2026
ffe69f7
Change schema statement
ryan-preble Feb 13, 2026
1b4b7fd
link well sample_id to subplot
titima15 Feb 13, 2026
9986aec
Disable BIOME_FORMAT and GITHUB_ACTIONS_ZIZMOR validation
ClayBirkett Feb 16, 2026
beaeaac
Merge branch 'master' into topic/bivariate-regression
isaak Feb 16, 2026
55a1b54
link well sample id to plot
titima15 Feb 16, 2026
454ed49
Merge pull request #5900 from solgenomics/topic/remove_contact_phone
isaak Feb 16, 2026
8afc0ed
Merge branch 'master' into topic/improve_layout_upload
ryan-preble Feb 16, 2026
cb88f17
Change file separators, monkey with test
ryan-preble Feb 16, 2026
4430fb5
Debugging
ryan-preble Feb 16, 2026
bc87ede
Add trial to associated objects
bm743 Feb 16, 2026
c739c53
fix the traits view again.
lukasmueller Feb 17, 2026
6699293
Add get_trials to image test
bm743 Feb 17, 2026
57fdc40
add option for 2, 4 quadrants scatter plot rendering
isaak Feb 17, 2026
274a3ee
Fix test
ryan-preble Feb 17, 2026
aa14f4d
replace return undef; with return; to make linter happy.
lukasmueller Feb 17, 2026
ede09be
grant permissions to web_usr for new wiki tables.
lukasmueller Feb 17, 2026
abdd6ae
retrieve source subplot
titima15 Feb 17, 2026
f75344d
add subplot info
titima15 Feb 17, 2026
b485145
Fix selenium test
ryan-preble Feb 17, 2026
4db7a60
Merge branch 'master' into topic/genotyping_plate_upload
titima15 Feb 17, 2026
a0b1508
code cleanup
ClayBirkett Feb 18, 2026
e6f5153
Change JavaScript validation from Standard to ES
ClayBirkett Feb 18, 2026
aa3a465
Fix another selenium test
ryan-preble Feb 18, 2026
1c4e2e5
Appease the linter
ryan-preble Feb 18, 2026
20c41c7
present an empty textarea when a new wiki page is created.
lukasmueller Feb 18, 2026
af6a04b
Merge branch 'master' into topic/transgene_assay
titima15 Feb 18, 2026
bc8ca5d
fix issues with ownership. Names of pages are converted to wiki forma…
lukasmueller Feb 18, 2026
a44c2dc
fix some issues with ownership and converted wiki names.
lukasmueller Feb 18, 2026
f1109a3
Fix linting errors
bm743 Feb 18, 2026
dcd8eb6
remove stray alert that interferes with selenium test.
lukasmueller Feb 18, 2026
ea06437
also remove special characters from the wiki page names.
lukasmueller Feb 18, 2026
b38b27c
keep track of page name using page name div.
lukasmueller Feb 18, 2026
9bd3a1e
fix an issue with page deletion. Delete the correct page.
lukasmueller Feb 18, 2026
aabf696
add selenium tests for single sign-on
ktmeaton Feb 19, 2026
c7110c0
disable buttons when login is not a curator.
lukasmueller Feb 19, 2026
3b5a233
Merge pull request #5896 from solgenomics/dependabot/github_actions/d…
lukasmueller Feb 19, 2026
4268df9
fix an issue with deletion and tweak the way code is called.
lukasmueller Feb 19, 2026
36b850e
check for wiki page names of zero length or only consisting of specia…
lukasmueller Feb 19, 2026
edc5af6
fix origin of page name div so that the correct page gets deleted.
lukasmueller Feb 19, 2026
055a53a
expand test by creating another new page, then deleting both new pages.
lukasmueller Feb 19, 2026
0db2646
fix typo
titima15 Feb 20, 2026
b6d4028
try to turn off css linting.
lukasmueller Feb 20, 2026
ac644ff
fix indent
lukasmueller Feb 20, 2026
2c9abe7
fix test
titima15 Feb 20, 2026
89619ff
apply indentation
isaak Feb 23, 2026
74c82a4
Merge pull request #5904 from solgenomics/topic/wiki_pages
lukasmueller Feb 23, 2026
4cfdb77
Adding new NIRs device
chris263 Feb 23, 2026
1d85c59
Use mason component to display supported file types for a generic fil…
dwaring87 Feb 23, 2026
82774d7
fix numeric operator
titima15 Feb 23, 2026
a5aec80
Use update_or_create to save stockprops
ryan-preble Feb 23, 2026
cae8473
Use datatable for associated objects
bm743 Feb 23, 2026
8490625
display values only genes with analyzed data
titima15 Feb 23, 2026
7e01c3a
add axis_mode arg to heatmap.plot call
isaak Feb 24, 2026
d7fe807
OLS model fitting lib
isaak Feb 24, 2026
59fe6ba
use olsLine lib
isaak Feb 24, 2026
95a088a
clean up
isaak Feb 24, 2026
20ba16a
modify data structure
titima15 Feb 24, 2026
38dab11
Merge pull request #5914 from solgenomics/topic/genotyping_plate_upload
lukasmueller Feb 24, 2026
668f7b9
fix trait query in old patches in case these patches are used as a ba…
lukasmueller Feb 24, 2026
65a433d
WIP: Improve Native Pheno Search SQL Query
dwaring87 Feb 24, 2026
d9ada80
Pheno Native SQL: restore project join
dwaring87 Feb 24, 2026
26d8a9e
Pheno Native SQL: fix missing germplasm
dwaring87 Feb 24, 2026
a086aa7
fix linting issues and attempt to untaint variable.
lukasmueller Feb 24, 2026
f2aca20
PhenotypeMatrix: Include obs units with no trait data in native search
dwaring87 Feb 24, 2026
5c29974
try to turn off linting for specific section of code.
lukasmueller Feb 24, 2026
500c8e3
fix variable typos.
lukasmueller Feb 24, 2026
6742e9a
pesky typos.
lukasmueller Feb 24, 2026
efa9c9e
Pheno Matrix: remove debugging output
dwaring87 Feb 24, 2026
2293f40
fix update function
titima15 Feb 24, 2026
2c9208d
clean up
titima15 Feb 24, 2026
f0160ae
fix indents; replace eval with secure Math::Expression::Evaluate.
lukasmueller Feb 24, 2026
eac36b2
Merge pull request #5910 from solgenomics/topic/fix_trait_view_again
lukasmueller Feb 25, 2026
fc5e3d4
retrieve gene info based on new data structure
titima15 Feb 25, 2026
7e2291b
assay data for transgenic line
titima15 Feb 25, 2026
8e2e719
Create instances and matrix endpoints
bm743 Feb 25, 2026
d1df2a8
Add protocol, matrix, instances to controller
bm743 Feb 25, 2026
7f8a56e
Add transcriptomics to hdp brapi tests
bm743 Feb 25, 2026
fbca509
allow ND for value but exclude for calculation
titima15 Feb 25, 2026
19396f3
modify spreadsheet info
titima15 Feb 25, 2026
d3cd15a
add coordinate and intercross as authorized clients
trife Feb 25, 2026
641da5f
enable sort
titima15 Feb 26, 2026
d594a93
Merge pull request #5917 from solgenomics/topic/adding_nirs_devices
lukasmueller Feb 26, 2026
7fbd3aa
Fix TrialMetadata heatmap test
dwaring87 Feb 26, 2026
c9bc702
sorted names
titima15 Feb 26, 2026
2395ddb
remove querying of stockprop materialized from vector search.
lukasmueller Feb 26, 2026
392280f
Merge pull request #5929 from trife/add-phenoapps-clients
lukasmueller Feb 26, 2026
2dc3448
Add transcriptomics test files
bm743 Feb 26, 2026
0422280
validate if accessions have the expected vector
titima15 Feb 26, 2026
e1f7811
fix an issue with attribute display in table.
lukasmueller Feb 26, 2026
91dbbb7
TrialMetadata: better match previous phenotype heatmap results
dwaring87 Feb 27, 2026
de47424
Add a page refresh after upload is done
ryan-preble Feb 27, 2026
8794f1f
Fix BrAPI observationunits/table test
dwaring87 Feb 27, 2026
4f1115a
Fix 2nd BrAPI observationunits/table test
dwaring87 Feb 27, 2026
3b9fd4d
Fix selenium tests
ryan-preble Feb 27, 2026
e200702
Add Native Phenotype Matrix test for plots with no trait data
dwaring87 Feb 27, 2026
b034cd1
clean up
titima15 Feb 27, 2026
308827a
Forgot to change the number of tests in plan
ryan-preble Feb 27, 2026
aee7efc
Merge branch 'master' into topic/transgene_assay
titima15 Mar 1, 2026
cb637f3
fix multiple values retrieval problem.
lukasmueller Mar 2, 2026
d2c2d04
modified spreadsheet info
titima15 Mar 2, 2026
1757008
Phenotype Test: remove data check
dwaring87 Mar 2, 2026
553579e
Merge pull request #5912 from solgenomics/topic/improve_layout_upload
lukasmueller Mar 2, 2026
01927d2
fix conflict.
lukasmueller Mar 2, 2026
5344fa3
Merge pull request #5936 from solgenomics/topic/vector_search_stuff
lukasmueller Mar 2, 2026
6acc777
Merge pull request #5922 from solgenomics/topic/pheno_download_empty_…
lukasmueller Mar 2, 2026
109a6a2
Merge pull request #5906 from solgenomics/topic/seedlot_inventory_upload
lukasmueller Mar 2, 2026
8ad5939
Merge pull request #5876 from solgenomics/topic/manage_propagation
lukasmueller Mar 2, 2026
c36684e
fix conflict
titima15 Mar 2, 2026
5434944
modify mysterious stockprop list.
lukasmueller Mar 2, 2026
b4d872e
Merge pull request #5911 from solgenomics/topic/image_page_metadata
lukasmueller Mar 3, 2026
3e684c7
remove materialized_stockprop from stock search.
lukasmueller Mar 3, 2026
29dca2c
fix linting issue
isaak Mar 3, 2026
b95f3ae
fix synonym and pedigree parsing.
lukasmueller Mar 3, 2026
cfd6539
do not refresh stockprop matview.
lukasmueller Mar 3, 2026
113fab9
name tests and fix some of them.
lukasmueller Mar 3, 2026
bd5fdcd
name unnamed tests and fix.
lukasmueller Mar 3, 2026
6b96d8b
fixing family name and PUI
lukasmueller Mar 3, 2026
75c4baa
test
titima15 Mar 3, 2026
3cf4992
move dbpatch
titima15 Mar 3, 2026
58be375
try to fix PUI parsing.
lukasmueller Mar 3, 2026
8eea42d
change from iframePostForm to ajax
titima15 Mar 3, 2026
ce09400
tweak PUI handling...
lukasmueller Mar 4, 2026
87ffab9
tweak how documentationURL is handled; do not refresh stockprop matview.
lukasmueller Mar 4, 2026
49550ee
tweak handling of documentationURL (it is handled in the BrAPI Germpl…
lukasmueller Mar 4, 2026
6d456b8
remove stockprop refresh calls.
lukasmueller Mar 4, 2026
586ab88
remove stockprop matview refresh calls.
lukasmueller Mar 4, 2026
8c74c15
tweak test results for documentationURL. Test expects some nonsensica…
lukasmueller Mar 4, 2026
024d539
tweak test result number of pages.
lukasmueller Mar 4, 2026
13f0642
remove more stockprop matview refresh calls.
lukasmueller Mar 4, 2026
649d670
undo the renaming of a location at the end of the _BrAPIv2_core.t and…
lukasmueller Mar 4, 2026
802d288
allow submitters to search obsoleted stocks and comment out vector vi…
titima15 Mar 4, 2026
c6fd1c8
comment out vectorviewer test
titima15 Mar 4, 2026
1ccf290
comment out vectorviewer test
titima15 Mar 5, 2026
e0fe238
also exclude germplasm.t test file because linter identifies random k…
lukasmueller Mar 5, 2026
ab1f06b
tweak number of results returned back to previous value.
lukasmueller Mar 5, 2026
ea42124
fix URL display for stock dbxref relationships.
lukasmueller Mar 5, 2026
8c2841c
Merge pull request #5939 from solgenomics/topic/bivariate-regression
lukasmueller Mar 5, 2026
09c3074
Merge pull request #5927 from solgenomics/topic/transcriptomics_brapi…
lukasmueller Mar 5, 2026
1210188
Merge pull request #5921 from solgenomics/topic/derive_trait_bugfixes
lukasmueller Mar 5, 2026
7a6812e
move vector viewer out of the way as it has been inactivated temporar…
lukasmueller Mar 5, 2026
1bf3709
Merge pull request #5940 from solgenomics/topic/transgene_assay
lukasmueller Mar 5, 2026
149bce4
tweak error reporting from onto browser and improve appearance.
lukasmueller Mar 5, 2026
0c73a5f
add a warning not to print from the browser directly.
lukasmueller Mar 6, 2026
48465af
Merge branch 'master' into topic/search_accession_page
lukasmueller Mar 6, 2026
9986ddc
Merge pull request #5943 from solgenomics/topic/remove_stockprop_matv…
lukasmueller Mar 6, 2026
de92484
Merge pull request #5945 from solgenomics/topic/search_accession_page
lukasmueller Mar 6, 2026
cc26577
Accession Upload: optional list creation
dwaring87 Mar 9, 2026
f31e5e0
Merge pull request #5946 from solgenomics/topic/fix_additional_stock_…
lukasmueller Mar 9, 2026
7dc0b42
Merge pull request #5873 from BFF-AFIRMS/topic/login-oidc
lukasmueller Mar 9, 2026
92d6530
Merge remote-tracking branch 'sgn/master' into topic/accession_upload…
dwaring87 Mar 9, 2026
a69576b
Fix keycloak linting errors
dwaring87 Mar 11, 2026
e407efd
Fix gitleaks config file env var
dwaring87 Mar 11, 2026
c5c568d
Gitleaks: add rule to .gitleaksignore for keycloak Dockerfile
dwaring87 Mar 11, 2026
788cf0e
Remove port from keycloak Dockerfile
dwaring87 Mar 11, 2026
dd355ec
Improve visibility of warning message
ryan-preble Mar 12, 2026
2378b10
Merge pull request #5958 from solgenomics/topic/fix_keycloak_linting
lukasmueller Mar 12, 2026
f6eea79
Merge remote-tracking branch 'sgn/master' into topic/accession_upload…
dwaring87 Mar 12, 2026
898d8d0
add missing semicolon so that borders are rendered with thickness of 1.
lukasmueller Mar 12, 2026
cc9c549
fix an issue with the WikiHome page in which links to other pages wer…
lukasmueller Mar 12, 2026
ec03683
Merge branch 'master' into topic/add_labeldesigner_warning
lukasmueller Mar 12, 2026
58f4cfc
Foward tools/compose to tools/compose_trait
ryan-preble Mar 12, 2026
a4d4b99
Merge pull request #5963 from solgenomics/topic/fix_wiki_link_issue
lukasmueller Mar 14, 2026
288e9a7
Merge pull request #5951 from solgenomics/topic/add_labeldesigner_war…
lukasmueller Mar 14, 2026
3e82619
Merge pull request #5950 from solgenomics/topic/tweak_onto_browser_error
lukasmueller Mar 14, 2026
495bab9
Merge pull request #5964 from solgenomics/topic/fix_compose_trait_link
lukasmueller Mar 14, 2026
0f34253
Change description of list created from accession upload so it is not…
dwaring87 Mar 16, 2026
c053932
Merge pull request #5953 from solgenomics/topic/accession_upload_lists
lukasmueller Mar 16, 2026
baff916
fix vector page
titima15 Mar 16, 2026
2a38486
modify description
titima15 Mar 16, 2026
570694e
Merge pull request #5970 from solgenomics/topic/fix_vector_page
lukasmueller Mar 16, 2026
fe9229c
fix an issue with links on the homepage.
Mar 16, 2026
48b3c8d
Merge pull request #5972 from solgenomics/topic/wiki_home_redirect
lukasmueller Mar 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/docs/*
5 changes: 5 additions & 0 deletions .github/linters/.htmlhintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"head-script-disabled": false,
"alt-require": false,
"id-class-value": false
}
3 changes: 3 additions & 0 deletions .github/workflows/.htmlhintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"head-script-disabled": false
}
53 changes: 53 additions & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
name: Lint

on: # yamllint disable-line rule:truthy
push:
branches:
- 'master'
pull_request:
branches:
- 'master'

permissions: {}

env:
FILTER_REGEX_EXCLUDE: "docs/.*|t/unit_mech/AJAX/_BrAPIv2_germplasm.t"

jobs:
build:
name: Lint
runs-on: ubuntu-latest

permissions:
contents: read
packages: read
# To report GitHub Actions status checks
statuses: write

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
# super-linter needs the full git history to get the
# list of files that changed across commits
fetch-depth: 0

- name: Super-linter
uses: super-linter/super-linter@v8.3.1 # x-release-please-version
env:
# To report GitHub Actions status checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HTMLHINT_CONFIG_FILE: .github/linters/.htmlhintrc
VALIDATE_ALL_CODEBASE: false
VALIDATE_ANSIBLE: false
VALIDATE_CHECKOV: false
VALIDATE_JSCPD: false
VALIDATE_LATEX: false
VALIDATE_CSS: false
FIX_YAML_PRETTIER: true
VALIDATE_JAVASCRIPT_PRETTIER: false
VALIDATE_JAVASCRIPT_ES: false
VALIDATE_SQLFLUFF: false
VALIDATE_BIOME_FORMAT: false
VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
47 changes: 47 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes/marge targeting the default branch
push:
branches: ["master"]
paths:
- 'docs/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy_static_pages:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload docs only
path: './docs'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4


25 changes: 23 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,27 @@ jobs:
- ${{ github.workspace }}:/home/vagrant/cxgn/sgn
options: --health-cmd="curl --silent --head http://localhost:4444 || exit 1"

keycloak_db:
image: postgres:13.0
env:
POSTGRES_DB: keycloak
POSTGRES_PASSWORD: postgres
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5

keycloak:
image: bffafirms/keycloak:26.5.1-0-breedbase-testing
env:
KC_DB_USERNAME: postgres
KC_DB_PASSWORD: postgres
KC_BOOTSTRAP_ADMIN_PASSWORD: password

steps:
- name: Checkout sgn
uses: actions/checkout@v2
uses: actions/checkout@v5

- name: Run unit tests
run: prove --recurse t/unit 2>/dev/null
Expand Down Expand Up @@ -75,6 +93,9 @@ jobs:
- name: Run selenium tests dataset
run: /entrypoint.sh --nopatch t/selenium2/03_dataset 2>/dev/null

- name: Run selenium tests authenticate
run: /entrypoint.sh --nopatch t/selenium2/authenticate 2>/dev/null

- name: Run selenium tests breeders
run: /entrypoint.sh --nopatch t/selenium2/breeders 2>/dev/null

Expand All @@ -88,4 +109,4 @@ jobs:
run: /entrypoint.sh --nopatch t/selenium2/stock 2>/dev/null

- name: Run selenium tests tools
run: /entrypoint.sh --nopatch t/selenium2/tools 2>/dev/null
run: /entrypoint.sh --nopatch t/selenium2/tools 2>/dev/null
45 changes: 45 additions & 0 deletions .github/workflows/test_static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Simple workflow for deploying static content to GitHub Pages
name: Build documentation with R bookmark

on:
# Runs on pushes/marge targeting the default branch
pull_request:
paths:
- 'docs/r_markdown_docs/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: write
id-token: write

jobs:
# Single deploy job since we're just deploying
build_and_deploy_static_pages_for_manual:
runs-on: ubuntu-latest
container:
image: bienkowskid/fedora40-r-bookdown
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
- name: Save directory for checkout
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Create gitbook
working-directory: ./docs/r_markdown_docs
run: R -q -e 'bookdown::render_book("index.Rmd", "bookdown::gitbook")'
- name: Create manual pdf
working-directory: ./docs/r_markdown_docs
run: R -q -e 'bookdown::render_book("index.Rmd", "bookdown::pdf_book")'
- name: Commit and push documentation
run: |
date > generated.txt
git config user.name github-actions
git config user.email github-actions@github.com
git add --force --all docs/
git commit -m "update bookdown docs"
git push
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,8 @@ typescript
docs/Gemfile.lock
docs/_site/
.DS_Store
sgn.iml
sgn.iml
docs/*
!docs/r_markdown_docs/
!docs/r_markdown_docs/**
.idea/
116 changes: 116 additions & 0 deletions R/DRRC.r
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@

args=commandArgs(TRUE)

##args is now a list of character vectors
## First check to see if arguments are passed.
## Then cycle through each element of the list and evaluate the expressions.

if(length(args)==0){
print("No arguments supplied.")
##supply default values
paramfile=''
} else {
for(i in 1:length(args)){
print(paste("Processing arg ", args[[i]]));
eval(parse(text=args[[i]]))
}
}

library(reshape2)
library(dplyr)
library(blocksdesign)

source(paramfile)
## 1) Preparing dataframe
all.clones <- treatments
nTrt <- length(all.clones)
nRep <- nRep
nRows <- nRow
nCols <- nCol
# nCols <- nTrt*nRep/nRows
rowsPerBlock <- nTrt/nCols
colsPerBlock <- nTrt/nRows
superCols <- nCols/colsPerBlock
totalPlots <- nTrt*nRep

plot_type <- plot_type
plot_start <- plot_start

blocks = data.frame(block_number = gl(nRep,nTrt),
Cols = gl(superCols,colsPerBlock,totalPlots),
row_number = gl(nRows,nCols,totalPlots),
col_number = gl(nCols,1,totalPlots))

## Setting rep number orthogonal to block number
rep_number = as.numeric(blocks$Cols)


# treatments = data.frame(treatments =gl(nTrt,1,totalPlots))
Z=design(all.clones,blocks, searches = 50, weighting=0.5)
fieldBook <- Z$Design

trialMatrix <- matrix(0,nRows,nCols)

for(i in 1:nrow(fieldBook)){
trialMatrix[fieldBook$subRows[i],fieldBook$subCols[i]]<-fieldBook$treatments[i]
}
trialMatrix

## Adding plot number
colnames(fieldBook)[5] <- "plot_number"

fieldBook$block_number <- as.integer(fieldBook$block_number)
fieldBook$row_number <- as.integer(fieldBook$row_number)
fieldBook$col_number <- as.integer(fieldBook$col_number)

# Load dplyr
library(dplyr)

# Arrange fieldBook by row_number and col_number
fieldBook <- fieldBook %>% arrange(row_number, col_number)
fieldBook$plot_number <- c(1:totalPlots)
fieldBook$plot_id <- c(1:nTrt)



## Number start
## 00101 will be added for NCSU
if(plot_start == "00101"){
fieldBook$plot_number = paste0(formatC(fieldBook$block_number,width=3,flag="0"),
formatC(fieldBook$plot_id,width=2,flag="0"))
}else if (plot_start == 1001){
fieldBook$plot_number <- (1000*fieldBook$block_number)+fieldBook$plot_id
}else if (plot_start == 101) {
fieldBook$plot_number <- (100*fieldBook$block_number)+fieldBook$plot_id
}

cat("plot start is ", plot_start,"\n")
cat("plot type is ", plot_type,"\n")

plot_type = "serpentine"
## Plot number format
if(plot_type == "serpentine"){
for(i in 1:nRows){
if(i%%2==0){
fieldBook[fieldBook$row_number == i, "plot_number"] <- rev(fieldBook[fieldBook$row_number==i,"plot_number"])
}
}
}

fieldBook$rep_number <- rep_number


#### create is_a_control
names(fieldBook)[names(fieldBook) == "treatments"] <- "accession_name"
fieldBook <- transform(fieldBook, is_a_control = ifelse(fieldBook$accession_name %in% controls, 1, 0))

design <- fieldBook %>% dplyr::select(block_number, rep_number, row_number, col_number, plot_number, accession_name, is_a_control)

head(design)

# save result files
basefile <- tools::file_path_sans_ext(paramfile)
outfile = paste(basefile, ".design", sep="");
sink(outfile)
write.table(design, quote=F, sep='\t', row.names=FALSE)
sink();
Loading