diff --git a/package.json b/package.json
index dc9b40816..f8a4c54af 100644
--- a/package.json
+++ b/package.json
@@ -19,20 +19,25 @@
"dependencies": {
"@casl/ability": "~4.0.0",
"@casl/vue": "^1.1.1",
+ "@popperjs/core": "^2.11.8",
+ "@solgenomics/brapi-graphical-filtering": "github:Breeding-Insight/BrAPI-Graphical-Filtering#master",
"@solgenomics/brapi-pedigree-viewer": "git+https://github.com/Breeding-Insight/BrAPI-Pedigree-Viewer#v2.0.3",
- "@solgenomics/brapijs": "git+https://github.com/Breeding-Insight/BrAPI-js#v2.0.2",
+ "@solgenomics/brapijs": "git+https://github.com/Breeding-Insight/BrAPI-js#feature/BI-1936",
"@solgenomics/d3-pedigree-tree": "git+https://github.com/solgenomics/d3-pedigree-tree#f799b499c8019cfccd550d4297196e365c208d5c",
"@types/flat": "^5.0.2",
"@types/promise.allsettled": "^1.0.3",
"@types/valid-url": "^1.0.3",
"@types/vuelidate": "^0.7.10",
"@xstate/fsm": "^1.4.0",
+ "bootstrap": "^5.3.3",
"core-js": "^3.4.3",
"d3": "^4.11.0",
+ "datatables.net-dt": "^2.1.8",
"dompurify": "^3.0.6",
"flat": "^5.0.2",
"focus-trap": "^5.1.0",
"focus-trap-vue": "0.0.6",
+ "jquery": "^3.7.1",
"title-case": "^3.0.3",
"uuid": "^8.3.2",
"valid-url": "^1.0.9",
@@ -60,6 +65,7 @@
"@types/d3": "^7.1.0",
"@types/dompurify": "^3.0.5",
"@types/jest": "^24.9.0",
+ "@types/jquery": "^3.5.31",
"@types/uuid": "^8.3.0",
"@vue/cli-plugin-babel": "^4.1.0",
"@vue/cli-plugin-e2e-cypress": "^4.1.0",
@@ -86,10 +92,10 @@
"execa": "^4.0.0",
"json-beautify": "^1.1.1",
"minimist": "^1.2.5",
- "node-sass": "^4.14.1",
"ora": "^4.0.3",
"pa11y": "^5.3.0",
"pa11y-reporter-json": "^1.0.0",
+ "sass": "^1.79.5",
"sass-loader": "^8.0.0",
"shelljs": "^0.8.3",
"typescript": "~3.5.3",
diff --git a/src/router/index.ts b/src/router/index.ts
index afbd08f38..6bbdff0b8 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -63,6 +63,7 @@ import GermplasmByList from "@/views/germplasm/GermplasmByList.vue";
import GermplasmLists from "@/views/germplasm/GermplasmLists.vue";
import BreedingMethods from "@/views/germplasm/BreedingMethods.vue";
import GermplasmDetails from "@/views/germplasm/GermplasmDetails.vue";
+import GermplasmAdvancedSearch from "@/views/germplasm/GermplasmAdvancedSearch.vue";
import ProgramConfiguration from "@/views/program/ProgramConfiguration.vue";
import JobManagement from '@/views/program/JobManagement.vue';
import GermplasmPedigreesView from "@/components/germplasm/GermplasmPedigreesView.vue";
@@ -286,6 +287,15 @@ const routes = [
layout: layouts.userSideBar
},
component: GermplasmLists
+ },
+ {
+ path: 'germplasm-search',
+ name: 'germplasm-search',
+ meta: {
+ title: 'Germplasm Advanced Search',
+ layout: layouts.userSideBar
+ },
+ component: GermplasmAdvancedSearch
}
]
},
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index ee1f107f6..e091a4107 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -87,3 +87,4 @@ declare module 'flat';
declare module '@solgenomics/brapi-pedigree-viewer';
declare module '@solgenomics/brapijs';
declare module '@solgenomics/d3-pedigree-tree';
+declare module '@solgenomics/brapi-graphical-filtering'
diff --git a/src/views/germplasm/Germplasm.vue b/src/views/germplasm/Germplasm.vue
index d84dcf291..9b2e431f5 100644
--- a/src/views/germplasm/Germplasm.vue
+++ b/src/views/germplasm/Germplasm.vue
@@ -37,6 +37,13 @@
active-class="is-active"
>
Lists
+
+
+ Advanced Search
+
+
+
+
+
+