Skip to content

Commit

Permalink
Fix rollup build
Browse files Browse the repository at this point in the history
  • Loading branch information
nickgros committed Feb 22, 2021
1 parent df07728 commit fe6c40e
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 42 deletions.
2 changes: 1 addition & 1 deletion src/lib/containers/entity_finder/EntityFinder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { TreeView } from './tree/TreeView'
import { ReflexContainer, ReflexElement, ReflexSplitter } from 'react-reflex'
import { Button } from 'react-bootstrap'
import useGetEntityBundle from '../../utils/hooks/SynapseAPI/useEntityBundle'
import { SynapseClient } from '../..'
import { SynapseClient } from '../../utils'
import { SYNAPSE_ENTITY_ID_REGEX } from '../../utils/functions/RegularExpressions'
import {
EntityFinderDetails,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import moment from 'moment'
import React, { useEffect, useState } from 'react'
import { Form } from 'react-bootstrap'
import { useInView } from 'react-intersection-observer'
import { SynapseClient } from '../../..'
import { SynapseClient } from '../../../utils'
import { formatDate } from '../../../utils/functions/DateFormatter'
import {
getEntityTypeFromHeader,
Expand Down
29 changes: 25 additions & 4 deletions src/lib/containers/entity_finder/details/EntityFinderDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
SortBy,
} from '../../../utils/synapseTypes'
import { GetProjectsParameters } from '../../../utils/synapseTypes/GetProjectsParams'
import { SearchQuery } from '../../../utils/synapseTypes/Search'
import { Hit, SearchQuery } from '../../../utils/synapseTypes/Search'
import { EntityIdAndVersion } from '../EntityFinder'
import { DetailsView } from './DetailsView'

Expand Down Expand Up @@ -179,7 +179,14 @@ const ChildrenView: React.FunctionComponent<ChildrenViewProps> = ({
return (
<DetailsView
sessionToken={sessionToken}
entities={data ? data.pages.map(page => page.page).flat() : []}
entities={
data
? ([] as EntityHeader[]).concat.apply(
[],
data.pages.map(page => page.page),
)
: []
}
queryStatus={status}
hasNextPage={hasNextPage}
fetchNextPage={fetchNextPage}
Expand Down Expand Up @@ -303,7 +310,14 @@ const SearchView: React.FunctionComponent<SearchViewProps> = ({
return (
<DetailsView
sessionToken={sessionToken}
entities={data ? data.pages.map(page => page.hits).flat() : []}
entities={
data
? ([] as Hit[]).concat.apply(
[],
data.pages.map(page => page.hits),
)
: []
}
queryStatus={status}
hasNextPage={hasNextPage}
fetchNextPage={fetchNextPage}
Expand Down Expand Up @@ -363,7 +377,14 @@ const ProjectsView: React.FunctionComponent<ProjectsViewProps> = ({
return (
<DetailsView
sessionToken={sessionToken}
entities={data ? data.pages.map(page => page.results).flat() : []}
entities={
data
? ([] as ProjectHeader[]).concat.apply(
[],
data.pages.map(page => page.results),
)
: []
}
queryStatus={status}
hasNextPage={hasNextPage}
fetchNextPage={fetchNextPage}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/containers/entity_finder/tree/TreeView.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'
import { Dropdown } from 'react-bootstrap'
import { useInView } from 'react-intersection-observer'
import { SynapseClient } from '../../..'
import { SynapseClient } from '../../../utils'
import FileIcon from '../../../assets/icons/entity/File.svg'
import FolderIcon from '../../../assets/icons/entity/Folder.svg'
import ProjectIcon from '../../../assets/icons/entity/Project.svg'
Expand Down
35 changes: 2 additions & 33 deletions src/lib/containers/entity_finder/tree/TreeViewRow.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import React, { useEffect, useState } from 'react'
import { Dropdown } from 'react-bootstrap'
import { useInView } from 'react-intersection-observer'
import { SynapseClient } from '../../..'
import FileIcon from '../../assets/icons/entity/File.svg'
import FolderIcon from '../../assets/icons/entity/Folder.svg'
import ProjectIcon from '../../assets/icons/entity/Project.svg'
import { SynapseClient } from '../../../utils'
import {
getEntityTypeFromHeader,
isContainerType,
Expand All @@ -23,6 +20,7 @@ import {
EntityFinderDetailsConfiguration,
EntityFinderDetailsConfigurationType,
} from '../details/EntityFinderDetails'
import { getIconForEntityType } from './TreeView'

const isEntityIdInPath = (entityId: string, path: EntityPath): boolean => {
for (const eh of path.path) {
Expand All @@ -48,35 +46,6 @@ type TreeViewRowProps = {
autoExpand?: (entityId: string) => boolean
}

export const getIconForEntityType = (type: EntityType) => {
let src = undefined
switch (type) {
case EntityType.PROJECT:
src = ProjectIcon
break
case EntityType.FILE:
src = FileIcon
break
case EntityType.FOLDER:
src = FolderIcon
break
default:
src = undefined // todo
}
return (
<img
// alt={type} // TODO: the string types will look bad here
style={{
maxWidth: '15px',
maxHeight: '15px',

margin: '3px',
}}
src={src}
></img>
)
}

const TreeViewRow: React.FunctionComponent<TreeViewRowProps> = ({
sessionToken,
entityHeader,
Expand Down
2 changes: 2 additions & 0 deletions src/lib/rollup.index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import PageProgress from './containers/PageProgress'
import ProjectViewCarousel from './containers/home_page/project_view_carousel/ProjectViewCarousel'
import { SynapseHomepage } from './containers/SynapseHomepage'
import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationEditorPage'
import { EntityFinder } from './containers/entity_finder/EntityFinder'

const SynapseComponents = {
Login,
Expand All @@ -33,6 +34,7 @@ const SynapseComponents = {
PageProgress,
ProjectViewCarousel,
SynapseHomepage,
EntityFinder,
}

export { SynapseComponents, SynapseConstants, SynapseClient }
2 changes: 1 addition & 1 deletion tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"baseUrl": ".",
"module": "commonjs",
"target": "es5",
"lib": ["es2019", "es6", "dom"],
"lib": ["es6", "dom"],
"sourceMap": true,
"jsx": "react",
"moduleResolution": "node",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"allowSyntheticDefaultImports": true,
"module": "esnext",
"target": "es5",
"lib": ["es2019", "es6", "dom"],
"lib": ["es6", "dom"],
"sourceMap": true,
"jsx": "preserve",
"moduleResolution": "node",
Expand Down

0 comments on commit fe6c40e

Please sign in to comment.