deleted file dropdown component and logic

Konstiman · Konstiman · commit e541f26675f9 · 2022-01-05T10:16:33.000+01:00
diff --git a/examples/gsheets/data-config.js b/examples/gsheets/data-config.js
@@ -12,7 +12,6 @@ var data_config = {
     preview_type: "pdf",
     use_hypothesis: true,
 
-    show_dropdown: false,
     show_intro: false,
     show_list:true,
     is_force_papers: true,
diff --git a/examples/project_website/data-config_base.js b/examples/project_website/data-config_base.js
@@ -14,7 +14,6 @@ var data_config = {
   base_unit: "citations",
   use_area_uri: true,
   show_multiples: false,
-  show_dropdown: false,
   preview_type: "pdf",
   sort_options: ["relevance", "title", "authors", "year"],
   is_force_areas: true,
diff --git a/examples/project_website/data-config_pubmed.js b/examples/project_website/data-config_pubmed.js
@@ -14,7 +14,6 @@ var data_config = {
     base_unit: "citations",
     use_area_uri: true,
     show_multiples: false,
-    show_dropdown: false,
     preview_type: "pdf",
     sort_options: ["readers", "title", "authors", "year"],
     is_force_areas: true,
diff --git a/examples/search_repos/data-config_base.js b/examples/search_repos/data-config_base.js
@@ -7,7 +7,6 @@ var data_config = {
     title: "",
     base_unit: "citations",
     use_area_uri: true,
-    show_dropdown: false,
     preview_type: "pdf",
     sort_options: ["relevance", "title", "authors", "year"],
     is_force_areas: true,
diff --git a/examples/search_repos/data-config_doaj.js b/examples/search_repos/data-config_doaj.js
@@ -7,7 +7,6 @@ var data_config = {
     title: "",
     base_unit: "citations",
     use_area_uri: true,
-    show_dropdown: false,
     preview_type: "pdf",
     sort_options: ["readers", "title", "authors", "year"],
     is_force_areas: true,
diff --git a/examples/search_repos/data-config_plos.js b/examples/search_repos/data-config_plos.js
@@ -7,7 +7,6 @@ var data_config = {
     title: "",
     base_unit: "views",
     use_area_uri: true,
-    show_dropdown: false,
     preview_type: "pdf",
     sort_options: ["readers", "title", "authors", "year"],
     is_force_areas: true,
diff --git a/examples/search_repos/data-config_pubmed.js b/examples/search_repos/data-config_pubmed.js
@@ -7,7 +7,6 @@ var data_config = {
     title: "",
     base_unit: "citations",
     use_area_uri: true,
-    show_dropdown: false,
     preview_type: "pdf",
     sort_options: ["readers", "title", "authors", "year"],
     is_force_areas: true,
diff --git a/examples/server_files/data-config.js b/examples/server_files/data-config.js
@@ -8,6 +8,5 @@ var data_config = {
     use_area_uri: false,
     is_force_areas: false,
     url_prefix: "http://mendeley.com/catalog/",
-    show_dropdown: true,
     show_intro: false
 };
diff --git a/examples/viper/js/data-config_openaire.js b/examples/viper/js/data-config_openaire.js
@@ -15,7 +15,6 @@ var data_config = {
     service: "openaire",
     base_unit: "citations",
     use_area_uri: true,
-    show_dropdown: false,
     preview_type: "pdf",
     sort_options: ["title", "authors", "year", "citations", "tweets", "readers"],
     filter_menu_dropdown: true,
diff --git a/vis/js/actions/index.js b/vis/js/actions/index.js
@@ -16,7 +16,6 @@ export const NOT_QUEUED_IN_ANIMATION = [
   "ZOOM_OUT",
   "SELECT_PAPER",
   "DESELECT_PAPER",
-  "FILE_CLICKED",
   "SEARCH",
   "FILTER",
   "SORT",
@@ -85,12 +84,6 @@ export const initializeStore = (
   scalingFactors,
 });
 
-/**
- * Action for changing the local file.
- * @param {Number} fileIndex
- */
-export const changeFile = (fileIndex) => ({ type: "FILE_CLICKED", fileIndex });
-
 export const toggleList = () => ({ type: "TOGGLE_LIST" });
 
 export const showList = () => ({ type: "SHOW_LIST" });
diff --git a/vis/js/default-config.js b/vis/js/default-config.js
@@ -114,8 +114,6 @@ var config = {
     debug: false,
 
 /*** settings for title and context line ***/
-    //show dropdown to load different map datasets
-    show_dropdown: true,
     //show context line
     show_context: false,
     //create title from context
diff --git a/vis/js/intermediate.js b/vis/js/intermediate.js
@@ -45,7 +45,6 @@ class Intermediate {
     this.actionQueue = [];
 
     const middleware = applyMiddleware(
-      createFileChangeMiddleware(),
       createActionQueueMiddleware(this),
       createScrollMiddleware(),
       createRepeatedInitializeMiddleware(this),
@@ -463,19 +462,6 @@ function createRescaleMiddleware(rescaleCallback) {
   };
 }
 
-function createFileChangeMiddleware() {
-  return function ({ getState }) {
-    return (next) => (action) => {
-      if (action.type === "FILE_CLICKED") {
-        if (getState().files.current !== action.fileIndex) {
-          window.headstartInstance.tofile(action.fileIndex);
-        }
-      }
-      return next(action);
-    };
-  };
-}
-
 function createRecordActionMiddleware() {
   return function ({ getState }) {
     return (next) => (action) => {
diff --git a/vis/js/reducers/files.js b/vis/js/reducers/files.js
diff --git a/vis/js/reducers/heading.js b/vis/js/reducers/heading.js
@@ -19,7 +19,6 @@ const context = (state = {}, action) => {
         titleStyle: getTitleStyle(action.configObject),
         titleLabelType: getTitleLabelType(action.configObject),
         customTitle: action.configObject.custom_title,
-        showDropdown: action.configObject.show_dropdown,
       };
     default:
       return state;
diff --git a/vis/js/reducers/index.js b/vis/js/reducers/index.js
@@ -10,7 +10,6 @@ import chart from "./chart";
 import chartType from "./chartType";
 import contextLine from "./contextLine";
 import data from "./data";
-import files from "./files";
 import heading from "./heading";
 import highlightedBubble from "./highlightedBubble";
 import hyphenationLang from "./hyphenationLang";
@@ -38,7 +37,6 @@ export default combineReducers({
   chartType,
   contextLine,
   data,
-  files,
   heading,
   highlightedBubble,
   hyphenationLang,
diff --git a/vis/js/templates/ZoomedOutHeading.jsx b/vis/js/templates/ZoomedOutHeading.jsx
@@ -1,67 +1,13 @@
 import React from "react";
-import { connect } from "react-redux";
 
-import { changeFile, openInfoModal } from "../actions";
-
-const ZoomedOutHeading = ({
-  children: title,
-  infoButton,
-  filesDropdown,
-  onInfoClick,
-  onFileChange,
-}) => {
+const ZoomedOutHeading = ({ children: title }) => {
   return (
     // html template starts here
     <div className="heading-container">
       <h4 className="heading">{title}</h4>
-      <h4 className="features">
-        {infoButton.show && (
-          <button id="infolink">
-            <span id="whatsthis">
-              <i
-                className="fas fa-info-circle"
-                style={{ fontStyle: "normal" }}
-                onClick={onInfoClick}
-              ></i>
-            </span>{" "}
-          </button>
-        )}
-        {filesDropdown.show && (
-          <>
-            {" "}
-            Select dataset:{" "}
-            <select
-              id="datasets"
-              value={filesDropdown.files.current}
-              onChange={(e) => onFileChange(parseInt(e.target.value))}
-            >
-              {filesDropdown.files.list.map((entry, index) => (
-                <option key={entry.file} value={index}>
-                  {entry.title}
-                </option>
-              ))}
-            </select>
-          </>
-        )}
-      </h4>
     </div>
     // html template ends here
   );
 };
 
-const mapStateToProps = (state) => ({
-  infoButton: {
-    show: !state.contextLine.show,
-  },
-  filesDropdown: {
-    show: state.heading.showDropdown,
-    files: state.files,
-  },
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  onInfoClick: () => dispatch(openInfoModal()),
-  onFileChange: (fileIndex) => dispatch(changeFile(fileIndex)),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ZoomedOutHeading);
+export default ZoomedOutHeading;
diff --git a/vis/test/component/heading.test.js b/vis/test/component/heading.test.js
@@ -6,7 +6,6 @@ import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
 
 import Heading, { getHeadingLabel } from "../../js/components/Heading";
-import { changeFile, openInfoModal } from "../../js/actions";
 
 import { STREAMGRAPH_MODE } from "../../js/reducers/chartType";
 
@@ -27,7 +26,6 @@ const setup = (overrideStore = {}) => {
         titleStyle: null, // config.create_title_from_context_style + config.create_title_from_context if true, then = 'standard'
         titleLabelType: "keywordview-knowledgemap", // config.is_authorview + config.is_streamgraph
         customTitle: null, // config.custom_title
-        showDropdown: false, // config.show_dropdown
         files: null, // config.files
       },
       localization: {
@@ -553,86 +551,6 @@ describe("Heading component", () => {
           },
         ];
 
-        it("renders with a dropdown", () => {
-          const { storeObject } = setupFeatures();
-          storeObject.heading.showDropdown = true;
-          storeObject.files = {
-            current: 0,
-            list: FILES,
-          };
-
-          const store = mockStore(storeObject);
-
-          act(() => {
-            render(
-              <Provider store={store}>
-                <Heading />
-              </Provider>,
-              container
-            );
-          });
-
-          expect(
-            container.querySelector("#datasets").querySelectorAll("option")
-              .length
-          ).toBe(2);
-
-          expect(
-            container.querySelector("#datasets").querySelectorAll("option")[0]
-              .textContent
-          ).toEqual("edu1");
-
-          expect(
-            container
-              .querySelector("#datasets")
-              .querySelectorAll("option")[0]
-              .getAttribute("value")
-          ).toEqual("0");
-
-          expect(
-            container.querySelector("#datasets").querySelectorAll("option")[1]
-              .textContent
-          ).toEqual("edu2");
-
-          expect(
-            container
-              .querySelector("#datasets")
-              .querySelectorAll("option")[1]
-              .getAttribute("value")
-          ).toEqual("1");
-        });
-
-        it("triggers a correct redux action when dropdown changes", () => {
-          const { storeObject } = setupFeatures();
-          storeObject.heading.showDropdown = true;
-          storeObject.files = {
-            current: 0,
-            list: FILES,
-          };
-
-          const store = mockStore(storeObject);
-
-          act(() => {
-            render(
-              <Provider store={store}>
-                <Heading />
-              </Provider>,
-              container
-            );
-          });
-
-          const select = document.querySelector("#datasets");
-          act(() => {
-            const event = new Event("change", { bubbles: true });
-            select.dispatchEvent(event);
-          });
-
-          const actions = store.getActions();
-          const expectedPayload = changeFile(0);
-
-          expect(actions).toEqual([expectedPayload]);
-        });
-
         it("throws error on unknown label type", () => {
           const { storeObject } = setup();
           const LABEL = "label-that-does-not-exist";
diff --git a/vis/test/store/data.test.js b/vis/test/store/data.test.js
diff --git a/vis/test/store/fileclicked.test.js b/vis/test/store/fileclicked.test.js
diff --git a/vis/test/store/initialize.test.js b/vis/test/store/initialize.test.js
