[ARVADOS-WORKBENCH2] updated: 1.2.1-1066-g60e8ad5
Git user
git at public.curoverse.com
Mon Dec 3 07:01:32 EST 2018
Summary of changes:
src/store/advanced-tab/advanced-tab.ts | 125 ++++++++++++++++-----
src/store/auth/auth-action.ts | 4 +-
src/store/context-menu/context-menu-actions.ts | 15 +--
src/store/repositories/repositories-actions.ts | 4 +-
.../virtual-machines/virtual-machines-actions.ts | 4 +-
.../action-sets/repository-action-set.ts | 6 +-
.../context-menu/action-sets/ssh-key-action-set.ts | 8 +-
.../action-sets/virtual-machine-action-set.ts | 8 +-
.../virtual-machines-dialog/attributes-dialog.tsx | 8 +-
.../repositories-panel/repositories-panel.tsx | 8 +-
src/views/ssh-key-panel/ssh-key-panel-root.tsx | 4 +-
src/views/ssh-key-panel/ssh-key-panel.tsx | 4 +-
.../virtual-machine-panel.tsx | 10 +-
13 files changed, 138 insertions(+), 70 deletions(-)
via 60e8ad5f90108900b4c189f88fbe483e7010432e (commit)
from 9dbb20349af9d1fa275e01147c53242d3b4680f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 60e8ad5f90108900b4c189f88fbe483e7010432e
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Dec 3 13:01:15 2018 +0100
cr changes
Feature #14498
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/advanced-tab/advanced-tab.ts b/src/store/advanced-tab/advanced-tab.ts
index 2b7e883..fd68eb4 100644
--- a/src/store/advanced-tab/advanced-tab.ts
+++ b/src/store/advanced-tab/advanced-tab.ts
@@ -17,13 +17,16 @@ import { FilterBuilder } from '~/services/api/filter-builder';
import { RepositoryResource } from '~/models/repositories';
import { SshKeyResource } from '~/models/ssh-key';
import { VirtualMachinesResource } from '~/models/virtual-machines';
+import { UserResource } from '~/models/user';
+import { ListResults } from '~/services/common-service/common-resource-service';
+import { LinkResource } from '~/models/link';
export const ADVANCED_TAB_DIALOG = 'advancedTabDialog';
interface AdvancedTabDialogData {
apiResponse: any;
- metadata: any;
- user: string;
+ metadata: ListResults<LinkResource> | string;
+ user: UserResource | string;
pythonHeader: string;
pythonExample: string;
cliGetHeader: string;
@@ -64,41 +67,107 @@ enum VirtualMachineData {
CREATED_AT = 'created_at'
}
+enum ResourcePrefix {
+ REPOSITORIES = 'repositories',
+ AUTORIZED_KEYS = 'authorized_keys',
+ VIRTUAL_MACHINES = 'virtual_machines'
+}
+
type AdvanceResourceKind = CollectionData | ProcessData | ProjectData | RepositoryData | SshKeyData | VirtualMachineData;
-type AdvanceResourcePrefix = GroupContentsResourcePrefix | 'repositories' | 'authorized_keys' | 'virtual_machines';
+type AdvanceResourcePrefix = GroupContentsResourcePrefix | ResourcePrefix;
-export const openAdvancedTabDialog = (uuid: string, index?: number) =>
+export const openAdvancedTabDialog = (uuid: string) =>
async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
const kind = extractUuidKind(uuid);
switch (kind) {
case ResourceKind.COLLECTION:
const { data: dataCollection, metadata: metaCollection, user: userCollection } = await dispatch<any>(getDataForAdvancedTab(uuid));
- const advanceDataCollection: AdvancedTabDialogData = advancedTabData(uuid, metaCollection, userCollection, collectionApiResponse, dataCollection, CollectionData.COLLECTION, GroupContentsResourcePrefix.COLLECTION, CollectionData.STORAGE_CLASSES_CONFIRMED, dataCollection.storageClassesConfirmed);
+ const advanceDataCollection: AdvancedTabDialogData = advancedTabData({
+ uuid,
+ metadata: metaCollection,
+ user: userCollection,
+ apiResponseKind: collectionApiResponse,
+ data: dataCollection,
+ resourceKind: CollectionData.COLLECTION,
+ resourcePrefix: GroupContentsResourcePrefix.COLLECTION,
+ resourceKindProperty: CollectionData.STORAGE_CLASSES_CONFIRMED,
+ property: dataCollection.storageClassesConfirmed
+ });
dispatch<any>(initAdvancedTabDialog(advanceDataCollection));
break;
case ResourceKind.PROCESS:
const { data: dataProcess, metadata: metaProcess, user: userProcess } = await dispatch<any>(getDataForAdvancedTab(uuid));
- const advancedDataProcess: AdvancedTabDialogData = advancedTabData(uuid, metaProcess, userProcess, containerRequestApiResponse, dataProcess, ProcessData.CONTAINER_REQUEST, GroupContentsResourcePrefix.PROCESS, ProcessData.OUTPUT_NAME, dataProcess.outputName);
+ const advancedDataProcess: AdvancedTabDialogData = advancedTabData({
+ uuid,
+ metadata: metaProcess,
+ user: userProcess,
+ apiResponseKind: containerRequestApiResponse,
+ data: dataProcess,
+ resourceKind: ProcessData.CONTAINER_REQUEST,
+ resourcePrefix: GroupContentsResourcePrefix.PROCESS,
+ resourceKindProperty: ProcessData.OUTPUT_NAME,
+ property: dataProcess.outputName
+ });
dispatch<any>(initAdvancedTabDialog(advancedDataProcess));
break;
case ResourceKind.PROJECT:
const { data: dataProject, metadata: metaProject, user: userProject } = await dispatch<any>(getDataForAdvancedTab(uuid));
- const advanceDataProject: AdvancedTabDialogData = advancedTabData(uuid, metaProject, userProject, groupRequestApiResponse, dataProject, ProjectData.GROUP, GroupContentsResourcePrefix.PROJECT, ProjectData.DELETE_AT, dataProject.deleteAt);
+ const advanceDataProject: AdvancedTabDialogData = advancedTabData({
+ uuid,
+ metadata: metaProject,
+ user: userProject,
+ apiResponseKind: groupRequestApiResponse,
+ data: dataProject,
+ resourceKind: ProjectData.GROUP,
+ resourcePrefix: GroupContentsResourcePrefix.PROJECT,
+ resourceKindProperty: ProjectData.DELETE_AT,
+ property: dataProject.deleteAt
+ });
dispatch<any>(initAdvancedTabDialog(advanceDataProject));
break;
case ResourceKind.REPOSITORY:
- const dataRepository = getState().repositories.items[index!];
- const advanceDataRepository: AdvancedTabDialogData = advancedTabData(uuid, '', '', repositoryApiResponse, dataRepository, RepositoryData.REPOSITORY, 'repositories', RepositoryData.CREATED_AT, dataRepository.createdAt);
+ const dataRepository = getState().repositories.items.find(it => it.uuid === uuid);
+ const advanceDataRepository: AdvancedTabDialogData = advancedTabData({
+ uuid,
+ metadata: '',
+ user: '',
+ apiResponseKind: repositoryApiResponse,
+ data: dataRepository,
+ resourceKind: RepositoryData.REPOSITORY,
+ resourcePrefix: ResourcePrefix.REPOSITORIES,
+ resourceKindProperty: RepositoryData.CREATED_AT,
+ property: dataRepository!.createdAt
+ });
dispatch<any>(initAdvancedTabDialog(advanceDataRepository));
break;
case ResourceKind.SSH_KEY:
- const dataSshKey = getState().auth.sshKeys[index!];
- const advanceDataSshKey: AdvancedTabDialogData = advancedTabData(uuid, '', '', sshKeyApiResponse, dataSshKey, SshKeyData.SSH_KEY, 'authorized_keys', SshKeyData.CREATED_AT, dataSshKey.createdAt);
+ const dataSshKey = getState().auth.sshKeys.find(it => it.uuid === uuid);
+ const advanceDataSshKey: AdvancedTabDialogData = advancedTabData({
+ uuid,
+ metadata: '',
+ user: '',
+ apiResponseKind: sshKeyApiResponse,
+ data: dataSshKey,
+ resourceKind: SshKeyData.SSH_KEY,
+ resourcePrefix: ResourcePrefix.AUTORIZED_KEYS,
+ resourceKindProperty: SshKeyData.CREATED_AT,
+ property: dataSshKey!.createdAt
+ });
dispatch<any>(initAdvancedTabDialog(advanceDataSshKey));
break;
case ResourceKind.VIRTUAL_MACHINE:
- const dataVirtualMachine = getState().virtualMachines.virtualMachines.items[index!];
- const advanceDataVirtualMachine: AdvancedTabDialogData = advancedTabData(uuid, '', '', virtualMachineApiResponse, dataVirtualMachine, VirtualMachineData.VIRTUAL_MACHINE, 'virtual_machines', VirtualMachineData.CREATED_AT, dataVirtualMachine.createdAt);
+ const dataVirtualMachine = getState().virtualMachines.virtualMachines.items.find(it => it.uuid === uuid);
+ const advanceDataVirtualMachine: AdvancedTabDialogData = advancedTabData({
+ uuid,
+ metadata: '',
+ user: '',
+ apiResponseKind: virtualMachineApiResponse,
+ data: dataVirtualMachine,
+ resourceKind: VirtualMachineData.VIRTUAL_MACHINE,
+ resourcePrefix: ResourcePrefix.VIRTUAL_MACHINES,
+ resourceKindProperty: VirtualMachineData.CREATED_AT,
+ property: dataVirtualMachine.createdAt
+ });
dispatch<any>(initAdvancedTabDialog(advanceDataVirtualMachine));
break;
default:
@@ -121,21 +190,23 @@ const getDataForAdvancedTab = (uuid: string) =>
const initAdvancedTabDialog = (data: AdvancedTabDialogData) => dialogActions.OPEN_DIALOG({ id: ADVANCED_TAB_DIALOG, data });
-const advancedTabData = (uuid: string, metadata: any, user: any, apiResponseKind: any, data: any, resourceKind: AdvanceResourceKind,
- resourcePrefix: AdvanceResourcePrefix, resourceKindProperty: AdvanceResourceKind, property: any) => {
+const advancedTabData = (args: {
+ uuid: string, metadata: ListResults<LinkResource> | string, user: UserResource | string, apiResponseKind: any, data: any, resourceKind: AdvanceResourceKind,
+ resourcePrefix: AdvanceResourcePrefix, resourceKindProperty: AdvanceResourceKind, property: any
+}) => {
return {
- uuid,
- user,
- metadata,
- apiResponse: apiResponseKind(data),
- pythonHeader: pythonHeader(resourceKind),
- pythonExample: pythonExample(uuid, resourcePrefix),
- cliGetHeader: cliGetHeader(resourceKind),
- cliGetExample: cliGetExample(uuid, resourceKind),
- cliUpdateHeader: cliUpdateHeader(resourceKind, resourceKindProperty),
- cliUpdateExample: cliUpdateExample(uuid, resourceKind, property, resourceKindProperty),
- curlHeader: curlHeader(resourceKind, resourceKindProperty),
- curlExample: curlExample(uuid, resourcePrefix, property, resourceKind, resourceKindProperty),
+ uuid: args.uuid,
+ user: args.user,
+ metadata: args.metadata,
+ apiResponse: args.apiResponseKind(args.data),
+ pythonHeader: pythonHeader(args.resourceKind),
+ pythonExample: pythonExample(args.uuid, args.resourcePrefix),
+ cliGetHeader: cliGetHeader(args.resourceKind),
+ cliGetExample: cliGetExample(args.uuid, args.resourceKind),
+ cliUpdateHeader: cliUpdateHeader(args.resourceKind, args.resourceKindProperty),
+ cliUpdateExample: cliUpdateExample(args.uuid, args.resourceKind, args.property, args.resourceKindProperty),
+ curlHeader: curlHeader(args.resourceKind, args.resourceKindProperty),
+ curlExample: curlExample(args.uuid, args.resourcePrefix, args.property, args.resourceKind, args.resourceKindProperty),
};
};
diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index 28559b1..e1b36f8 100644
--- a/src/store/auth/auth-action.ts
+++ b/src/store/auth/auth-action.ts
@@ -94,9 +94,9 @@ export const openSshKeyCreateDialog = () => dialogActions.OPEN_DIALOG({ id: SSH_
export const openPublicKeyDialog = (name: string, publicKey: string) =>
dialogActions.OPEN_DIALOG({ id: SSH_KEY_PUBLIC_KEY_DIALOG, data: { name, publicKey } });
-export const openSshKeyAttributesDialog = (index: number) =>
+export const openSshKeyAttributesDialog = (uuid: string) =>
(dispatch: Dispatch, getState: () => RootState) => {
- const sshKey = getState().auth.sshKeys[index];
+ const sshKey = getState().auth.sshKeys.find(it => it.uuid === uuid);
dispatch(dialogActions.OPEN_DIALOG({ id: SSH_KEY_ATTRIBUTES_DIALOG, data: { sshKey } }));
};
diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts
index 0dbae18..1412d95 100644
--- a/src/store/context-menu/context-menu-actions.ts
+++ b/src/store/context-menu/context-menu-actions.ts
@@ -63,39 +63,36 @@ export const openCollectionFilesContextMenu = (event: React.MouseEvent<HTMLEleme
}));
};
-export const openRepositoryContextMenu = (event: React.MouseEvent<HTMLElement>, index: number, repository: RepositoryResource) =>
+export const openRepositoryContextMenu = (event: React.MouseEvent<HTMLElement>, repository: RepositoryResource) =>
(dispatch: Dispatch, getState: () => RootState) => {
dispatch<any>(openContextMenu(event, {
name: '',
uuid: repository.uuid,
ownerUuid: repository.ownerUuid,
kind: ResourceKind.REPOSITORY,
- menuKind: ContextMenuKind.REPOSITORY,
- index
+ menuKind: ContextMenuKind.REPOSITORY
}));
};
-export const openVirtualMachinesContextMenu = (event: React.MouseEvent<HTMLElement>, index: number, repository: VirtualMachinesResource) =>
+export const openVirtualMachinesContextMenu = (event: React.MouseEvent<HTMLElement>, repository: VirtualMachinesResource) =>
(dispatch: Dispatch, getState: () => RootState) => {
dispatch<any>(openContextMenu(event, {
name: '',
uuid: repository.uuid,
ownerUuid: repository.ownerUuid,
kind: ResourceKind.VIRTUAL_MACHINE,
- menuKind: ContextMenuKind.VIRTUAL_MACHINE,
- index
+ menuKind: ContextMenuKind.VIRTUAL_MACHINE
}));
};
-export const openSshKeyContextMenu = (event: React.MouseEvent<HTMLElement>, index: number, sshKey: SshKeyResource) =>
+export const openSshKeyContextMenu = (event: React.MouseEvent<HTMLElement>, sshKey: SshKeyResource) =>
(dispatch: Dispatch) => {
dispatch<any>(openContextMenu(event, {
name: '',
uuid: sshKey.uuid,
ownerUuid: sshKey.ownerUuid,
kind: ResourceKind.SSH_KEY,
- menuKind: ContextMenuKind.SSH_KEY,
- index
+ menuKind: ContextMenuKind.SSH_KEY
}));
};
diff --git a/src/store/repositories/repositories-actions.ts b/src/store/repositories/repositories-actions.ts
index d617289..61caa76 100644
--- a/src/store/repositories/repositories-actions.ts
+++ b/src/store/repositories/repositories-actions.ts
@@ -32,9 +32,9 @@ export const openRepositoriesSampleGitDialog = () =>
dispatch(dialogActions.OPEN_DIALOG({ id: REPOSITORIES_SAMPLE_GIT_DIALOG, data: { uuidPrefix } }));
};
-export const openRepositoryAttributes = (index: number) =>
+export const openRepositoryAttributes = (uuid: string) =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const repositoryData = getState().repositories.items[index];
+ const repositoryData = getState().repositories.items.find(it => it.uuid === uuid);
dispatch(dialogActions.OPEN_DIALOG({ id: REPOSITORY_ATTRIBUTES_DIALOG, data: { repositoryData } }));
};
diff --git a/src/store/virtual-machines/virtual-machines-actions.ts b/src/store/virtual-machines/virtual-machines-actions.ts
index d87433f..c95277b 100644
--- a/src/store/virtual-machines/virtual-machines-actions.ts
+++ b/src/store/virtual-machines/virtual-machines-actions.ts
@@ -33,9 +33,9 @@ export const openVirtualMachines = () =>
dispatch<any>(navigateToVirtualMachines);
};
-export const openVirtualMachineAttributes = (index: number) =>
+export const openVirtualMachineAttributes = (uuid: string) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const virtualMachineData = getState().virtualMachines.virtualMachines.items[index];
+ const virtualMachineData = getState().virtualMachines.virtualMachines.items.find(it => it.uuid === uuid);
dispatch(dialogActions.OPEN_DIALOG({ id: VIRTUAL_MACHINE_ATTRIBUTES_DIALOG, data: { virtualMachineData } }));
};
diff --git a/src/views-components/context-menu/action-sets/repository-action-set.ts b/src/views-components/context-menu/action-sets/repository-action-set.ts
index 22f6bee..82c2f2b 100644
--- a/src/views-components/context-menu/action-sets/repository-action-set.ts
+++ b/src/views-components/context-menu/action-sets/repository-action-set.ts
@@ -11,8 +11,8 @@ import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions
export const repositoryActionSet: ContextMenuActionSet = [[{
name: "Attributes",
icon: AttributesIcon,
- execute: (dispatch, { index }) => {
- dispatch<any>(openRepositoryAttributes(index!));
+ execute: (dispatch, { uuid }) => {
+ dispatch<any>(openRepositoryAttributes(uuid));
}
}, {
name: "Share",
@@ -24,7 +24,7 @@ export const repositoryActionSet: ContextMenuActionSet = [[{
name: "Advanced",
icon: AdvancedIcon,
execute: (dispatch, resource) => {
- dispatch<any>(openAdvancedTabDialog(resource.uuid, resource.index));
+ dispatch<any>(openAdvancedTabDialog(resource.uuid));
}
}, {
name: "Remove",
diff --git a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
index 6e86b2b..0ce0c43 100644
--- a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
+++ b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
@@ -10,14 +10,14 @@ import { openAdvancedTabDialog } from '~/store/advanced-tab/advanced-tab';
export const sshKeyActionSet: ContextMenuActionSet = [[{
name: "Attributes",
icon: AttributesIcon,
- execute: (dispatch, { index }) => {
- dispatch<any>(openSshKeyAttributesDialog(index!));
+ execute: (dispatch, { uuid }) => {
+ dispatch<any>(openSshKeyAttributesDialog(uuid));
}
}, {
name: "Advanced",
icon: AdvancedIcon,
- execute: (dispatch, { uuid, index }) => {
- dispatch<any>(openAdvancedTabDialog(uuid, index));
+ execute: (dispatch, { uuid }) => {
+ dispatch<any>(openAdvancedTabDialog(uuid));
}
}, {
name: "Remove",
diff --git a/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts b/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
index bb04b8c..ea274af 100644
--- a/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
+++ b/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
@@ -10,14 +10,14 @@ import { openVirtualMachineAttributes, openRemoveVirtualMachineDialog } from "~/
export const virtualMachineActionSet: ContextMenuActionSet = [[{
name: "Attributes",
icon: AttributesIcon,
- execute: (dispatch, { index }) => {
- dispatch<any>(openVirtualMachineAttributes(index!));
+ execute: (dispatch, { uuid }) => {
+ dispatch<any>(openVirtualMachineAttributes(uuid));
}
}, {
name: "Advanced",
icon: AdvancedIcon,
- execute: (dispatch, { uuid, index }) => {
- dispatch<any>(openAdvancedTabDialog(uuid, index));
+ execute: (dispatch, { uuid }) => {
+ dispatch<any>(openAdvancedTabDialog(uuid));
}
}, {
name: "Remove",
diff --git a/src/views-components/virtual-machines-dialog/attributes-dialog.tsx b/src/views-components/virtual-machines-dialog/attributes-dialog.tsx
index 78b58da..05c1b0a 100644
--- a/src/views-components/virtual-machines-dialog/attributes-dialog.tsx
+++ b/src/views-components/virtual-machines-dialog/attributes-dialog.tsx
@@ -7,14 +7,14 @@ import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Typography,
import { WithDialogProps } from "~/store/dialog/with-dialog";
import { withDialog } from '~/store/dialog/with-dialog';
import { VIRTUAL_MACHINE_ATTRIBUTES_DIALOG } from "~/store/virtual-machines/virtual-machines-actions";
-import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
+import { WithStyles, withStyles } from '@material-ui/core/styles';
import { ArvadosTheme } from '~/common/custom-theme';
import { compose } from "redux";
import { VirtualMachinesResource } from "~/models/virtual-machines";
type CssRules = 'rightContainer' | 'leftContainer' | 'spacing';
-const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+const styles = withStyles<CssRules>((theme: ArvadosTheme) => ({
rightContainer: {
textAlign: 'right',
paddingRight: theme.spacing.unit * 2,
@@ -27,7 +27,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
spacing: {
paddingTop: theme.spacing.unit * 2
},
-});
+}));
interface VirtualMachineAttributesDataProps {
virtualMachineData: VirtualMachinesResource;
@@ -37,7 +37,7 @@ type VirtualMachineAttributesProps = VirtualMachineAttributesDataProps & WithSty
export const VirtualMachineAttributesDialog = compose(
withDialog(VIRTUAL_MACHINE_ATTRIBUTES_DIALOG),
- withStyles(styles))(
+ styles)(
(props: WithDialogProps<VirtualMachineAttributesProps> & VirtualMachineAttributesProps) =>
<Dialog open={props.open}
onClose={props.closeDialog}
diff --git a/src/views/repositories-panel/repositories-panel.tsx b/src/views/repositories-panel/repositories-panel.tsx
index cfe59f0..c7016f6 100644
--- a/src/views/repositories-panel/repositories-panel.tsx
+++ b/src/views/repositories-panel/repositories-panel.tsx
@@ -66,8 +66,8 @@ const mapStateToProps = (state: RootState) => {
const mapDispatchToProps = (dispatch: Dispatch): Pick<RepositoriesActionProps, 'onOptionsMenuOpen' | 'loadRepositories' | 'openRepositoriesSampleGitDialog' | 'openRepositoryCreateDialog'> => ({
loadRepositories: () => dispatch<any>(loadRepositoriesData()),
- onOptionsMenuOpen: (event, index, repository) => {
- dispatch<any>(openRepositoryContextMenu(event, index, repository));
+ onOptionsMenuOpen: (event, repository) => {
+ dispatch<any>(openRepositoryContextMenu(event, repository));
},
openRepositoriesSampleGitDialog: () => dispatch<any>(openRepositoriesSampleGitDialog()),
openRepositoryCreateDialog: () => dispatch<any>(openRepositoryCreateDialog())
@@ -75,7 +75,7 @@ const mapDispatchToProps = (dispatch: Dispatch): Pick<RepositoriesActionProps, '
interface RepositoriesActionProps {
loadRepositories: () => void;
- onOptionsMenuOpen: (event: React.MouseEvent<HTMLElement>, index: number, repository: RepositoryResource) => void;
+ onOptionsMenuOpen: (event: React.MouseEvent<HTMLElement>, repository: RepositoryResource) => void;
openRepositoriesSampleGitDialog: () => void;
openRepositoryCreateDialog: () => void;
}
@@ -137,7 +137,7 @@ export const RepositoriesPanel = compose(
<TableCell className={classes.cloneUrls}>{repository.cloneUrls.join("\n")}</TableCell>
<TableCell className={classes.moreOptions}>
<Tooltip title="More options" disableFocusListener>
- <IconButton onClick={event => onOptionsMenuOpen(event, index, repository)} className={classes.moreOptionsButton}>
+ <IconButton onClick={event => onOptionsMenuOpen(event, repository)} className={classes.moreOptionsButton}>
<MoreOptionsIcon />
</IconButton>
</Tooltip>
diff --git a/src/views/ssh-key-panel/ssh-key-panel-root.tsx b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
index 869662d..2cdad07 100644
--- a/src/views/ssh-key-panel/ssh-key-panel-root.tsx
+++ b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
@@ -38,7 +38,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
export interface SshKeyPanelRootActionProps {
openSshKeyCreateDialog: () => void;
- openRowOptions: (event: React.MouseEvent<HTMLElement>, index: number, sshKey: SshKeyResource) => void;
+ openRowOptions: (event: React.MouseEvent<HTMLElement>, sshKey: SshKeyResource) => void;
openPublicKeyDialog: (name: string, publicKey: string) => void;
}
@@ -102,7 +102,7 @@ export const SshKeyPanelRoot = withStyles(styles)(
</TableCell>
<TableCell>
<Tooltip title="More options" disableFocusListener>
- <IconButton onClick={event => openRowOptions(event, index, sshKey)}>
+ <IconButton onClick={event => openRowOptions(event, sshKey)}>
<MoreOptionsIcon />
</IconButton>
</Tooltip>
diff --git a/src/views/ssh-key-panel/ssh-key-panel.tsx b/src/views/ssh-key-panel/ssh-key-panel.tsx
index c7e3516..4e80029 100644
--- a/src/views/ssh-key-panel/ssh-key-panel.tsx
+++ b/src/views/ssh-key-panel/ssh-key-panel.tsx
@@ -20,8 +20,8 @@ const mapDispatchToProps = (dispatch: Dispatch): SshKeyPanelRootActionProps => (
openSshKeyCreateDialog: () => {
dispatch<any>(openSshKeyCreateDialog());
},
- openRowOptions: (event, index, sshKey) => {
- dispatch<any>(openSshKeyContextMenu(event, index, sshKey));
+ openRowOptions: (event, sshKey) => {
+ dispatch<any>(openSshKeyContextMenu(event, sshKey));
},
openPublicKeyDialog: (name: string, publicKey: string) => {
dispatch<any>(openPublicKeyDialog(name, publicKey));
diff --git a/src/views/virtual-machine-panel/virtual-machine-panel.tsx b/src/views/virtual-machine-panel/virtual-machine-panel.tsx
index de5e33a..5dbd3f0 100644
--- a/src/views/virtual-machine-panel/virtual-machine-panel.tsx
+++ b/src/views/virtual-machine-panel/virtual-machine-panel.tsx
@@ -13,7 +13,7 @@ import { compose, Dispatch } from 'redux';
import { saveRequestedDate, loadVirtualMachinesData } from '~/store/virtual-machines/virtual-machines-actions';
import { RootState } from '~/store/store';
import { ListResults } from '~/services/common-service/common-resource-service';
-import { HelpIcon, MoreOptionsIcon, AddIcon } from '~/components/icon/icon';
+import { HelpIcon, MoreOptionsIcon } from '~/components/icon/icon';
import { VirtualMachineLogins, VirtualMachinesResource } from '~/models/virtual-machines';
import { Routes } from '~/routes/routes';
import { openVirtualMachinesContextMenu } from '~/store/context-menu/context-menu-actions';
@@ -80,8 +80,8 @@ const mapStateToProps = ({ virtualMachines, auth }: RootState) => {
const mapDispatchToProps = (dispatch: Dispatch): Pick<VirtualMachinesPanelActionProps, 'loadVirtualMachinesData' | 'saveRequestedDate' | 'onOptionsMenuOpen'> => ({
saveRequestedDate: () => dispatch<any>(saveRequestedDate()),
loadVirtualMachinesData: () => dispatch<any>(loadVirtualMachinesData()),
- onOptionsMenuOpen: (event, index, virtualMachine) => {
- dispatch<any>(openVirtualMachinesContextMenu(event, index, virtualMachine));
+ onOptionsMenuOpen: (event, virtualMachine) => {
+ dispatch<any>(openVirtualMachinesContextMenu(event, virtualMachine));
},
});
@@ -96,7 +96,7 @@ interface VirtualMachinesPanelDataProps {
interface VirtualMachinesPanelActionProps {
saveRequestedDate: () => void;
loadVirtualMachinesData: () => string;
- onOptionsMenuOpen: (event: React.MouseEvent<HTMLElement>, index: number, virtualMachine: VirtualMachinesResource) => void;
+ onOptionsMenuOpen: (event: React.MouseEvent<HTMLElement>, virtualMachine: VirtualMachinesResource) => void;
}
type VirtualMachineProps = VirtualMachinesPanelActionProps & VirtualMachinesPanelDataProps & WithStyles<CssRules>;
@@ -217,7 +217,7 @@ const adminVirtualMachinesTable = (props: VirtualMachineProps) =>
<TableCell>["{props.logins.items[0].username}"]</TableCell>
<TableCell className={props.classes.moreOptions}>
<Tooltip title="More options" disableFocusListener>
- <IconButton onClick={event => props.onOptionsMenuOpen(event, index, it)} className={props.classes.moreOptionsButton}>
+ <IconButton onClick={event => props.onOptionsMenuOpen(event, it)} className={props.classes.moreOptionsButton}>
<MoreOptionsIcon />
</IconButton>
</Tooltip>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list