use GET query instead of post with only type as path param

BlueBrain · Oct 28, 2024 · 4fb8f51 · 4fb8f51
1 parent 7ac2d3e
commit 4fb8f51
Show file tree

Hide file tree

Showing 11 changed files with 370 additions and 172 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
   "editor.formatOnSave": true,
-  "files.eol": "\n"
+  "files.eol": "\n",
+  "files.watcherExclude": {
+    "**/target": true
+  }
 }
diff --git a/cypress/downloads/downloads.html b/cypress/downloads/downloads.html
diff --git a/package.json b/package.json
@@ -76,6 +76,7 @@
   "dependencies": {
     "@ant-design/charts": "^1.3.4",
     "@ant-design/icons": "^4.4.0",
+    "@aws-crypto/sha1-browser": "^5.2.0",
     "@bbp/nexus-sdk": "1.3.15",
     "@bbp/react-nexus": "1.3.15",
     "@reduxjs/toolkit": "^1.8.5",
@@ -148,6 +149,7 @@
     "redux-thunk": "^2.3.0",
     "resize-observer-polyfill": "^1.5.1",
     "showdown": "^1.9.1",
+    "sparqljs": "^3.7.1",
     "string-similarity": "^4.0.4",
     "ts-debounce": "^1.0.0",
     "ts-invariant": "^0.4.4",

diff --git a/r1.json b/r1.json
@@ -0,0 +1 @@
+{ "detail": "Not Found" }
diff --git a/src/shared/components/SparqlResultsTable/index.tsx b/src/shared/components/SparqlResultsTable/index.tsx
@@ -38,6 +38,7 @@ const SparqlResultsTable: React.FunctionComponent<ResultTableProps> = ({
   handleClick,
   tableLabel,
 }) => {
+  console.log('@@SparqlResultsTable',)
   const [selectedColumns, setSelectedColumns] = React.useState<
     HeaderProperties | undefined
   >(headerProperties);
@@ -64,102 +65,102 @@ const SparqlResultsTable: React.FunctionComponent<ResultTableProps> = ({
   const columnList = [
     ...(columnsToSelect
       ? columnsToSelect.map(({ title, dataIndex }) => {
-          // We can create special renderers for the cells here
-          let render;
-          switch (title) {
-            case 'Created At':
-              render = (date: string) => (
-                <span>
-                  <FriendlyTimeAgo date={moment(date)} />
-                </span>
-              );
-              break;
-            case 'Project':
-              render = (projectURI: string) => {
-                if (projectURI) {
-                  const [org, project] = parseProjectUrl(projectURI);
-                  return (
-                    <span>
-                      <b>{org}</b> / {project}
-                    </span>
-                  );
-                }
-                return null;
-              };
-              break;
-            default:
-              render = (value: string) => {
-                const item = items.find(item => item[dataIndex] === value);
-                const studioResourceViewLink = item
-                  ? `/?_self=${item.self.value}`
-                  : '';
-                if (isISODate(value)) {
-                  return (
-                    <a href={studioResourceViewLink}>
-                      {getDateString(moment(value))}
-                    </a>
-                  );
-                }
+        // We can create special renderers for the cells here
+        let render;
+        switch (title) {
+          case 'Created At':
+            render = (date: string) => (
+              <span>
+                <FriendlyTimeAgo date={moment(date)} />
+              </span>
+            );
+            break;
+          case 'Project':
+            render = (projectURI: string) => {
+              if (projectURI) {
+                const [org, project] = parseProjectUrl(projectURI);
+                return (
+                  <span>
+                    <b>{org}</b> / {project}
+                  </span>
+                );
+              }
+              return null;
+            };
+            break;
+          default:
+            render = (value: string) => {
+              const item = items.find(item => item[dataIndex] === value);
+              const studioResourceViewLink = item
+                ? `/?_self=${item.self.value}`
+                : '';
+              if (isISODate(value)) {
+                return (
+                  <a href={studioResourceViewLink}>
+                    {getDateString(moment(value))}
+                  </a>
+                );
+              }
 
-                return <a href={studioResourceViewLink}>{value}</a>;
-              };
+              return <a href={studioResourceViewLink}>{value}</a>;
+            };
 
-              break;
-          }
+            break;
+        }
 
-          const distinctValues = filteredItems.reduce((memo, item) => {
-            const value = item[dataIndex];
-            if (value && !memo.includes(value)) {
-              memo.push(value);
-            }
-            return memo;
-          }, [] as any[]);
+        const distinctValues = filteredItems.reduce((memo, item) => {
+          const value = item[dataIndex];
+          if (value && !memo.includes(value)) {
+            memo.push(value);
+          }
+          return memo;
+        }, [] as any[]);
 
-          const filterOptions =
-            distinctValues.length > MIN_FILTER_LIMIT &&
+        const filterOptions =
+          distinctValues.length > MIN_FILTER_LIMIT &&
             distinctValues.length < MAX_FILTER_LIMIT
-              ? {
-                  filters: distinctValues.map(value => ({
-                    value,
-                    text: isISODate(value)
-                      ? getDateString(moment(value))
-                      : value,
-                  })),
-                  filterMultiple: false,
-                  filteredValue: filteredValues
-                    ? filteredValues[dataIndex]
-                    : null,
-                  onFilter: (filterValue: any, item: any) => {
-                    return item[dataIndex] === filterValue;
-                  },
-                }
-              : {};
-          return {
-            title,
-            dataIndex,
-            render,
-            className: `result-column ${dataIndex}`,
-            sorter: (
-              a: {
-                [key: string]: any;
+            ? {
+              filters: distinctValues.map(value => ({
+                value,
+                text: isISODate(value)
+                  ? getDateString(moment(value))
+                  : value,
+              })),
+              filterMultiple: false,
+              filteredValue: filteredValues
+                ? filteredValues[dataIndex]
+                : null,
+              onFilter: (filterValue: any, item: any) => {
+                return item[dataIndex] === filterValue;
               },
-              b: {
-                [key: string]: any;
-              }
-            ) => {
-              const sortA = a[dataIndex];
-              const sortB = b[dataIndex];
-              if (sortA < sortB) {
-                return -1;
-              }
-              if (sortA > sortB) {
-                return 1;
-              }
-              return 0;
+            }
+            : {};
+        return {
+          title,
+          dataIndex,
+          render,
+          className: `result-column ${dataIndex}`,
+          sorter: (
+            a: {
+              [key: string]: any;
             },
-            ...filterOptions,
-          };
-        })
+            b: {
+              [key: string]: any;
+            }
+          ) => {
+            const sortA = a[dataIndex];
+            const sortB = b[dataIndex];
+            if (sortA < sortB) {
+              return -1;
+            }
+            if (sortA > sortB) {
+              return 1;
+            }
+            return 0;
+          },
+          ...filterOptions,
+        };
+      })
       : []),
   ];
 

diff --git a/src/shared/containers/DataTableContainer.tsx b/src/shared/containers/DataTableContainer.tsx
@@ -99,6 +99,8 @@ type DataTableProps = {
   };
   showEdit?: boolean;
   toggledEdit?: (show: boolean) => void;
+  selectedWorkspace?: any
+  selectedDashboard?: any
 };
 
 export interface TableError {
@@ -137,6 +139,8 @@ const DataTableContainer: React.FC<DataTableProps> = ({
   options,
   showEdit,
   toggledEdit,
+  selectedWorkspace,
+  selectedDashboard,
 }) => {
   const basePath =
     useSelector((state: RootState) => state.config.basePath) || '';
@@ -334,7 +338,9 @@ const DataTableContainer: React.FC<DataTableProps> = ({
     tableResourceId,
     basePath,
     err => setTableDataError(err),
-    changeTableResource.data
+    changeTableResource.data,
+    selectedWorkspace,
+    selectedDashboard
   );
 
   const renderTitle = ({
@@ -454,12 +460,12 @@ const DataTableContainer: React.FC<DataTableProps> = ({
               <span className="table-row-count">
                 {/* If the user filters a column (i.e. updates) or enters a serch term (i.e. update dataResult), show the total rows in format <rows shown to user>/<total rows>, otherwise only show total rows. */}
                 {displayedRows &&
-                displayedRows !== tableData.dataResult.data?.items?.length
+                  displayedRows !== tableData.dataResult.data?.items?.length
                   ? `${displayedRows} / `
                   : tableData.dataResult?.data?.items.length !==
                     tableData.dataResult.data?.total
-                  ? `${tableData.dataResult.data?.items?.length} /`
-                  : ''}
+                    ? `${tableData.dataResult.data?.items?.length} /`
+                    : ''}
                 {`${tableData.dataResult?.data?.total ?? 0} `}
                 Results
               </span>
@@ -544,9 +550,8 @@ const DataTableContainer: React.FC<DataTableProps> = ({
                   antnotifcation.info({
                     duration: 5,
                     message: `${additionalSelectedRows -
-                      1} other resources with same metadata have also been automatically ${
-                      selected ? 'selected' : 'unselected'
-                    } for download.`,
+                      1} other resources with same metadata have also been automatically ${selected ? 'selected' : 'unselected'
+                      } for download.`,
                   });
                 }
               },
@@ -587,9 +592,8 @@ const DataTableContainer: React.FC<DataTableProps> = ({
                 if (additionalSelectedRows > 0) {
                   antnotifcation.info({
                     duration: 5,
-                    message: `${additionalSelectedRows} other resources with same metadata have also been automatically ${
-                      selected ? 'selected' : 'unselected'
-                    } for download.`,
+                    message: `${additionalSelectedRows} other resources with same metadata have also been automatically ${selected ? 'selected' : 'unselected'
+                      } for download.`,
                   });
                 }