Skip to content

Commit

Permalink
Merge pull request #3912 from nulib/4647-clover-more-info-default
Browse files Browse the repository at this point in the history
Update Clover Viewer Information Panel to be default closed
  • Loading branch information
adamjarling authored Apr 23, 2024
2 parents d07bda1 + 8538632 commit 12c79f9
Show file tree
Hide file tree
Showing 7 changed files with 1,516 additions and 2,121 deletions.
8 changes: 4 additions & 4 deletions app/assets/js/components/IngestSheet/List.test.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { render, cleanup } from "@testing-library/react";
import { cleanup, render } from "@testing-library/react";

import IngestSheetList from "./List";
import "@testing-library/jest-dom/extend-expect";
import React from "react";
import { renderWithRouter } from "../../services/testing-helpers";

const projectId = "abcdefg123";
Expand All @@ -10,7 +10,7 @@ afterEach(cleanup);

xtest("IngestSheetList component renders", () => {
const { container } = renderWithRouter(
<IngestSheetList projectId={projectId} />
<IngestSheetList projectId={projectId} />,
);
expect(container).toBeTruthy();
});
Expand Down
3 changes: 3 additions & 0 deletions app/assets/js/components/UI/IIIF/Viewer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ const IIIFViewer = ({ fileSets, iiifContent, workTypeId }) => {

const options = {
canvasHeight: 480,
informationPanel: {
open: false,
},
openSeadragon: {
gestureSettingsMouse: {
scrollToZoom: false,
Expand Down
7 changes: 3 additions & 4 deletions app/assets/js/screens/Home/Home.test.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from "react";
import { render, cleanup } from "@testing-library/react";
// this adds custom jest matchers from jest-dom
import "@testing-library/jest-dom/extend-expect";
import { cleanup, render } from "@testing-library/react";

import HomePage from "./Home";
import React from "react";
import { renderWithRouter } from "../../services/testing-helpers";

jest.mock("../../services/elasticsearch");
Expand Down
6 changes: 3 additions & 3 deletions app/assets/jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"jsx": "react", // Allow command-click open components in a new file in VSCode
"baseUrl": ".",
"paths": {
"@js/*": ["js/*"],
},
"@js/*": ["js/*"]
}
},
"exclude": ["node_modules", "static"],
"exclude": ["node_modules", "static"]
}
3,595 changes: 1,494 additions & 2,101 deletions app/assets/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions app/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@honeybadger-io/react": "^6.1.7",
"@nulib/design-system": "^1.5.1",
"@radix-ui/react-dialog": "^1.0.5",
"@samvera/clover-iiif": "2.4.0",
"@samvera/clover-iiif": "^2.7.4",
"@samvera/image-downloader": "^1.1.1",
"bulma": "^0.9.4",
"bulma-checkradio": "^2.1.3",
Expand Down Expand Up @@ -84,9 +84,9 @@
"@graphql-typed-document-node/core": "^3.2.0",
"@nulib/dcapi-types": "^2.1.0",
"@nulib/prettier-config": "^1.2.0",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.2.1",
"@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^15.0.2",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"@types/react-beautiful-dnd": "^13.1.8",
Expand Down
10 changes: 5 additions & 5 deletions app/assets/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
"noUnusedParameters": false,
"paths": {
"@/*": ["*"],
"@js/*": ["js/*"],
"@js/*": ["js/*"]
},
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"target": "ES6",
"types": ["jest", "node", "@testing-library/jest-dom"],
"types": ["jest", "node", "@testing-library/jest-dom"]
},
"include": [
"js/**/*.ts",
"js/**/*.js",
"js/**/*.jsx",
"js/**/*.tsx",
"types/**/*.d.ts",
"./jest.setup.ts",
"./jest.setup.ts"
],
"exclude": [
"node_modules",
"node_modules/@honeybadger-io/react/honeybadger-react.d.ts",
],
"node_modules/@honeybadger-io/react/honeybadger-react.d.ts"
]
}

0 comments on commit 12c79f9

Please sign in to comment.