Merging for v1.7.0 (#197)

Author: mvanbrab

CHANGELOG.md

@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.0] - 2025-04-09
+
+### Added
+
+- A favicon (#188).
+- A cache to remember the entire result table (useful when scrolling through pages of a lengthy result table) (#193).
+
+### Changed
+
+- Using new verification library v0.2.0 (#184).
+- Refactoring, avoiding the usage of an internal, undocumented react-admin component (#185).
+- Removed the loading indicator / refresh button in the appbar (#195).
+
+### Fixed
+
+- Queries no longer executed twice (#176).
+- Templated queries: visiting with variable values in url search parameters now works as expected (#183).
+- Solved console warning when hovering over source verification question mark (#128).
+- ASK query is working now (#22).
+- "Finished in" now shows effective query execution time (#130).
+- "Clean query cache" button's functionality works as expected now (also for templated queries with indirect variables) (#190).
+- "The page is loading." type of prompt is back (now "The list is loading." and "The options for the variables in this query are loading.") (#194).
+
 ## [1.6.0] - 2025-03-17
 
 ### Added
@@ -215,4 +238,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.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
-[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.6.0...HEAD
+[1.7.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.7.0

README.md

@@ -28,7 +28,7 @@ Table of contents:
     * [Additional prerequisites](#additional-prerequisites)
     * [Testing the production version](#testing-the-production-version)
     * [Testing the development version](#testing-the-development-version)
-  * [Maintaining the version string](#maintaining-the-version-string)
+  * [Release activities](#release-activities)
 
 ## Preface
 
@@ -444,6 +444,6 @@ The procedure is the same as for testing the production version, except for step
    npm run dev-with-path
    ```
 
-### Maintaining the version string
+### Release activities
 
-Maintain the version string [here](./main/src/version.js) according to the rules in that file.
+See [RELEASE.md](./RELEASE.md).

RELEASE.md

@@ -0,0 +1,51 @@
+# Release activities
+
+* [Release tag](#release-tag)
+* [Finalize work on the development branch](#finalize-work-on-the-development-branch)
+* [Merge to the main branch](#merge-to-the-main-branch)
+* [Create a new release](#create-a-new-release)
+* [Back on the development branch](#back-on-the-development-branch)
+
+## Release tag
+
+Define the release tag. Example: `v1.7.0`.
+
+> Dut do not create the tag in git yet.
+
+## Finalize work on the development branch
+
+All feature branches and fix branches should be merged here
+and [CHANGELOG.md](./CHANGELOG.md) should reflect all modifications under the `## [Unreleased]` section.
+
+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`
+
+Enter the release tag in the version string in [/main/src/version.js](./main/src/version.js).
+
+## Merge to the main branch
+
+Go to the github web interface.
+
+Create a new pull request (example: `Merging for v1.7.0`) to the main branch, from the development branch.
+
+Squash and merge.
+
+## Create a new release
+
+Still in the github web interface...
+
+Create a new release, with the option to create a new git tag (our release tag, example: `v1.7.0`) on the main branch.
+
+In the release description, copy from [CHANGELOG.md](./CHANGELOG.md):
+
+* the new release section created above
+* the new release link created above
+
+Make sure to set the release as the latest release.
+
+## Back on the development branch
+
+Modify the version string in [/main/src/version.js](./main/src/version.js) back to `(unreleased)`.

main/configs/demo/config.json

@@ -59,12 +59,12 @@
       "icon": "BrushIcon",
       "comunicaContext": {
         "sources": [
-          "https://fragments.dbpedia.org/2016-04/en"
+          "http://localhost:8080/example/artists"
         ]
       },
       "askQuery": {
-        "trueText": "There is an artist who is inspired by Picasso!",
-        "falseText": "There is no artist who is inspired by Picasso."
+        "trueText": "Yes, there is at least one artist influenced by Picasso!",
+        "falseText": "No, there is not a single artist influenced by Picasso."
       }
     },
     {

main/configs/demo/public/favicon.ico

@@ -64,12 +64,12 @@
       "icon": "BrushIcon",
       "comunicaContext": {
         "sources": [
-          "https://fragments.dbpedia.org/2016-04/en"
+          "http://localhost:8080/example/artists"
         ]
       },
       "askQuery": {
-        "trueText": "There is an artist who is inspired by Picasso!",
-        "falseText": "There is no artist who is inspired by Picasso."
+        "trueText": "Yes, there is at least one artist influenced by Picasso!",
+        "falseText": "No, there is not a single artist influenced by Picasso."
       }
     },
     {
@@ -292,6 +292,23 @@
         ]
       }
     },
+    {
+      "id": "8900",
+      "queryGroupId": "gr-test",
+      "queryLocation": "ask_picasso.rq",
+      "name": "Is there an artist influenced by Picasso (forced negative answer)?",
+      "description": "Demonstrates an ASK query, here with negative answer, forced by using an irrelevant data source.",
+      "icon": "BrushIcon",
+      "comunicaContext": {
+        "sources": [
+          "http://localhost:8080/example/values"
+        ]
+      },
+      "askQuery": {
+        "trueText": "Yes, there is at least one artist influenced by Picasso!",
+        "falseText": "No, there is not a single artist influenced by Picasso (if you look at the wrong data)."
+      }
+    },
     {
       "id": "9000",
       "queryGroupId": "gr-test",

main/configs/onto-deside/public/favicon.ico

@@ -27,27 +27,31 @@ import configManager from "../../configManager/configManager.js";
  */
 function ActionBar() {
   const { total, isLoading, resource } = useListContext();
-  const [time, setTime] = useState(0);
+  const now = Date.now();
+  const [timeStart, setTimeStart] = useState(now);
+  const [timeNow, setTimeNow] = useState(now);
   const [sourceInfoOpen, setSourceInfoOpen] = useState(false);
 
   useEffect(() => {
     if (isLoading) {
-      setTime(0);
+      const now = Date.now();
+      setTimeStart(now);
+      setTimeNow(now);
     }
   }, [isLoading]);
 
   useEffect(() => {
     let intervalId;
     if (isLoading) {
-      intervalId = setInterval(() => setTime(time + 1), 10);
+      intervalId = setInterval(() => setTimeNow(Date.now()), 100);
     }
     return () => clearInterval(intervalId);
-  }, [time, isLoading]);
+  }, [timeNow, isLoading]);
 
   const config = configManager.getConfig();
   const query = configManager.getQueryWorkingCopyById(resource);
   const context = query.comunicaContext;
-  const sources = context.sources;
+  const sources = context?.sources || []; // in early calls, context might be undefined
 
   return (
     <Grid container direction="row" width={"100%"} rowSpacing={1}>
@@ -58,7 +62,7 @@ function ActionBar() {
             <div className="information-box">
               {isLoading && <strong>Runtime: </strong>}
               {!isLoading && <strong>Finished in: </strong>}
-              <Time time={time} showMilliseconds={config.showMilliseconds} />
+              <Time elapsedMilliseconds={timeNow - timeStart} showMilliseconds={config.showMilliseconds} />
             </div>
             <div className="information-box">
               <strong>Sources: </strong>
@@ -102,10 +106,10 @@ function ActionBar() {
                       <SourceAuthenticationIcon source={source} />
                     </TableCell>
                     <TableCell>
-                      <SourceFetchStatusIcon proxyUrl={config.httpProxy} context={context} source={source} />
+                      <SourceFetchStatusIcon proxyUrl={config.httpProxy || ""} context={context} source={source} />
                     </TableCell>
                     <TableCell>
-                      <SourceVerificationIcon proxyUrl={config.httpProxy} context={context} source={source} />
+                      <SourceVerificationIcon proxyUrl={config.httpProxy || ""} context={context} source={source} />
                     </TableCell>
                   </TableRow>
                 ))}