Merge branch 'main' into feat/Tapis-v3-redesign

DesignSafe-CI · Apr 29, 2024 · b953f05 · b953f05
2 parents bbc23a4 + ab88881
commit b953f05
Show file tree

Hide file tree

Showing 39 changed files with 1,292 additions and 116 deletions.
diff --git a/client/modules/_hooks/src/datafiles/projects/types.ts b/client/modules/_hooks/src/datafiles/projects/types.ts
@@ -5,6 +5,7 @@ export type TProjectUser = {
   inst: string;
   role: 'pi' | 'co_pi' | 'team_member' | 'guest';
   username?: string;
+  authorship?: boolean;
 };
 
 export type TProjectAward = {
@@ -92,6 +93,8 @@ export type TBaseProjectValue = {
   fileObjs: TFileObj[];
   fileTags: TFileTag[];
 
+  hazmapperMaps?: THazmapperMap[];
+
   license?: string;
 };
 
@@ -102,6 +105,23 @@ export type TEntityValue = {
   authors?: TProjectUser[];
   fileObjs?: TFileObj[];
   fileTags: TFileTag[];
+  dateStart?: string;
+  dateEnd?: string;
+  location?: string;
+  event?: string;
+  facility?: TDropdownValue;
+  latitude?: string;
+  longitude?: string;
+  dois?: string[];
+  referencedData: TReferencedWork[];
+  relatedWork: TAssociatedProject[];
+
+  experimentType?: TDropdownValue;
+  equipmentType?: TDropdownValue;
+  procedureStart?: string;
+  procedureEnd?: string;
+
+  simulationType?: TDropdownValue;
 };
 
 export type TProjectMeta = {
@@ -126,6 +146,7 @@ export type TPreviewTreeData = {
   uuid: string;
   value: TEntityValue;
   order: number;
+  publicationDate?: string;
   children: TPreviewTreeData[];
 };
 

diff --git a/client/modules/_hooks/src/datafiles/projects/useProjectListing.ts b/client/modules/_hooks/src/datafiles/projects/useProjectListing.ts
@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+import { useSearchParams } from 'react-router-dom';
 import apiClient from '../../apiClient';
 import { TBaseProject } from './types';
 
@@ -10,25 +11,37 @@ export type TProjectListingResponse = {
 async function getProjectListing({
   page = 1,
   limit = 100,
+  queryString,
   signal,
 }: {
   page: number;
   limit: number;
+  queryString?: string;
   signal: AbortSignal;
 }) {
   const resp = await apiClient.get<TProjectListingResponse>(
     '/api/projects/v2',
     {
       signal,
-      params: { offset: (page - 1) * limit, limit },
+      params: { offset: (page - 1) * limit, limit, q: queryString },
     }
   );
   return resp.data;
 }
 
 export function useProjectListing(page: number, limit: number) {
+  const [searchParams] = useSearchParams();
+  const queryString = searchParams.get('q') ?? undefined;
   return useQuery({
-    queryKey: ['datafiles', 'projects', 'listing', page, limit],
-    queryFn: ({ signal }) => getProjectListing({ page, limit, signal }),
+    queryKey: [
+      'datafiles',
+      'projects',
+      'listing',
+      page,
+      limit,
+      queryString ?? '',
+    ],
+    queryFn: ({ signal }) =>
+      getProjectListing({ page, limit, queryString, signal }),
   });
 }
diff --git a/client/modules/_hooks/src/datafiles/useFileListing.ts b/client/modules/_hooks/src/datafiles/useFileListing.ts
@@ -1,6 +1,7 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 import apiClient from '../apiClient';
 import { AxiosError } from 'axios';
+import { useSearchParams } from 'react-router-dom';
 
 export type TFileListing = {
   system: string;
@@ -28,13 +29,14 @@ async function getFileListing(
   limit: number = 100,
   page: number = 0,
   nextPageToken: string | undefined,
+  queryString: string | undefined,
   { signal }: { signal: AbortSignal }
 ) {
   const offset = page * limit;
 
   const res = await apiClient.get<FileListingResponse>(
     `/api/datafiles/${api}/${scheme}/listing/${system}/${path}`,
-    { signal, params: { offset, limit, nextPageToken } }
+    { signal, params: { offset, limit, nextPageToken, q: queryString } }
   );
   return res.data;
 }
@@ -61,12 +63,21 @@ function useFileListing({
   pageSize = 100,
   disabled = false,
 }: TFileListingHookArgs) {
+  const [searchParams] = useSearchParams();
+  const queryString = searchParams.get('q');
   return useInfiniteQuery<
     FileListingResponse,
     AxiosError<{ message?: string }>
   >({
     initialPageParam: 0,
-    queryKey: ['datafiles', 'fileListing', api, system, path],
+    queryKey: [
+      'datafiles',
+      'fileListing',
+      api,
+      system,
+      path,
+      queryString ?? '',
+    ],
     queryFn: ({ pageParam, signal }) =>
       getFileListing(
         api,
@@ -76,6 +87,7 @@ function useFileListing({
         pageSize,
         (pageParam as TFileListingPageParam).page,
         (pageParam as TFileListingPageParam).nextPageToken,
+        queryString ?? undefined,
         {
           signal,
         }

diff --git a/client/modules/datafiles/src/DatafilesToolbar/DatafilesToolbar.tsx b/client/modules/datafiles/src/DatafilesToolbar/DatafilesToolbar.tsx
@@ -24,7 +24,9 @@ const ToolbarButton: React.FC<ButtonProps> = (props) => {
   );
 };
 
-export const DatafilesToolbar: React.FC = () => {
+export const DatafilesToolbar: React.FC<{ searchInput?: React.ReactNode }> = ({
+  searchInput,
+}) => {
   const { api, system, scheme, path } = useFileListingRouteParams();
   const { selectedFiles } = useSelectedFiles(api, system, path);
   const { user } = useAuthenticatedUser();
@@ -45,7 +47,7 @@ export const DatafilesToolbar: React.FC = () => {
 
   return (
     <div className={styles.toolbarRoot}>
-      <span>(search bar goes here)</span>
+      <div style={{ marginLeft: '12px' }}>{searchInput ?? null}</div>
 
       <div className={styles.toolbarButtonContainer}>
         <DatafilesModal.Rename api={api} system={system} path={path}>

diff --git a/client/modules/datafiles/src/FileListing/FileListing.tsx b/client/modules/datafiles/src/FileListing/FileListing.tsx
@@ -24,8 +24,16 @@ export const FileListing: React.FC<
     system: string;
     path?: string;
     scheme?: string;
+    baseRoute?: string;
   } & Omit<TableProps, 'columns'>
-> = ({ api, system, path = '', scheme = 'private', ...tableProps }) => {
+> = ({
+  api,
+  system,
+  path = '',
+  scheme = 'private',
+  baseRoute,
+  ...tableProps
+}) => {
   // Base file listing for use with My Data/Community Data
   const [previewModalState, setPreviewModalState] = useState<{
     isOpen: boolean;
@@ -43,7 +51,7 @@ export const FileListing: React.FC<
           record.type === 'dir' ? (
             <NavLink
               className="listing-nav-link"
-              to={`../${encodeURIComponent(record.path)}`}
+              to={`${baseRoute ?? '..'}/${encodeURIComponent(record.path)}`}
               replace={false}
             >
               <i
@@ -85,7 +93,7 @@ export const FileListing: React.FC<
         render: (d) => new Date(d).toLocaleString(),
       },
     ],
-    [setPreviewModalState]
+    [setPreviewModalState, baseRoute]
   );
 
   return (

diff --git a/client/modules/datafiles/src/projects/BaseProjectDetails.module.css b/client/modules/datafiles/src/projects/BaseProjectDetails.module.css
@@ -10,3 +10,7 @@
   -webkit-box-orient: vertical;
   overflow: hidden;
 }
+
+.prj-row td {
+  padding: 2px 0px;
+}