Skip to content

Commit 09c5da4

Browse files
chremanchreman
authored
Merge pull request #605 from OpenKnowledgeMaps/dev
Biweekly release (21-11-25)
2 parents f0618c2 + 6095a04 commit 09c5da4

30 files changed

Lines changed: 477 additions & 187 deletions

‎README.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Head Start is a web-based knowledge mapping software intended to give researcher
99
### Client
1010
To get started, clone this repository. Next, duplicate the file `config.example.js` in the root folder and rename it to `config.js`.
1111

12-
Make sure to have `npm` version 6.11.3 installed (it comes with Node.js 10.17.0, best way to install is with [nvm](https://github.com/nvm-sh/nvm), `nvm install 10.17.0`) and run the following two commands to build the Headstart client:
12+
Make sure to have installed `node` version >= 14.18.1 and `npm` version >=8.1.1 (best way to install is with [nvm](https://github.com/nvm-sh/nvm), `nvm install 14.18.1`) and run the following two commands to build the Headstart client:
1313

1414
npm install
1515
npm run dev
@@ -24,9 +24,12 @@ To run Headstart on a different server (e.g. Apache), you need to set the public
2424
* Dev: specify the full path including protocol, e.g. `http://localhost/headstart/dist`
2525
* Production: specify the full path excluding protocol, e.g. `//example.org/headstart/dist`
2626

27-
Point your browser to the following address:
27+
Point your browser to one of the following addresses:
2828

29-
http://localhost:8080/examples/local_files/index.html
29+
http://localhost:8080/local_files/
30+
http://localhost:8080/local_streamgraph/
31+
http://localhost:8080/project_website/base.html
32+
http://localhost:8080/project_website/pubmed.html
3033

3134
If everything has worked out, you should see the visualization shown above.
3235

@@ -42,7 +45,7 @@ See [Installing and configuring the server](doc/server_config.md) for instructio
4245

4346
Maintainer: [Peter Kraker](https://github.com/pkraker) ([pkraker@openknowledgemaps.org](mailto:pkraker@openknowledgemaps.org))
4447

45-
Authors: [Maxi Schramm](https://github.com/tanteuschi), [Christopher Kittel](https://github.com/chreman), [Asura Enkhbayar](https://github.com/Bubblbu), [Scott Chamberlain](https://github.com/sckott), [Rainer Bachleitner](https://github.com/rbachleitner), [Yael Stein](https://github.com/jaels), [Thomas Arrow](https://github.com/tarrow), [Mike Skaug](https://github.com/mikeskaug), [Philipp Weissensteiner](https://github.com/wpp), and the [Open Knowledge Maps team](http://openknowledgemaps.org/team)
48+
Authors: [Maxi Schramm](https://github.com/tanteuschi), [Christopher Kittel](https://github.com/chreman), [Jan Konstant](https://github.com/konstiman), [Asura Enkhbayar](https://github.com/Bubblbu), [Scott Chamberlain](https://github.com/sckott), [Rainer Bachleitner](https://github.com/rbachleitner), [Yael Stein](https://github.com/jaels), [Thomas Arrow](https://github.com/tarrow), [Mike Skaug](https://github.com/mikeskaug), [Philipp Weissensteiner](https://github.com/wpp), and the [Open Knowledge Maps team](http://openknowledgemaps.org/team)
4649

4750

4851
## Features

‎examples/gsheets/data-config.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ var data_config = {
2626

2727
content_based: true,
2828
is_evaluation: true,
29-
evaluation_service: ["matomo"],
3029

3130
is_force_areas: true,
3231
area_force_alpha: 0.03,

‎examples/local_streamgraph/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = {
1111

1212
Then the process is the same as with the local files example: start the dev server npm start. When the build is done, the streamgraph can be accessed at
1313

14-
`http://localhost:8080/examples/local_streamgraph/index.html`
14+
`http://localhost:8080/local_streamgraph/`
1515

1616
In future, it might be nice to come up with a solution that doesn't involve config file, but uses for example a system variable or a specific npm run command.
1717

‎examples/project_website/base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33

44
<head>
5-
<base href="//localhost:8080/examples/project_website/">
5+
<base href="//localhost:8080/project_website/">
66

77
<script type="text/javascript" src="./data-config_base.js"></script>
88
<title>

‎examples/project_website/data-config_base.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ var data_config = {
3838
show_keywords: true,
3939

4040
is_evaluation: true,
41-
evaluation_service: ["matomo"],
4241

4342
use_hypothesis: true,
4443

‎examples/project_website/data-config_pubmed.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ var data_config = {
3737
show_keywords: true,
3838

3939
is_evaluation: true,
40-
evaluation_service: ["matomo"],
4140

4241
use_hypothesis: true,
4342

‎examples/project_website/pubmed.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33

44
<head>
5-
<base href="//localhost:8080/examples/project_website/">
5+
<base href="//localhost:8080/project_website/">
66

77

88
<script type="text/javascript" src="./data-config_pubmed.js"></script>

‎examples/viper/js/data-config_openaire.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ var data_config = {
6464
},
6565

6666
is_evaluation: true,
67-
evaluation_service: ["ga", "matomo"],
6867

6968
use_hypothesis: true,
7069

‎vis/js/actions/index.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export const NOT_QUEUED_IN_ANIMATION = [
2020
"ZOOM_OUT",
2121
"SELECT_PAPER",
2222
"DESELECT_PAPER",
23-
"DESELECT_PAPER_BACKLINK",
2423
"FILE_CLICKED",
2524
"SEARCH",
2625
"FILTER",
@@ -29,20 +28,23 @@ export const NOT_QUEUED_IN_ANIMATION = [
2928

3029
export const zoomIn = (
3130
selectedAreaData,
32-
source = null,
3331
callback,
34-
alreadyZoomed = false
32+
alreadyZoomed = false,
33+
isFromBackButton = false,
34+
selectedPaperData = null
3535
) => ({
3636
type: "ZOOM_IN",
3737
selectedAreaData,
38-
source,
3938
callback,
4039
alreadyZoomed,
40+
isFromBackButton,
41+
selectedPaperData,
4142
});
4243

43-
export const zoomOut = (callback) => ({
44+
export const zoomOut = (callback, isFromBackButton = false) => ({
4445
type: "ZOOM_OUT",
4546
callback,
47+
isFromBackButton,
4648
});
4749

4850
/**
@@ -97,10 +99,11 @@ export const filter = (id) => ({ type: "FILTER", id });
9799

98100
export const sort = (id) => ({ type: "SORT", id });
99101

100-
export const selectPaper = (paper) => ({
102+
export const selectPaper = (paper, isFromBackButton = false) => ({
101103
type: "SELECT_PAPER",
102104
safeId: paper.safe_id,
103105
paper,
106+
isFromBackButton,
104107
});
105108

106109
export const deselectPaper = () => ({ type: "DESELECT_PAPER" });
@@ -114,10 +117,6 @@ export const showPreview = (paper) => ({ type: "SHOW_PREVIEW", paper });
114117

115118
export const hidePreview = () => ({ type: "HIDE_PREVIEW" });
116119

117-
export const deselectPaperBacklink = () => ({
118-
type: "DESELECT_PAPER_BACKLINK",
119-
});
120-
121120
export const updateDimensions = (chart, list) => ({
122121
type: "RESIZE",
123122
listHeight: list.height,

‎vis/js/components/KnowledgeMap.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const KnowledgeMap = (props) => {
3434
};
3535

3636
const handleOtherAreaZoomIn = (bubble) => {
37-
handleDeselectPaper();
3837
handleZoomIn(bubble, true);
3938
trackMatomoEvent("Knowledge map", "Zoom in", "Bubble");
4039
};

0 commit comments

Comments
 (0)