From 58afb8dfcfa3fefa8e1b28dc418b97c51a73b7dc Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Tue, 10 Oct 2023 15:31:09 -0400 Subject: [PATCH] 15768: merge cleanup Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- src/components/icon/icon.tsx | 405 ++++++++------- src/store/store.ts | 5 +- .../data-explorer/renderers.tsx | 464 +----------------- 3 files changed, 227 insertions(+), 647 deletions(-) diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 20b87b2051..5f3f4e659b 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -2,218 +2,261 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React from 'react'; -import { Badge, SvgIcon, Tooltip } from '@material-ui/core'; -import Add from '@material-ui/icons/Add'; -import ArrowBack from '@material-ui/icons/ArrowBack'; -import ArrowDropDown from '@material-ui/icons/ArrowDropDown'; -import Build from '@material-ui/icons/Build'; -import Cached from '@material-ui/icons/Cached'; -import DescriptionIcon from '@material-ui/icons/Description'; -import ChevronLeft from '@material-ui/icons/ChevronLeft'; -import CloudUpload from '@material-ui/icons/CloudUpload'; -import Code from '@material-ui/icons/Code'; -import Create from '@material-ui/icons/Create'; -import ImportContacts from '@material-ui/icons/ImportContacts'; -import ChevronRight from '@material-ui/icons/ChevronRight'; -import Close from '@material-ui/icons/Close'; -import ContentCopy from '@material-ui/icons/FileCopyOutlined'; -import CreateNewFolder from '@material-ui/icons/CreateNewFolder'; -import Delete from '@material-ui/icons/Delete'; -import DeviceHub from '@material-ui/icons/DeviceHub'; -import Edit from '@material-ui/icons/Edit'; -import ErrorRoundedIcon from '@material-ui/icons/ErrorRounded'; -import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; -import FlipToFront from '@material-ui/icons/FlipToFront'; -import Folder from '@material-ui/icons/Folder'; -import FolderShared from '@material-ui/icons/FolderShared'; -import Pageview from '@material-ui/icons/Pageview'; -import GetApp from '@material-ui/icons/GetApp'; -import Help from '@material-ui/icons/Help'; -import HelpOutline from '@material-ui/icons/HelpOutline'; -import History from '@material-ui/icons/History'; -import Inbox from '@material-ui/icons/Inbox'; -import Memory from '@material-ui/icons/Memory'; -import MoveToInbox from '@material-ui/icons/MoveToInbox'; -import Info from '@material-ui/icons/Info'; -import Input from '@material-ui/icons/Input'; -import InsertDriveFile from '@material-ui/icons/InsertDriveFile'; -import LastPage from '@material-ui/icons/LastPage'; -import LibraryBooks from '@material-ui/icons/LibraryBooks'; -import ListAlt from '@material-ui/icons/ListAlt'; -import Menu from '@material-ui/icons/Menu'; -import MoreVert from '@material-ui/icons/MoreVert'; -import Mail from '@material-ui/icons/Mail'; -import Notifications from '@material-ui/icons/Notifications'; -import OpenInNew from '@material-ui/icons/OpenInNew'; -import People from '@material-ui/icons/People'; -import Person from '@material-ui/icons/Person'; -import PersonAdd from '@material-ui/icons/PersonAdd'; -import PlayArrow from '@material-ui/icons/PlayArrow'; -import Public from '@material-ui/icons/Public'; -import RateReview from '@material-ui/icons/RateReview'; -import RestoreFromTrash from '@material-ui/icons/History'; -import Search from '@material-ui/icons/Search'; -import SettingsApplications from '@material-ui/icons/SettingsApplications'; -import SettingsEthernet from '@material-ui/icons/SettingsEthernet'; -import Settings from '@material-ui/icons/Settings'; -import Star from '@material-ui/icons/Star'; -import StarBorder from '@material-ui/icons/StarBorder'; -import Warning from '@material-ui/icons/Warning'; -import VpnKey from '@material-ui/icons/VpnKey'; -import LinkOutlined from '@material-ui/icons/LinkOutlined'; -import RemoveRedEye from '@material-ui/icons/RemoveRedEye'; -import Computer from '@material-ui/icons/Computer'; -import WrapText from '@material-ui/icons/WrapText'; -import TextIncrease from '@material-ui/icons/ZoomIn'; -import TextDecrease from '@material-ui/icons/ZoomOut'; -import FullscreenSharp from '@material-ui/icons/FullscreenSharp'; -import FullscreenExitSharp from '@material-ui/icons/FullscreenExitSharp'; -import ExitToApp from '@material-ui/icons/ExitToApp'; -import CheckCircleOutline from '@material-ui/icons/CheckCircleOutline'; -import RemoveCircleOutline from '@material-ui/icons/RemoveCircleOutline'; -import NotInterested from '@material-ui/icons/NotInterested'; -import Image from '@material-ui/icons/Image'; -import Stop from '@material-ui/icons/Stop'; +import React from "react"; +import { Badge, SvgIcon, Tooltip } from "@material-ui/core"; +import Add from "@material-ui/icons/Add"; +import ArrowBack from "@material-ui/icons/ArrowBack"; +import ArrowDropDown from "@material-ui/icons/ArrowDropDown"; +import Build from "@material-ui/icons/Build"; +import Cached from "@material-ui/icons/Cached"; +import DescriptionIcon from "@material-ui/icons/Description"; +import ChevronLeft from "@material-ui/icons/ChevronLeft"; +import CloudUpload from "@material-ui/icons/CloudUpload"; +import Code from "@material-ui/icons/Code"; +import Create from "@material-ui/icons/Create"; +import ImportContacts from "@material-ui/icons/ImportContacts"; +import ChevronRight from "@material-ui/icons/ChevronRight"; +import Close from "@material-ui/icons/Close"; +import ContentCopy from "@material-ui/icons/FileCopyOutlined"; +import CreateNewFolder from "@material-ui/icons/CreateNewFolder"; +import Delete from "@material-ui/icons/Delete"; +import DeviceHub from "@material-ui/icons/DeviceHub"; +import Edit from "@material-ui/icons/Edit"; +import ErrorRoundedIcon from "@material-ui/icons/ErrorRounded"; +import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; +import FlipToFront from "@material-ui/icons/FlipToFront"; +import Folder from "@material-ui/icons/Folder"; +import FolderShared from "@material-ui/icons/FolderShared"; +import Pageview from "@material-ui/icons/Pageview"; +import GetApp from "@material-ui/icons/GetApp"; +import Help from "@material-ui/icons/Help"; +import HelpOutline from "@material-ui/icons/HelpOutline"; +import History from "@material-ui/icons/History"; +import Inbox from "@material-ui/icons/Inbox"; +import Memory from "@material-ui/icons/Memory"; +import MoveToInbox from "@material-ui/icons/MoveToInbox"; +import Info from "@material-ui/icons/Info"; +import Input from "@material-ui/icons/Input"; +import InsertDriveFile from "@material-ui/icons/InsertDriveFile"; +import LastPage from "@material-ui/icons/LastPage"; +import LibraryBooks from "@material-ui/icons/LibraryBooks"; +import ListAlt from "@material-ui/icons/ListAlt"; +import Menu from "@material-ui/icons/Menu"; +import MoreVert from "@material-ui/icons/MoreVert"; +import MoreHoriz from "@material-ui/icons/MoreHoriz"; +import Mail from "@material-ui/icons/Mail"; +import Notifications from "@material-ui/icons/Notifications"; +import OpenInNew from "@material-ui/icons/OpenInNew"; +import People from "@material-ui/icons/People"; +import Person from "@material-ui/icons/Person"; +import PersonAdd from "@material-ui/icons/PersonAdd"; +import PlayArrow from "@material-ui/icons/PlayArrow"; +import Public from "@material-ui/icons/Public"; +import RateReview from "@material-ui/icons/RateReview"; +import RestoreFromTrash from "@material-ui/icons/History"; +import Search from "@material-ui/icons/Search"; +import SettingsApplications from "@material-ui/icons/SettingsApplications"; +import SettingsEthernet from "@material-ui/icons/SettingsEthernet"; +import Settings from "@material-ui/icons/Settings"; +import Star from "@material-ui/icons/Star"; +import StarBorder from "@material-ui/icons/StarBorder"; +import Warning from "@material-ui/icons/Warning"; +import VpnKey from "@material-ui/icons/VpnKey"; +import LinkOutlined from "@material-ui/icons/LinkOutlined"; +import RemoveRedEye from "@material-ui/icons/RemoveRedEye"; +import Computer from "@material-ui/icons/Computer"; +import WrapText from "@material-ui/icons/WrapText"; +import TextIncrease from "@material-ui/icons/ZoomIn"; +import TextDecrease from "@material-ui/icons/ZoomOut"; +import FullscreenSharp from "@material-ui/icons/FullscreenSharp"; +import FullscreenExitSharp from "@material-ui/icons/FullscreenExitSharp"; +import ExitToApp from "@material-ui/icons/ExitToApp"; +import CheckCircleOutline from "@material-ui/icons/CheckCircleOutline"; +import RemoveCircleOutline from "@material-ui/icons/RemoveCircleOutline"; +import NotInterested from "@material-ui/icons/NotInterested"; +import Image from "@material-ui/icons/Image"; +import Stop from "@material-ui/icons/Stop"; +import FileCopy from "@material-ui/icons/FileCopy"; // Import FontAwesome icons -import { library } from '@fortawesome/fontawesome-svg-core'; -import { faPencilAlt, faSlash, faUsers, faEllipsisH } from '@fortawesome/free-solid-svg-icons'; -import { FormatAlignLeft } from '@material-ui/icons'; -library.add( - faPencilAlt, - faSlash, - faUsers, - faEllipsisH, -); +import { library } from "@fortawesome/fontawesome-svg-core"; +import { faPencilAlt, faSlash, faUsers, faEllipsisH } from "@fortawesome/free-solid-svg-icons"; +import { FormatAlignLeft } from "@material-ui/icons"; +library.add(faPencilAlt, faSlash, faUsers, faEllipsisH); -export const FreezeIcon = (props: any) => +export const FreezeIcon = (props: any) => ( +); -export const UnfreezeIcon = (props: any) => +export const UnfreezeIcon = (props: any) => ( +); -export const PendingIcon = (props: any) => +export const PendingIcon = (props: any) => ( - + +); -export const ReadOnlyIcon = (props: any) => +export const ReadOnlyIcon = (props: any) => (
- +
- ; + +); -export const GroupsIcon = (props: any) => +export const GroupsIcon = (props: any) => ( - ; + +); -export const CollectionOldVersionIcon = (props: any) => - - }> +export const CollectionOldVersionIcon = (props: any) => ( + + }> - ; + +); // https://materialdesignicons.com/icon/image-off -export const ImageOffIcon = (props: any) => +export const ImageOffIcon = (props: any) => ( - ; + +); // https://materialdesignicons.com/icon/inbox-arrow-up -export const OutputIcon: IconType = (props: any) => +export const OutputIcon: IconType = (props: any) => ( - ; + +); -export type IconType = React.SFC<{ className?: string, style?: object }>; +// https://pictogrammers.com/library/mdi/icon/file-move/ +export const FileMoveIcon: IconType = (props: any) => ( + + + +); -export const AddIcon: IconType = (props) => ; -export const AddFavoriteIcon: IconType = (props) => ; -export const AdminMenuIcon: IconType = (props) => ; -export const AdvancedIcon: IconType = (props) => ; -export const AttributesIcon: IconType = (props) => ; -export const BackIcon: IconType = (props) => ; -export const CustomizeTableIcon: IconType = (props) => ; -export const CommandIcon: IconType = (props) => ; -export const CopyIcon: IconType = (props) => ; -export const CollectionIcon: IconType = (props) => ; -export const CloseIcon: IconType = (props) => ; -export const CloudUploadIcon: IconType = (props) => ; -export const DefaultIcon: IconType = (props) => ; -export const DetailsIcon: IconType = (props) => ; -export const DirectoryIcon: IconType = (props) => ; -export const DownloadIcon: IconType = (props) => ; -export const EditSavedQueryIcon: IconType = (props) => ; -export const ExpandIcon: IconType = (props) => ; -export const ErrorIcon: IconType = (props) => ; -export const FavoriteIcon: IconType = (props) => ; -export const FileIcon: IconType = (props) => ; -export const HelpIcon: IconType = (props) => ; -export const HelpOutlineIcon: IconType = (props) => ; -export const ImportContactsIcon: IconType = (props) => ; -export const InfoIcon: IconType = (props) => ; -export const FileInputIcon: IconType = (props) => ; -export const KeyIcon: IconType = (props) => ; -export const LogIcon: IconType = (props) => ; -export const MailIcon: IconType = (props) => ; -export const MaximizeIcon: IconType = (props) => ; -export const MemoryIcon: IconType = (props) => ; -export const UnMaximizeIcon: IconType = (props) => ; -export const MoreOptionsIcon: IconType = (props) => ; -export const MoveToIcon: IconType = (props) => ; -export const NewProjectIcon: IconType = (props) => ; -export const NotificationIcon: IconType = (props) => ; -export const OpenIcon: IconType = (props) => ; -export const InputIcon: IconType = (props) => ; -export const PaginationDownIcon: IconType = (props) => ; -export const PaginationLeftArrowIcon: IconType = (props) => ; -export const PaginationRightArrowIcon: IconType = (props) => ; -export const ProcessIcon: IconType = (props) => ; -export const ProjectIcon: IconType = (props) => ; -export const FilterGroupIcon: IconType = (props) => ; -export const ProjectsIcon: IconType = (props) => ; -export const ProvenanceGraphIcon: IconType = (props) => ; -export const RemoveIcon: IconType = (props) => ; -export const RemoveFavoriteIcon: IconType = (props) => ; -export const PublicFavoriteIcon: IconType = (props) => ; -export const RenameIcon: IconType = (props) => ; -export const RestoreVersionIcon: IconType = (props) => ; -export const RestoreFromTrashIcon: IconType = (props) => ; -export const ReRunProcessIcon: IconType = (props) => ; -export const SearchIcon: IconType = (props) => ; -export const ShareIcon: IconType = (props) => ; -export const ShareMeIcon: IconType = (props) => ; -export const SidePanelRightArrowIcon: IconType = (props) => ; -export const TrashIcon: IconType = (props) => ; -export const UserPanelIcon: IconType = (props) => ; -export const UsedByIcon: IconType = (props) => ; -export const WorkflowIcon: IconType = (props) => ; -export const WarningIcon: IconType = (props) => ; -export const Link: IconType = (props) => ; -export const FolderSharedIcon: IconType = (props) => ; -export const CanReadIcon: IconType = (props) => ; -export const CanWriteIcon: IconType = (props) => ; -export const CanManageIcon: IconType = (props) => ; -export const AddUserIcon: IconType = (props) => ; -export const WordWrapOnIcon: IconType = (props) => ; -export const WordWrapOffIcon: IconType = (props) => ; -export const TextIncreaseIcon: IconType = (props) => ; -export const TextDecreaseIcon: IconType = (props) => ; -export const DeactivateUserIcon: IconType = (props) => ; -export const LoginAsIcon: IconType = (props) => ; -export const ActiveIcon: IconType = (props) => ; -export const SetupIcon: IconType = (props) => ; -export const InactiveIcon: IconType = (props) => ; -export const ImageIcon: IconType = (props) => ; -export const StartIcon: IconType = (props) => ; -export const StopIcon: IconType = (props) => ; +// https://pictogrammers.com/library/mdi/icon/checkbox-multiple-outline/ +export const CheckboxMultipleOutline: IconType = (props: any) => ( + + + +); + +// https://pictogrammers.com/library/mdi/icon/checkbox-multiple-blank-outline/ +export const CheckboxMultipleBlankOutline: IconType = (props: any) => ( + + + +); + +export type IconType = React.SFC<{ className?: string; style?: object }>; + +export const AddIcon: IconType = props => ; +export const AddFavoriteIcon: IconType = props => ; +export const AdminMenuIcon: IconType = props => ; +export const AdvancedIcon: IconType = props => ; +export const AttributesIcon: IconType = props => ; +export const BackIcon: IconType = props => ; +export const CustomizeTableIcon: IconType = props => ; +export const CommandIcon: IconType = props => ; +export const CopyIcon: IconType = props => ; +export const FileCopyIcon: IconType = props => ; +export const CollectionIcon: IconType = props => ; +export const CloseIcon: IconType = props => ; +export const CloudUploadIcon: IconType = props => ; +export const DefaultIcon: IconType = props => ; +export const DetailsIcon: IconType = props => ; +export const DirectoryIcon: IconType = props => ; +export const DownloadIcon: IconType = props => ; +export const EditSavedQueryIcon: IconType = props => ; +export const ExpandIcon: IconType = props => ; +export const ErrorIcon: IconType = props => ( + +); +export const FavoriteIcon: IconType = props => ; +export const FileIcon: IconType = props => ; +export const HelpIcon: IconType = props => ; +export const HelpOutlineIcon: IconType = props => ; +export const ImportContactsIcon: IconType = props => ; +export const InfoIcon: IconType = props => ; +export const FileInputIcon: IconType = props => ; +export const KeyIcon: IconType = props => ; +export const LogIcon: IconType = props => ; +export const MailIcon: IconType = props => ; +export const MaximizeIcon: IconType = props => ; +export const MemoryIcon: IconType = props => ; +export const UnMaximizeIcon: IconType = props => ; +export const MoreVerticalIcon: IconType = props => ; +export const MoreHorizontalIcon: IconType = props => ; +export const MoveToIcon: IconType = props => ; +export const NewProjectIcon: IconType = props => ; +export const NotificationIcon: IconType = props => ; +export const OpenIcon: IconType = props => ; +export const InputIcon: IconType = props => ; +export const PaginationDownIcon: IconType = props => ; +export const PaginationLeftArrowIcon: IconType = props => ; +export const PaginationRightArrowIcon: IconType = props => ; +export const ProcessIcon: IconType = props => ; +export const ProjectIcon: IconType = props => ; +export const FilterGroupIcon: IconType = props => ; +export const ProjectsIcon: IconType = props => ; +export const ProvenanceGraphIcon: IconType = props => ; +export const RemoveIcon: IconType = props => ; +export const RemoveFavoriteIcon: IconType = props => ; +export const PublicFavoriteIcon: IconType = props => ; +export const RenameIcon: IconType = props => ; +export const RestoreVersionIcon: IconType = props => ; +export const RestoreFromTrashIcon: IconType = props => ; +export const ReRunProcessIcon: IconType = props => ; +export const SearchIcon: IconType = props => ; +export const ShareIcon: IconType = props => ; +export const ShareMeIcon: IconType = props => ; +export const SidePanelRightArrowIcon: IconType = props => ; +export const TrashIcon: IconType = props => ; +export const UserPanelIcon: IconType = props => ; +export const UsedByIcon: IconType = props => ; +export const WorkflowIcon: IconType = props => ; +export const WarningIcon: IconType = props => ( + +); +export const Link: IconType = props => ; +export const FolderSharedIcon: IconType = props => ; +export const CanReadIcon: IconType = props => ; +export const CanWriteIcon: IconType = props => ; +export const CanManageIcon: IconType = props => ; +export const AddUserIcon: IconType = props => ; +export const WordWrapOnIcon: IconType = props => ; +export const WordWrapOffIcon: IconType = props => ; +export const TextIncreaseIcon: IconType = props => ; +export const TextDecreaseIcon: IconType = props => ; +export const DeactivateUserIcon: IconType = props => ; +export const LoginAsIcon: IconType = props => ; +export const ActiveIcon: IconType = props => ; +export const SetupIcon: IconType = props => ; +export const InactiveIcon: IconType = props => ; +export const ImageIcon: IconType = props => ; +export const StartIcon: IconType = props => ; +export const StopIcon: IconType = props => ; +export const SelectAllIcon: IconType = props => ; +export const SelectNoneIcon: IconType = props => ; diff --git a/src/store/store.ts b/src/store/store.ts index e0af6047f4..ac56d40793 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -78,6 +78,8 @@ import { tooltipsMiddleware } from "./tooltips/tooltips-middleware"; import { sidePanelReducer } from "./side-panel/side-panel-reducer"; import { bannerReducer } from "./banner/banner-reducer"; import { multiselectReducer } from "./multiselect/multiselect-reducer"; +import { composeWithDevTools } from "redux-devtools-extension"; +const composeEnhancers = (process.env.NODE_ENV === "development" && window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose; declare global { interface Window { @@ -85,9 +87,6 @@ declare global { } } -const composeEnhancers = (process.env.NODE_ENV === "development" && window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose; -import { composeWithDevTools } from "redux-devtools-extension"; - export type RootState = ReturnType>; export type RootStore = Store & { dispatch: Dispatch }; diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx index 5accd0522f..dca06084f6 100644 --- a/src/views-components/data-explorer/renderers.tsx +++ b/src/views-components/data-explorer/renderers.tsx @@ -2,17 +2,10 @@ // // SPDX-License-Identifier: AGPL-3.0 -<<<<<<< HEAD -import React from 'react'; -import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox, Chip } from '@material-ui/core'; -import { FavoriteStar, PublicFavoriteStar } from '../favorite-star/favorite-star'; -import { Resource, ResourceKind, TrashableResource } from 'models/resource'; -======= import React from "react"; import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox, Chip } from "@material-ui/core"; import { FavoriteStar, PublicFavoriteStar } from "../favorite-star/favorite-star"; import { Resource, ResourceKind, TrashableResource } from "models/resource"; ->>>>>>> main import { FreezeIcon, ProjectIcon, @@ -28,49 +21,6 @@ import { ActiveIcon, SetupIcon, InactiveIcon, -<<<<<<< HEAD -} from 'components/icon/icon'; -import { formatDate, formatFileSize, formatTime } from 'common/formatters'; -import { resourceLabel } from 'common/labels'; -import { connect, DispatchProp } from 'react-redux'; -import { RootState } from 'store/store'; -import { getResource, filterResources } from 'store/resources/resources'; -import { GroupContentsResource } from 'services/groups-service/groups-service'; -import { getProcess, Process, getProcessStatus, getProcessStatusStyles, getProcessRuntime } from 'store/processes/process'; -import { ArvadosTheme } from 'common/custom-theme'; -import { compose, Dispatch } from 'redux'; -import { WorkflowResource } from 'models/workflow'; -import { ResourceStatus as WorkflowStatus } from 'views/workflow-panel/workflow-panel-view'; -import { getUuidPrefix, openRunProcess } from 'store/workflow-panel/workflow-panel-actions'; -import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions'; -import { getUserFullname, getUserDisplayName, User, UserResource } from 'models/user'; -import { toggleIsAdmin } from 'store/users/users-actions'; -import { LinkClass, LinkResource } from 'models/link'; -import { navigateTo, navigateToGroupDetails, navigateToUserProfile } from 'store/navigation/navigation-action'; -import { withResourceData } from 'views-components/data-explorer/with-resources'; -import { CollectionResource } from 'models/collection'; -import { IllegalNamingWarning } from 'components/warning/warning'; -import { loadResource } from 'store/resources/resources-actions'; -import { BuiltinGroups, getBuiltinGroupUuid, GroupClass, GroupResource, isBuiltinGroup } from 'models/group'; -import { openRemoveGroupMemberDialog } from 'store/group-details-panel/group-details-panel-actions'; -import { setMemberIsHidden } from 'store/group-details-panel/group-details-panel-actions'; -import { formatPermissionLevel } from 'views-components/sharing-dialog/permission-select'; -import { PermissionLevel } from 'models/permission'; -import { openPermissionEditContextMenu } from 'store/context-menu/context-menu-actions'; -import { getUserUuid } from 'common/getuser'; -import { VirtualMachinesResource } from 'models/virtual-machines'; -import { CopyToClipboardSnackbar } from 'components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar'; -import { ProjectResource } from 'models/project'; -import { ProcessResource } from 'models/process'; - -const renderName = (dispatch: Dispatch, item: GroupContentsResource) => { - const navFunc = 'groupClass' in item && item.groupClass === GroupClass.ROLE ? navigateToGroupDetails : navigateTo; - return ( - - {renderIcon(item)} - - dispatch(navFunc(item.uuid))}> -======= } from "components/icon/icon"; import { formatDate, formatFileSize, formatTime } from "common/formatters"; import { resourceLabel } from "common/labels"; @@ -120,17 +70,12 @@ const renderName = (dispatch: Dispatch, item: GroupContentsResource) => { style={{ width: "auto", cursor: "pointer" }} onClick={() => dispatch(navFunc(item.uuid))} > ->>>>>>> main {item.kind === ResourceKind.PROJECT || item.kind === ResourceKind.COLLECTION ? : null} {item.name} -<<<<<<< HEAD - -======= ->>>>>>> main {item.kind === ResourceKind.PROJECT && } @@ -150,17 +95,12 @@ const FrozenProject = (props: { item: ProjectResource }) => { if (props.item.frozenByUuid) { return ( -<<<<<<< HEAD - Project was frozen by {fullUsername}}> - -======= Project was frozen by {fullUsername}} > ->>>>>>> main ); } else { @@ -196,26 +136,16 @@ const renderIcon = (item: GroupContentsResource) => { const renderDate = (date?: string) => { return ( -<<<<<<< HEAD - -======= ->>>>>>> main {formatDate(date)} ); }; const renderWorkflowName = (item: WorkflowResource) => ( -<<<<<<< HEAD - - {renderIcon(item)} - - -======= ( color="primary" style={{ width: "100px" }} > ->>>>>>> main {item.name} @@ -249,11 +178,7 @@ const resourceShare = (dispatch: Dispatch, uuidPrefix: string, ownerUuid?: strin return (
{!isPublic && uuid && ( -<<<<<<< HEAD - -======= ->>>>>>> main dispatch(openSharingDialog(uuid))}> @@ -267,13 +192,8 @@ export const ResourceShare = connect((state: RootState, props: { uuid: string }) const resource = getResource(props.uuid)(state.resources); const uuidPrefix = getUuidPrefix(state); return { -<<<<<<< HEAD - uuid: resource ? resource.uuid : '', - ownerUuid: resource ? resource.ownerUuid : '', -======= uuid: resource ? resource.uuid : "", ownerUuid: resource ? resource.ownerUuid : "", ->>>>>>> main uuidPrefix, }; })((props: { ownerUuid?: string; uuidPrefix: string; uuid?: string } & DispatchProp) => @@ -287,26 +207,13 @@ const renderFirstName = (item: { firstName: string }) => { export const ResourceFirstName = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return resource || { firstName: '' }; -======= return resource || { firstName: "" }; ->>>>>>> main })(renderFirstName); const renderLastName = (item: { lastName: string }) => {item.lastName}; export const ResourceLastName = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return resource || { lastName: '' }; -})(renderLastName); - -const renderFullName = (dispatch: Dispatch, item: { uuid: string; firstName: string; lastName: string }, link?: boolean) => { - const displayName = (item.firstName + ' ' + item.lastName).trim() || item.uuid; - return link ? ( - dispatch(navigateToUserProfile(item.uuid))}> -======= return resource || { lastName: "" }; })(renderLastName); @@ -319,7 +226,6 @@ const renderFullName = (dispatch: Dispatch, item: { uuid: string; firstName: str style={{ cursor: "pointer" }} onClick={() => dispatch(navigateToUserProfile(item.uuid))} > ->>>>>>> main {displayName} ) : ( @@ -329,40 +235,22 @@ const renderFullName = (dispatch: Dispatch, item: { uuid: string; firstName: str export const UserResourceFullName = connect((state: RootState, props: { uuid: string; link?: boolean }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { item: resource || { uuid: '', firstName: '', lastName: '' }, link: props.link }; -======= return { item: resource || { uuid: "", firstName: "", lastName: "" }, link: props.link }; ->>>>>>> main })((props: { item: { uuid: string; firstName: string; lastName: string }; link?: boolean } & DispatchProp) => renderFullName(props.dispatch, props.item, props.link) ); const renderUuid = (item: { uuid: string }) => ( -<<<<<<< HEAD - - {item.uuid} - {(item.uuid && ) || '-'} -======= {item.uuid} {(item.uuid && ) || "-"} ->>>>>>> main ); const renderUuidCopyIcon = (item: { uuid: string }) => ( -<<<<<<< HEAD - - {(item.uuid && ) || '-'} - -); - -export const ResourceUuid = connect((state: RootState, props: { uuid: string }) => getResource(props.uuid)(state.resources) || { uuid: '' })(renderUuid); -======= getResource(props.uuid)(state.resources) || { uuid: "" } )(renderUuid); ->>>>>>> main const renderEmail = (item: { email: string }) => {item.email}; export const ResourceEmail = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return resource || { email: '' }; -})(renderEmail); - -enum UserAccountStatus { - ACTIVE = 'Active', - INACTIVE = 'Inactive', - SETUP = 'Setup', - UNKNOWN = '', -} - -const renderAccountStatus = (props: { status: UserAccountStatus }) => ( - -======= return resource || { email: "" }; })(renderEmail); @@ -412,24 +285,15 @@ const renderAccountStatus = (props: { status: UserAccountStatus }) => ( spacing={8} data-cy="account-status" > ->>>>>>> main {(() => { switch (props.status) { case UserAccountStatus.ACTIVE: -<<<<<<< HEAD - return ; - case UserAccountStatus.SETUP: - return ; - case UserAccountStatus.INACTIVE: - return ; -======= return ; case UserAccountStatus.SETUP: return ; case UserAccountStatus.INACTIVE: return ; ->>>>>>> main default: return <>; } @@ -481,19 +345,11 @@ const renderIsHidden = (props: { if (props.memberLinkUuid) { return ( { -======= data-cy="user-visible-checkbox" color="primary" checked={props.visible} disabled={!props.canManage} onClick={e => { ->>>>>>> main e.stopPropagation(); props.setMemberIsHidden(props.memberLinkUuid, props.permissionLinkUuid, !props.visible); }} @@ -525,18 +381,14 @@ export const ResourceLinkTailIsVisible = connect( return member?.kind === ResourceKind.USER ? { memberLinkUuid: link?.uuid, permissionLinkUuid, visible: isVisible, canManage: !isBuiltin } -<<<<<<< HEAD - : { memberLinkUuid: '', permissionLinkUuid: '', visible: false, canManage: false }; -======= : { memberLinkUuid: "", permissionLinkUuid: "", visible: false, canManage: false }; ->>>>>>> main }, { setMemberIsHidden } )(renderIsHidden); const renderIsAdmin = (props: { uuid: string; isAdmin: boolean; toggleIsAdmin: (uuid: string) => void }) => ( { e.stopPropagation(); @@ -557,11 +409,7 @@ const renderUsername = (item: { username: string; uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return resource || { username: '', uuid: props.uuid }; -======= return resource || { username: "", uuid: props.uuid }; ->>>>>>> main })(renderUsername); // Virtual machine resource @@ -570,26 +418,16 @@ const renderHostname = (item: { hostname: string }) => {item. export const VirtualMachineHostname = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return resource || { hostname: '' }; -======= return resource || { hostname: "" }; ->>>>>>> main })(renderHostname); const renderVirtualMachineLogin = (login: { user: string }) => {login.user}; export const VirtualMachineLogin = connect((state: RootState, props: { linkUuid: string }) => { const permission = getResource(props.linkUuid)(state.resources); -<<<<<<< HEAD - const user = getResource(permission?.tailUuid || '')(state.resources); - - return { user: user?.username || permission?.tailUuid || '' }; -======= const user = getResource(permission?.tailUuid || "")(state.resources); return { user: user?.username || permission?.tailUuid || "" }; ->>>>>>> main })(renderVirtualMachineLogin); // Common methods @@ -619,37 +457,21 @@ export const TokenScopes = withResourceData("scopes", renderCommonData); export const TokenUserId = withResourceData("userId", renderCommonData); const clusterColors = [ -<<<<<<< HEAD - ['#f44336', '#fff'], - ['#2196f3', '#fff'], - ['#009688', '#fff'], - ['#cddc39', '#fff'], - ['#ff9800', '#fff'], -======= ["#f44336", "#fff"], ["#2196f3", "#fff"], ["#009688", "#fff"], ["#cddc39", "#fff"], ["#ff9800", "#fff"], ->>>>>>> main ]; export const ResourceCluster = (props: { uuid: string }) => { const CLUSTER_ID_LENGTH = 5; -<<<<<<< HEAD - const pos = props.uuid.length > CLUSTER_ID_LENGTH ? props.uuid.indexOf('-') : 5; - const clusterId = pos >= CLUSTER_ID_LENGTH ? props.uuid.substring(0, pos) : ''; - const ci = - pos >= CLUSTER_ID_LENGTH - ? ((props.uuid.charCodeAt(0) * props.uuid.charCodeAt(1) + props.uuid.charCodeAt(2)) * props.uuid.charCodeAt(3) + props.uuid.charCodeAt(4)) % -======= const pos = props.uuid.length > CLUSTER_ID_LENGTH ? props.uuid.indexOf("-") : 5; const clusterId = pos >= CLUSTER_ID_LENGTH ? props.uuid.substring(0, pos) : ""; const ci = pos >= CLUSTER_ID_LENGTH ? ((props.uuid.charCodeAt(0) * props.uuid.charCodeAt(1) + props.uuid.charCodeAt(2)) * props.uuid.charCodeAt(3) + props.uuid.charCodeAt(4)) % ->>>>>>> main clusterColors.length : 0; return ( @@ -657,11 +479,7 @@ export const ResourceCluster = (props: { uuid: string }) => { style={{ backgroundColor: clusterColors[ci][0], color: clusterColors[ci][1], -<<<<<<< HEAD - padding: '2px 7px', -======= padding: "2px 7px", ->>>>>>> main borderRadius: 3, }} > @@ -671,38 +489,22 @@ export const ResourceCluster = (props: { uuid: string }) => { }; // Links Resources -<<<<<<< HEAD -const renderLinkName = (item: { name: string }) => {item.name || '-'}; - -export const ResourceLinkName = connect((state: RootState, props: { uuid: string }) => { - const resource = getResource(props.uuid)(state.resources); - return resource || { name: '' }; -======= const renderLinkName = (item: { name: string }) => {item.name || "-"}; export const ResourceLinkName = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); return resource || { name: "" }; ->>>>>>> main })(renderLinkName); const renderLinkClass = (item: { linkClass: string }) => {item.linkClass}; export const ResourceLinkClass = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return resource || { linkClass: '' }; -})(renderLinkClass); - -const getResourceDisplayName = (resource: Resource): string => { - if ((resource as UserResource).kind === ResourceKind.USER && typeof (resource as UserResource).firstName !== 'undefined') { -======= return resource || { linkClass: "" }; })(renderLinkClass); const getResourceDisplayName = (resource: Resource): string => { if ((resource as UserResource).kind === ResourceKind.USER && typeof (resource as UserResource).firstName !== "undefined") { ->>>>>>> main // We can be sure the resource is UserResource return getUserDisplayName(resource as UserResource); } else { @@ -714,10 +516,6 @@ const renderResourceLink = (dispatch: Dispatch, item: Resource) => { var displayName = getResourceDisplayName(item); return ( -<<<<<<< HEAD - dispatch(navigateTo(item.uuid))}> - {resourceLabel(item.kind, item && item.kind === ResourceKind.GROUP ? (item as GroupResource).groupClass || '' : '')}: {displayName || item.uuid} -======= { > {resourceLabel(item.kind, item && item.kind === ResourceKind.GROUP ? (item as GroupResource).groupClass || "" : "")}:{" "} {displayName || item.uuid} ->>>>>>> main ); }; export const ResourceLinkTail = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const tailResource = getResource(resource?.tailUuid || '')(state.resources); - - return { - item: tailResource || { uuid: resource?.tailUuid || '', kind: resource?.tailKind || ResourceKind.NONE }, -======= const tailResource = getResource(resource?.tailUuid || "")(state.resources); return { item: tailResource || { uuid: resource?.tailUuid || "", kind: resource?.tailKind || ResourceKind.NONE }, ->>>>>>> main }; })((props: { item: Resource } & DispatchProp) => renderResourceLink(props.dispatch, props.item)); export const ResourceLinkHead = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const headResource = getResource(resource?.headUuid || '')(state.resources); - - return { - item: headResource || { uuid: resource?.headUuid || '', kind: resource?.headKind || ResourceKind.NONE }, -======= const headResource = getResource(resource?.headUuid || "")(state.resources); return { item: headResource || { uuid: resource?.headUuid || "", kind: resource?.headKind || ResourceKind.NONE }, ->>>>>>> main }; })((props: { item: Resource } & DispatchProp) => renderResourceLink(props.dispatch, props.item)); export const ResourceLinkUuid = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return resource || { uuid: '' }; -======= return resource || { uuid: "" }; ->>>>>>> main })(renderUuid); export const ResourceLinkHeadUuid = connect((state: RootState, props: { uuid: string }) => { const link = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const headResource = getResource(link?.headUuid || '')(state.resources); - - return headResource || { uuid: '' }; -======= const headResource = getResource(link?.headUuid || "")(state.resources); return headResource || { uuid: "" }; ->>>>>>> main })(renderUuid); export const ResourceLinkTailUuid = connect((state: RootState, props: { uuid: string }) => { const link = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const tailResource = getResource(link?.tailUuid || '')(state.resources); - - return tailResource || { uuid: '' }; -======= const tailResource = getResource(link?.tailUuid || "")(state.resources); return tailResource || { uuid: "" }; ->>>>>>> main })(renderUuid); const renderLinkDelete = (dispatch: Dispatch, item: LinkResource, canManage: boolean) => { if (item.uuid) { return canManage ? ( -<<<<<<< HEAD - dispatch(openRemoveGroupMemberDialog(item.uuid))}> -======= dispatch(openRemoveGroupMemberDialog(item.uuid))} > ->>>>>>> main ) : ( -<<<<<<< HEAD - -======= ->>>>>>> main @@ -839,45 +598,26 @@ const renderLinkDelete = (dispatch: Dispatch, item: LinkResource, canManage: boo export const ResourceLinkDelete = connect((state: RootState, props: { uuid: string }) => { const link = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const isBuiltin = isBuiltinGroup(link?.headUuid || '') || isBuiltinGroup(link?.tailUuid || ''); - - return { - item: link || { uuid: '', kind: ResourceKind.NONE }, -======= const isBuiltin = isBuiltinGroup(link?.headUuid || "") || isBuiltinGroup(link?.tailUuid || ""); return { item: link || { uuid: "", kind: ResourceKind.NONE }, ->>>>>>> main canManage: link && getResourceLinkCanManage(state, link) && !isBuiltin, }; })((props: { item: LinkResource; canManage: boolean } & DispatchProp) => renderLinkDelete(props.dispatch, props.item, props.canManage)); export const ResourceLinkTailEmail = connect((state: RootState, props: { uuid: string }) => { const link = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const resource = getResource(link?.tailUuid || '')(state.resources); - - return resource || { email: '' }; -======= const resource = getResource(link?.tailUuid || "")(state.resources); return resource || { email: "" }; ->>>>>>> main })(renderEmail); export const ResourceLinkTailUsername = connect((state: RootState, props: { uuid: string }) => { const link = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const resource = getResource(link?.tailUuid || '')(state.resources); - - return resource || { username: '' }; -======= const resource = getResource(link?.tailUuid || "")(state.resources); return resource || { username: "" }; ->>>>>>> main })(renderUsername); const renderPermissionLevel = (dispatch: Dispatch, link: LinkResource, canManage: boolean) => { @@ -885,13 +625,6 @@ const renderPermissionLevel = (dispatch: Dispatch, link: LinkResource, canManage {formatPermissionLevel(link.name as PermissionLevel)} {canManage ? ( -<<<<<<< HEAD - dispatch(openPermissionEditContextMenu(event, link))}> - - - ) : ( - '' -======= dispatch(openPermissionEditContextMenu(event, link))} @@ -900,7 +633,6 @@ const renderPermissionLevel = (dispatch: Dispatch, link: LinkResource, canManage ) : ( "" ->>>>>>> main )} ); @@ -908,34 +640,20 @@ const renderPermissionLevel = (dispatch: Dispatch, link: LinkResource, canManage export const ResourceLinkHeadPermissionLevel = connect((state: RootState, props: { uuid: string }) => { const link = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const isBuiltin = isBuiltinGroup(link?.headUuid || '') || isBuiltinGroup(link?.tailUuid || ''); - - return { - link: link || { uuid: '', name: '', kind: ResourceKind.NONE }, -======= const isBuiltin = isBuiltinGroup(link?.headUuid || "") || isBuiltinGroup(link?.tailUuid || ""); return { link: link || { uuid: "", name: "", kind: ResourceKind.NONE }, ->>>>>>> main canManage: link && getResourceLinkCanManage(state, link) && !isBuiltin, }; })((props: { link: LinkResource; canManage: boolean } & DispatchProp) => renderPermissionLevel(props.dispatch, props.link, props.canManage)); export const ResourceLinkTailPermissionLevel = connect((state: RootState, props: { uuid: string }) => { const link = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - const isBuiltin = isBuiltinGroup(link?.headUuid || '') || isBuiltinGroup(link?.tailUuid || ''); - - return { - link: link || { uuid: '', name: '', kind: ResourceKind.NONE }, -======= const isBuiltin = isBuiltinGroup(link?.headUuid || "") || isBuiltinGroup(link?.tailUuid || ""); return { link: link || { uuid: "", name: "", kind: ResourceKind.NONE }, ->>>>>>> main canManage: link && getResourceLinkCanManage(state, link) && !isBuiltin, }; })((props: { link: LinkResource; canManage: boolean } & DispatchProp) => renderPermissionLevel(props.dispatch, props.link, props.canManage)); @@ -955,11 +673,7 @@ const resourceRunProcess = (dispatch: Dispatch, uuid: string) => { return (
{uuid && ( -<<<<<<< HEAD - -======= ->>>>>>> main dispatch(openRunProcess(uuid))}> @@ -972,11 +686,7 @@ const resourceRunProcess = (dispatch: Dispatch, uuid: string) => { export const ResourceRunProcess = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); return { -<<<<<<< HEAD - uuid: resource ? resource.uuid : '', -======= uuid: resource ? resource.uuid : "", ->>>>>>> main }; })((props: { uuid: string } & DispatchProp) => resourceRunProcess(props.dispatch, props.uuid)); @@ -989,14 +699,10 @@ const renderWorkflowStatus = (uuidPrefix: string, ownerUuid?: string) => { }; const renderStatus = (status: string) => ( -<<<<<<< HEAD - -======= ->>>>>>> main {status} ); @@ -1005,47 +711,24 @@ export const ResourceWorkflowStatus = connect((state: RootState, props: { uuid: const resource = getResource(props.uuid)(state.resources); const uuidPrefix = getUuidPrefix(state); return { -<<<<<<< HEAD - ownerUuid: resource ? resource.ownerUuid : '', -======= ownerUuid: resource ? resource.ownerUuid : "", ->>>>>>> main uuidPrefix, }; })((props: { ownerUuid?: string; uuidPrefix: string }) => renderWorkflowStatus(props.uuidPrefix, props.ownerUuid)); export const ResourceContainerUuid = connect((state: RootState, props: { uuid: string }) => { const process = getProcess(props.uuid)(state.resources); -<<<<<<< HEAD - return { uuid: process?.container?.uuid ? process?.container?.uuid : '' }; -})((props: { uuid: string }) => renderUuid({ uuid: props.uuid })); - -enum ColumnSelection { - OUTPUT_UUID = 'outputUuid', - LOG_UUID = 'logUuid', -======= return { uuid: process?.container?.uuid ? process?.container?.uuid : "" }; })((props: { uuid: string }) => renderUuid({ uuid: props.uuid })); enum ColumnSelection { OUTPUT_UUID = "outputUuid", LOG_UUID = "logUuid", ->>>>>>> main } const renderUuidLinkWithCopyIcon = (dispatch: Dispatch, item: ProcessResource, column: string) => { const selectedColumnUuid = item[column]; return ( -<<<<<<< HEAD - - - {selectedColumnUuid ? ( - dispatch(navigateTo(selectedColumnUuid))}> - {selectedColumnUuid} - - ) : ( - '-' -======= ) : ( "-" ->>>>>>> main )} {selectedColumnUuid && renderUuidCopyIcon({ uuid: selectedColumnUuid })} @@ -1083,58 +765,31 @@ export const ResourceLogUuid = connect((state: RootState, props: { uuid: string export const ResourceParentProcess = connect((state: RootState, props: { uuid: string }) => { const process = getProcess(props.uuid)(state.resources); -<<<<<<< HEAD - return { parentProcess: process?.containerRequest?.requestingContainerUuid || '' }; -======= return { parentProcess: process?.containerRequest?.requestingContainerUuid || "" }; ->>>>>>> main })((props: { parentProcess: string }) => renderUuid({ uuid: props.parentProcess })); export const ResourceModifiedByUserUuid = connect((state: RootState, props: { uuid: string }) => { const process = getProcess(props.uuid)(state.resources); -<<<<<<< HEAD - return { userUuid: process?.containerRequest?.modifiedByUserUuid || '' }; -======= return { userUuid: process?.containerRequest?.modifiedByUserUuid || "" }; ->>>>>>> main })((props: { userUuid: string }) => renderUuid({ uuid: props.userUuid })); export const ResourceCreatedAtDate = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { date: resource ? resource.createdAt : '' }; -======= return { date: resource ? resource.createdAt : "" }; ->>>>>>> main })((props: { date: string }) => renderDate(props.date)); export const ResourceLastModifiedDate = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { date: resource ? resource.modifiedAt : '' }; -======= return { date: resource ? resource.modifiedAt : "" }; ->>>>>>> main })((props: { date: string }) => renderDate(props.date)); export const ResourceTrashDate = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { date: resource ? resource.trashAt : '' }; -======= return { date: resource ? resource.trashAt : "" }; ->>>>>>> main })((props: { date: string }) => renderDate(props.date)); export const ResourceDeleteDate = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { date: resource ? resource.deleteAt : '' }; -})((props: { date: string }) => renderDate(props.date)); - -export const renderFileSize = (fileSize?: number) => ( - -======= return { date: resource ? resource.deleteAt : "" }; })((props: { date: string }) => renderDate(props.date)); @@ -1143,7 +798,6 @@ export const renderFileSize = (fileSize?: number) => ( noWrap style={{ minWidth: "45px" }} > ->>>>>>> main {formatFileSize(fileSize)} ); @@ -1152,66 +806,38 @@ export const ResourceFileSize = connect((state: RootState, props: { uuid: string const resource = getResource(props.uuid)(state.resources); if (resource && resource.kind !== ResourceKind.COLLECTION) { -<<<<<<< HEAD - return { fileSize: '' }; -======= return { fileSize: "" }; ->>>>>>> main } return { fileSize: resource ? resource.fileSizeTotal : 0 }; })((props: { fileSize?: number }) => renderFileSize(props.fileSize)); -<<<<<<< HEAD -const renderOwner = (owner: string) => {owner || '-'}; - -export const ResourceOwner = connect((state: RootState, props: { uuid: string }) => { - const resource = getResource(props.uuid)(state.resources); - return { owner: resource ? resource.ownerUuid : '' }; -======= const renderOwner = (owner: string) => {owner || "-"}; export const ResourceOwner = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); return { owner: resource ? resource.ownerUuid : "" }; ->>>>>>> main })((props: { owner: string }) => renderOwner(props.owner)); export const ResourceOwnerName = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); const ownerNameState = state.ownerName; -<<<<<<< HEAD - const ownerName = ownerNameState.find((it) => it.uuid === resource!.ownerUuid); -======= const ownerName = ownerNameState.find(it => it.uuid === resource!.ownerUuid); ->>>>>>> main return { owner: ownerName ? ownerName!.name : resource!.ownerUuid }; })((props: { owner: string }) => renderOwner(props.owner)); export const ResourceUUID = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { uuid: resource ? resource.uuid : '' }; -})((props: { uuid: string }) => renderUuid({ uuid: props.uuid })); - -const renderVersion = (version: number) => { - return {version ?? '-'}; -======= return { uuid: resource ? resource.uuid : "" }; })((props: { uuid: string }) => renderUuid({ uuid: props.uuid })); const renderVersion = (version: number) => { return {version ?? "-"}; ->>>>>>> main }; export const ResourceVersion = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { version: resource ? resource.version : '' }; -======= return { version: resource ? resource.version : "" }; ->>>>>>> main })((props: { version: number }) => renderVersion(props.version)); const renderPortableDataHash = (portableDataHash: string | null) => ( @@ -1222,47 +848,27 @@ const renderPortableDataHash = (portableDataHash: string | null) => ( ) : ( -<<<<<<< HEAD - '-' -======= "-" ->>>>>>> main )} ); export const ResourcePortableDataHash = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { portableDataHash: resource ? resource.portableDataHash : '' }; -})((props: { portableDataHash: string }) => renderPortableDataHash(props.portableDataHash)); - -const renderFileCount = (fileCount: number) => { - return {fileCount ?? '-'}; -======= return { portableDataHash: resource ? resource.portableDataHash : "" }; })((props: { portableDataHash: string }) => renderPortableDataHash(props.portableDataHash)); const renderFileCount = (fileCount: number) => { return {fileCount ?? "-"}; ->>>>>>> main }; export const ResourceFileCount = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { fileCount: resource ? resource.fileCount : '' }; -})((props: { fileCount: number }) => renderFileCount(props.fileCount)); - -const userFromID = connect((state: RootState, props: { uuid: string }) => { - let userFullname = ''; -======= return { fileCount: resource ? resource.fileCount : "" }; })((props: { fileCount: number }) => renderFileCount(props.fileCount)); const userFromID = connect((state: RootState, props: { uuid: string }) => { let userFullname = ""; ->>>>>>> main const resource = getResource(props.uuid)(state.resources); if (resource) { @@ -1275,11 +881,7 @@ const userFromID = connect((state: RootState, props: { uuid: string }) => { const ownerFromResourceId = compose( connect((state: RootState, props: { uuid: string }) => { const childResource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { uuid: childResource ? (childResource as Resource).ownerUuid : '' }; -======= return { uuid: childResource ? (childResource as Resource).ownerUuid : "" }; ->>>>>>> main }), userFromID ); @@ -1289,12 +891,6 @@ const _resourceWithName = withStyles( { withTheme: true } )((props: { uuid: string; userFullname: string; dispatch: Dispatch; theme: ArvadosTheme }) => { const { uuid, userFullname, dispatch, theme } = props; -<<<<<<< HEAD - if (userFullname === '') { - dispatch(loadResource(uuid, false)); - return ( - -======= if (userFullname === "") { dispatch(loadResource(uuid, false)); return ( @@ -1303,22 +899,17 @@ const _resourceWithName = withStyles( inline noWrap > ->>>>>>> main {uuid} ); } return ( -<<<<<<< HEAD - -======= ->>>>>>> main {userFullname} ({uuid}) ); @@ -1331,11 +922,7 @@ export const ResourceWithName = userFromID(_resourceWithName); export const UserNameFromID = compose(userFromID)((props: { uuid: string; displayAsText?: string; userFullname: string; dispatch: Dispatch }) => { const { uuid, userFullname, dispatch } = props; -<<<<<<< HEAD - if (userFullname === '') { -======= if (userFullname === "") { ->>>>>>> main dispatch(loadResource(uuid, false)); } return {userFullname ? userFullname : uuid}; @@ -1343,15 +930,9 @@ export const UserNameFromID = compose(userFromID)((props: { uuid: string; displa export const ResponsiblePerson = compose( connect((state: RootState, props: { uuid: string; parentRef: HTMLElement | null }) => { -<<<<<<< HEAD - let responsiblePersonName: string = ''; - let responsiblePersonUUID: string = ''; - let responsiblePersonProperty: string = ''; -======= let responsiblePersonName: string = ""; let responsiblePersonUUID: string = ""; let responsiblePersonProperty: string = ""; ->>>>>>> main if (state.auth.config.clusterConfig.Collections.ManagedProperties) { let index = 0; @@ -1359,11 +940,7 @@ export const ResponsiblePerson = compose( while (!responsiblePersonProperty && keys[index]) { const key = keys[index]; -<<<<<<< HEAD - if (state.auth.config.clusterConfig.Collections.ManagedProperties[key].Function === 'original_owner') { -======= if (state.auth.config.clusterConfig.Collections.ManagedProperties[key].Function === "original_owner") { ->>>>>>> main responsiblePersonProperty = key; } index++; @@ -1388,45 +965,30 @@ export const ResponsiblePerson = compose( const { uuid, responsiblePersonName, parentRef, theme } = props; if (!uuid && parentRef) { -<<<<<<< HEAD - parentRef.style.display = 'none'; - return null; - } else if (parentRef) { - parentRef.style.display = 'block'; -======= parentRef.style.display = "none"; return null; } else if (parentRef) { parentRef.style.display = "block"; ->>>>>>> main } if (!responsiblePersonName) { return ( -<<<<<<< HEAD - -======= ->>>>>>> main {uuid} ); } return ( -<<<<<<< HEAD - -======= ->>>>>>> main {responsiblePersonName} ({uuid}) ); @@ -1436,39 +998,27 @@ const renderType = (type: string, subtype: string) => {resour export const ResourceType = connect((state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); -<<<<<<< HEAD - return { type: resource ? resource.kind : '', subtype: resource && resource.kind === ResourceKind.GROUP ? resource.groupClass : '' }; -======= return { type: resource ? resource.kind : "", subtype: resource && resource.kind === ResourceKind.GROUP ? resource.groupClass : "" }; ->>>>>>> main })((props: { type: string; subtype: string }) => renderType(props.type, props.subtype)); export const ResourceStatus = connect((state: RootState, props: { uuid: string }) => { return { resource: getResource(props.uuid)(state.resources) }; })((props: { resource: GroupContentsResource }) => -<<<<<<< HEAD - props.resource && props.resource.kind === ResourceKind.COLLECTION ? : -======= props.resource && props.resource.kind === ResourceKind.COLLECTION ? ( ) : ( ) ->>>>>>> main ); export const CollectionStatus = connect((state: RootState, props: { uuid: string }) => { return { collection: getResource(props.uuid)(state.resources) }; })((props: { collection: CollectionResource }) => -<<<<<<< HEAD - props.collection.uuid !== props.collection.currentVersionUuid ? version {props.collection.version} : head version -======= props.collection.uuid !== props.collection.currentVersionUuid ? ( version {props.collection.version} ) : ( head version ) ->>>>>>> main ); export const CollectionName = connect((state: RootState, props: { uuid: string; className?: string }) => { @@ -1494,11 +1044,7 @@ export const ProcessStatus = compose( height: props.theme.spacing.unit * 3, width: props.theme.spacing.unit * 12, ...getProcessStatusStyles(getProcessStatus(props.process), props.theme), -<<<<<<< HEAD - fontSize: '0.875rem', -======= fontSize: "0.875rem", ->>>>>>> main borderRadius: props.theme.spacing.unit * 0.625, }} /> @@ -1509,13 +1055,6 @@ export const ProcessStatus = compose( export const ProcessStartDate = connect((state: RootState, props: { uuid: string }) => { const process = getProcess(props.uuid)(state.resources); -<<<<<<< HEAD - return { date: process && process.container ? process.container.startedAt : '' }; -})((props: { date: string }) => renderDate(props.date)); - -export const renderRunTime = (time: number) => ( - -======= return { date: process && process.container ? process.container.startedAt : "" }; })((props: { date: string }) => renderDate(props.date)); @@ -1524,7 +1063,6 @@ export const renderRunTime = (time: number) => ( noWrap style={{ minWidth: "45px" }} > ->>>>>>> main {formatTime(time, true)} ); -- 2.30.2