Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Error message when query has no sources was replaced with an application message in the empty result list (#204).
- configs/oslo-kg: use smaller datasets for queries.
- React-admin version updated to 5.7.2 (#207).
- Tool renamed to 'Miravi - a linked data viewer'; default favicon.ico and miravi.png provided (#210).

### Fixed

Expand Down Expand Up @@ -239,20 +240,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- First release

[1.0.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.0.0
[1.1.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.0
[1.1.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.1
[1.1.2]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.2
[1.1.3]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.1.3
[1.2.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.0
[1.2.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.1
[1.2.2]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.2
[1.2.3]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.2.3
[1.3.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.3.0
[1.3.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.3.1
[1.4.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.0
[1.4.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.1
[1.5.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.5.0
[1.6.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.6.0
[1.7.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.7.0
[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.7.0...HEAD
[1.0.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.0.0
[1.1.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.0
[1.1.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.1
[1.1.2]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.2
[1.1.3]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.1.3
[1.2.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.0
[1.2.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.1
[1.2.2]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.2
[1.2.3]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.2.3
[1.3.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.3.0
[1.3.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.3.1
[1.4.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.4.0
[1.4.1]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.4.1
[1.5.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.5.0
[1.6.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.6.0
[1.7.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.7.0
[Unreleased]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/compare/v1.7.0...HEAD
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Generic Data Viewer React Admin
# Miravi - a linked data viewer

This Web app allows users to easily execute queries over multiple data sources (including Solid pods) and
This Web app allows users to easily execute queries over multiple linked data sources (including Solid pods) and
inspect the corresponding results.

About the name: Miravi reflects the many facets of the web — linking open and permissioned data into a unified view.
Rooted in the Latin *mirari* ("to look with wonder"), it turns fragmented knowledge into meaningful insight.

<img src="./doc/miravi.png" width="200">

Table of contents:

* [Preface](#preface)
Expand Down Expand Up @@ -387,9 +392,10 @@ The easiest way to add your own configuration is:
1. Get inspired by the configuration in `main/configs/demo`.
2. Choose your `<your-config>`: a string obeying regex `[a-z0-9-]+`; directory `main/configs/<your-config>` should not yet be in use.
3. Add your own queries in the `main/configs/<your-config>/public/queries` directory and in general, your own resources in the `main/configs/<your-config>/public` directory.
4. Write your own `main/configs/<your-config>/config.json` file, following the [configuration file documentation above](#configuration-file).
5. Run or build as documented above for the `demo` configuration, of course now using `<your-config>`.
6. Consider a pull request to add your configuration to this repo.
4. Add your own additional resources in `main/configs/<your-config>/public`, if the defaults you'll get from `main/config-defaults/public` are not satisfactory for you.
5. Write your own `main/configs/<your-config>/config.json` file, following the [configuration file documentation above](#configuration-file).
6. Run or build as documented above for the `demo` configuration, of course now using `<your-config>`.
7. Consider a pull request to add your configuration to this repo.

### Testing

Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ and [CHANGELOG.md](./CHANGELOG.md) should reflect all modifications under the `#
In [CHANGELOG.md](./CHANGELOG.md):

* Create the new release section by adding a new release title line below the `## [Unreleased]` title line. Example: `## [1.7.0] - 2025-04-09`.
* Add a new release link line near the end of the file. Example: `[1.7.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.7.0`.
* Update the `[Unreleased]` link in the bottom line to use the new release tag. Example: `[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.7.0...HEAD`
* Add a new release link line near the end of the file. Example: `[1.7.0]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/releases/tag/v1.7.0`.
* Update the `[Unreleased]` link in the bottom line to use the new release tag. Example: `[Unreleased]: https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/compare/v1.7.0...HEAD`

Enter the release tag in the version string in [/main/src/version.js](./main/src/version.js).

Expand Down
Binary file added doc/miravi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main/config-defaults/public/favicon.ico
Binary file not shown.
Binary file added main/config-defaults/public/images/miravi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions main/configs/demo/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Generic Data Viewer",
"logoLocation": "images/IDLab-logo.png",
"logoRedirectURL": "https://idlab.technology/",
"title": "Miravi - a linked data viewer",
"logoLocation": "images/miravi.png",
"logoRedirectURL": "https://github.com/SolidLabResearch/miravi-a-linked-data-viewer",
"mainAppColor": "lightgray",
"backgroundColor": "#fff",
"titleColor": "black",
Expand Down
Binary file removed main/configs/demo/public/favicon.ico
Binary file not shown.
Binary file removed main/configs/demo/public/images/IDLab-logo.png
Binary file not shown.
Binary file removed main/configs/onto-deside/public/favicon.ico
Binary file not shown.
Binary file removed main/configs/oslo-kg/public/favicon.ico
Binary file not shown.
6 changes: 3 additions & 3 deletions main/configs/test/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Generic Data Viewer",
"logoLocation": "images/IDLab-logo.png",
"logoRedirectURL": "https://idlab.technology/",
"title": "Miravi - a linked data viewer",
"logoLocation": "images/miravi.png",
"logoRedirectURL": "https://github.com/SolidLabResearch/miravi-a-linked-data-viewer",
"mainAppColor": "lightgray",
"backgroundColor": "#fff",
"titleColor": "black",
Expand Down
Binary file removed main/configs/test/public/favicon.ico
Binary file not shown.
3 changes: 2 additions & 1 deletion main/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Generic Data Viewer</title>
<title>Miravi - a linked data viewer</title>
<link rel="icon" href="./favicon.ico" />
</head>
<body>
<div id="root"></div>
Expand Down
4 changes: 2 additions & 2 deletions main/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion main/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "generic-data-viewer-admin",
"name": "miravi-a-linked-data-viewer",
"private": true,
"version": "1.0.0",
"type": "module",
Expand Down
2 changes: 2 additions & 0 deletions main/scripts/select-config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ function main(config) {
const configDest = path.join('.', 'src', 'config.json');
fse.copySync(configSrc, configDest, options);

const publicDefaults = path.join('.', 'config-defaults', 'public');
const publicSrc = path.join(from, 'public');
const publicDest = path.join('.', 'public');
fse.emptyDirSync(publicDest);
fse.copySync(publicDefaults, publicDest, options);
fse.copySync(publicSrc, publicDest, options);

}
Expand Down
6 changes: 3 additions & 3 deletions main/src/authenticationProvider/authenticationProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default {
oidcIssuer: idp,
// leading dot needed to run from any path
redirectUrl: new URL('.', window.location.href).toString(),
clientName: "Generic Data Viewer",
clientName: "Miravi - a linked data viewer",
});
} catch (error) {
throw new Error("Login failed");
Expand Down Expand Up @@ -116,7 +116,7 @@ async function queryIDPfromWebId(webId) {

/**
*
* @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/15) document to get the name from
* @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/15) document to get the name from
* @returns {?string} either the name or undefined if no foaf:name is found
*/
function getName(webIdThing) {
Expand All @@ -128,7 +128,7 @@ function getName(webIdThing) {

/**
*
* @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/15) document to get the profile picture from
* @param {object} webIdThing - the webId (actually of type ProfileAll, but importing this throws an error https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/15) document to get the profile picture from
* @returns {?string} either a url to the profile picture or undefined if no foaf:img is found
*/
function getProfilePicture(webIdThing) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component } from "react";
import CloseIcon from "@mui/icons-material/Close";
import { IconButton, Dialog, DialogTitle, DialogContent, DialogContentText } from "@mui/material";
import { IconButton, Dialog, DialogTitle, DialogContent } from "@mui/material";

import version from "../../../version";

Expand All @@ -14,21 +14,19 @@ function AboutDialog(props) {
return (
<Dialog open={props.open} onClose={props.close} fullWidth maxWidth="sm">
<DialogTitle sx={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
<div>Generic Data Viewer</div>
<div>Miravi - a linked data viewer</div>
<IconButton onClick={props.close} size="small">
<CloseIcon />
</IconButton>
</DialogTitle>
<DialogContent>
<DialogContentText>
<p>Version: {version}</p>
<p>Questions? Remarks?
Please create an issue at our <a href="https://github.com/SolidLabResearch/generic-data-viewer-react-admin" target="_blank">Repository</a><br />
or mail to <a href="mailto:ben.demeester@ugent.be" target="_blank">ben.demeester@ugent.be</a>.</p>
<p>Powered by <a href="https://comunica.dev/" target="_blank">Comunica</a> and <a href="https://marmelab.com/react-admin/" target="_blank">React-Admin</a>.</p>
<p>Initial development funded by <a href="https://ontodeside.eu/" target="_blank">Onto-DESIDE</a> and <a href="https://solidlab.be/" target="_blank">SolidLab</a>.</p>
<p>&copy; <a href="https://idlab.ugent.be/">IDLab</a> 2025</p>
</DialogContentText>
<p>Version: {version}</p>
<p>Questions? Remarks?
Please create an issue at our <a href="https://github.com/SolidLabResearch/miravi-a-linked-data-viewer" target="_blank">Repository</a><br />
or mail to <a href="mailto:ben.demeester@ugent.be" target="_blank">ben.demeester@ugent.be</a>.</p>
<p>Powered by <a href="https://comunica.dev/" target="_blank">Comunica</a> and <a href="https://marmelab.com/react-admin/" target="_blank">React-Admin</a>.</p>
<p>Initial development funded by <a href="https://ontodeside.eu/" target="_blank">Onto-DESIDE</a> and <a href="https://solidlab.be/" target="_blank">SolidLab</a>.</p>
<p>&copy; <a href="https://idlab.ugent.be/">IDLab</a> 2025</p>
</DialogContent>
</Dialog>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

#app-logo{
max-width: 150px;
max-height: 100%;
max-height: 56px;
margin-right: 10px;
padding: 5px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ function NavigationBar(props) {
return (
<>
<AppBar {...props} toolbar={<></>} userMenu={<AuthenticationMenu />}>
<img
id="app-logo"
src={config.logoLocation}
alt="Web application logo"
></img>
<a href={config.logoRedirectURL} target="_blank"><img
id="app-logo"
src={config.logoLocation}
alt="Web application logo">
</img></a>
<TitlePortal/>
<AboutButton click={handleAboutOpen} />
<InvalidateButton/>
Expand Down
4 changes: 2 additions & 2 deletions main/src/version.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Maintain the version string on the development branch:
// - during development: set to (unreleased);
// - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/tags).
const version = "v1.7.0";
// - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/tags).
const version = "unreleased";
export default version;
2 changes: 1 addition & 1 deletion test/cypress/e2e/aggregating-query.cy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
describe("Aggregating query", () => {
it("AVG() function - see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/70", () => {
it("AVG() function - see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/70", () => {
cy.visit("/");
cy.contains("Example queries").click();
cy.contains("Average value").click();
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/e2e/sources-info.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe("Sources info", () => {
cy.get('[aria-label="Fetch was successful"]').should("exist");
});

it("Fetch status on cached source - see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/issues/59", () => {
it("Fetch status on cached source - see https://github.com/SolidLabResearch/miravi-a-linked-data-viewer/issues/59", () => {
cy.visit("/");
cy.contains("Project related examples").click();
cy.contains("Components").click();
Expand Down
4 changes: 2 additions & 2 deletions test/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "tools-for-generic-data-viewer-admin",
"name": "tools-for-miravi-a-linked-data-viewer",
"private": true,
"version": "1.0.0",
"type": "module",
Expand Down