- npm updates

- add solr connection via environment variables
This commit is contained in:
Arno Kaimbacher 2022-01-21 14:02:28 +01:00
parent ae9ff3c24d
commit b0aeb03d15
5 changed files with 432 additions and 433 deletions

847
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -8,6 +8,7 @@ import { SolrSettings } from "@/models/solr";
import { Options, Vue } from "vue-class-component"; import { Options, Vue } from "vue-class-component";
import { Prop, Emit } from "vue-property-decorator"; import { Prop, Emit } from "vue-property-decorator";
import { Dataset, Suggestion, SearchType } from "@/models/dataset"; import { Dataset, Suggestion, SearchType } from "@/models/dataset";
import { SOLR_HOST, SOLR_CORE } from "@/constants";
@Options({ @Options({
name: "VsInput", name: "VsInput",
@ -31,8 +32,8 @@ export default class VsInput extends Vue {
private selectedIndex = 0; private selectedIndex = 0;
private selectedDisplay = ""; private selectedDisplay = "";
private solr: SolrSettings = { private solr: SolrSettings = {
core: "rdr_data", // SOLR.core; core: SOLR_CORE, //"rdr_data", // SOLR.core;
host: "tethys.at", host: SOLR_HOST, //"tethys.at",
// core: "test_data", // SOLR.core; // core: "test_data", // SOLR.core;
// host: "repository.geologie.ac.at", // host: "repository.geologie.ac.at",
}; };

View File

@ -1,11 +1,17 @@
// declare const POINT_URL: string; // declare const POINT_URL: string;
// declare const EDGE_URL: string; // declare const EDGE_URL: string;
declare const VUE_APP_PORTAL: string; declare const VUE_APP_PORTAL: string;
declare const SOLR_HOST: string;
declare const SOLR_CORE: string;
// const _EDGE_URL = EDGE_URL; // const _EDGE_URL = EDGE_URL;
// const _POINT_URL = POINT_URL; // const _POINT_URL = POINT_URL;
const _VUE_APP_PORTAL = VUE_APP_PORTAL; const _VUE_APP_PORTAL = VUE_APP_PORTAL;
const _SOLR_HOST = SOLR_HOST;
const _SOLR_CORE = SOLR_CORE;
// export { _EDGE_URL as EDGE_URL }; // export { _EDGE_URL as EDGE_URL };
// export { _POINT_URL as POINT_URL }; // export { _POINT_URL as POINT_URL };
export { _VUE_APP_PORTAL as VUE_APP_PORTAL }; export { _VUE_APP_PORTAL as VUE_APP_PORTAL };
export { _SOLR_HOST as SOLR_HOST };
export { _SOLR_CORE as SOLR_CORE };

View File

@ -10,6 +10,7 @@ import DatasetService from "../../services/dataset.service";
import { Suggestion, Dataset, SearchType } from "@/models/dataset"; import { Suggestion, Dataset, SearchType } from "@/models/dataset";
import { SolrResponse, FacetFields, FacetItem, FacetResults, FacetInstance } from "@/models/headers"; import { SolrResponse, FacetFields, FacetItem, FacetResults, FacetInstance } from "@/models/headers";
import { ActiveFilterCategories } from "@/models/solr"; import { ActiveFilterCategories } from "@/models/solr";
import { SOLR_HOST, SOLR_CORE } from "@/constants";
@Options({ @Options({
name: "SearchViewComponent", name: "SearchViewComponent",
@ -44,8 +45,8 @@ export default class SearchViewComponent extends Vue {
loaded = false; loaded = false;
numFound!: number; numFound!: number;
private solr: SolrSettings = { private solr: SolrSettings = {
core: "rdr_data", // SOLR.core; core: SOLR_CORE, //"rdr_data", // SOLR.core;
host: "tethys.at", host: SOLR_HOST, //"tethys.at",
// core: "test_data", // SOLR.core; // core: "test_data", // SOLR.core;
// host: "repository.geologie.ac.at", // host: "repository.geologie.ac.at",
}; };

View File

@ -28,6 +28,8 @@ module.exports = {
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
VUE_APP_PORTAL: JSON.stringify(process.env.VUE_APP_PORTAL), VUE_APP_PORTAL: JSON.stringify(process.env.VUE_APP_PORTAL),
SOLR_HOST: JSON.stringify(process.env.SOLR_HOST),
SOLR_CORE: JSON.stringify(process.env.SOLR_CORE),
}), }),
], ],
}, },