[ARVADOS-WORKBENCH2] created: 2.3.0-52-g91ca19a6
Git user
git at public.arvados.org
Wed Dec 15 21:32:42 UTC 2021
at 91ca19a62e24074f9e3ef02dfc4edb78e5233609 (commit)
commit 91ca19a62e24074f9e3ef02dfc4edb78e5233609
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Wed Dec 15 18:03:04 2021 -0300
18219: Updates cypress tests.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index eb06a06c..d27f32df 100644
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -85,6 +85,17 @@ describe('Collection panel tests', function () {
cy.loginAs(activeUser);
cy.goToPath(`/collections/${this.testCollection.uuid}`);
+ cy.get('[data-cy=collection-info-panel')
+ .should('contain', this.testCollection.name)
+ .and('not.contain', 'Color: Magenta')
+ .and('not.contain', 'Size: S');
+ cy.get('[data-cy=additional-info-icon]').click();
+
+ cy.get('[data-cy=details-panel]').within(() => {
+ cy.get('[data-cy=property-editor-btn]').click();
+ });
+ cy.get('[data-cy=resource-properties-dialog').contains('Edit properties');
+
// Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3)
cy.get('[data-cy=resource-properties-form]').within(() => {
cy.get('[data-cy=property-field-key]').within(() => {
@@ -96,7 +107,7 @@ describe('Collection panel tests', function () {
cy.root().submit();
});
// Confirm proper vocabulary labels are displayed on the UI.
- cy.get('[data-cy=collection-properties-panel]')
+ cy.get('[data-cy=resource-properties-dialog]')
.should('contain', 'Color: Magenta');
// Confirm proper vocabulary IDs were saved on the backend.
cy.doRequest('GET', `/arvados/v1/collections/${this.testCollection.uuid}`)
@@ -120,7 +131,7 @@ describe('Collection panel tests', function () {
cy.root().submit();
});
// Confirm proper vocabulary labels are displayed on the UI.
- cy.get('[data-cy=collection-properties-panel]')
+ cy.get('[data-cy=resource-properties-dialog]')
.should('contain', 'Size: S');
// Confirm proper vocabulary IDs were saved on the backend.
cy.doRequest('GET', `/arvados/v1/collections/${this.testCollection.uuid}`)
@@ -128,6 +139,15 @@ describe('Collection panel tests', function () {
.then(function () {
expect(this.collection.properties.IDTAGSIZES).to.equal('IDVALSIZES2');
});
+
+ // Close property editor & confirm properties display on the UI.
+ cy.get('[data-cy=resource-properties-dialog]').within(() => {
+ cy.get('[data-cy=close-dialog-btn]').click();
+ });
+ cy.get('[data-cy=collection-info-panel')
+ .should('contain', this.testCollection.name)
+ .and('contain', 'Color: Magenta')
+ .and('contain', 'Size: S');
});
});
@@ -186,29 +206,9 @@ describe('Collection panel tests', function () {
.should('contain', 'Add to favorites')
.and(`${isWritable ? '' : 'not.'}contain`, 'Edit collection');
cy.get('body').click(); // Collapse the menu avoiding details panel expansion
- cy.get('[data-cy=collection-properties-panel]')
- .should('contain', 'someKey')
- .and('contain', 'someValue')
- .and('not.contain', 'anotherKey')
- .and('not.contain', 'anotherValue')
- if (isWritable === true) {
- // Check that properties can be added.
- cy.get('[data-cy=resource-properties-form]').within(() => {
- cy.get('[data-cy=property-field-key]').within(() => {
- cy.get('input').type('anotherKey');
- });
- cy.get('[data-cy=property-field-value]').within(() => {
- cy.get('input').type('anotherValue');
- });
- cy.root().submit();
- })
- cy.get('[data-cy=collection-properties-panel]')
- .should('contain', 'anotherKey')
- .and('contain', 'anotherValue')
- } else {
- // Properties form shouldn't be displayed.
- cy.get('[data-cy=resource-properties-form]').should('not.exist');
- }
+ cy.get('[data-cy=collection-info-panel]')
+ .should('contain', 'someKey: someValue')
+ .and('not.contain', 'anotherKey: anotherValue');
// Check that the file listing show both read & write operations
cy.get('[data-cy=collection-files-panel]').within(() => {
cy.wait(1000);
@@ -313,63 +313,6 @@ describe('Collection panel tests', function () {
});
});
- it.skip('renames a file to a different directory', function () {
- // Creates the collection using the admin token so we can set up
- // a bogus manifest text without block signatures.
- cy.createCollection(adminUser.token, {
- name: `Test collection ${Math.floor(Math.random() * 999999)}`,
- owner_uuid: activeUser.user.uuid,
- manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
- })
- .as('testCollection').then(function () {
- cy.loginAs(activeUser);
- cy.goToPath(`/collections/${this.testCollection.uuid}`);
-
- ['subdir', 'G%C3%BCnter\'s%20file', 'table%&?*2'].forEach((subdir) => {
- cy.get('[data-cy=collection-files-panel]')
- .contains('bar').rightclick({force: true});
- cy.get('[data-cy=context-menu]')
- .contains('Rename')
- .click();
- cy.get('[data-cy=form-dialog]')
- .should('contain', 'Rename')
- .within(() => {
- cy.get('input').type(`{selectall}{backspace}${subdir}/foo`);
- });
- cy.get('[data-cy=form-submit-btn]').click();
- cy.get('[data-cy=collection-files-panel]')
- .should('not.contain', 'bar')
- .and('contain', subdir);
- // Look for the "arrow icon" and expand the "subdir" directory.
- cy.get('[data-cy=virtual-file-tree] > div > i').click();
- // Rename 'subdir/foo' to 'foo'
- cy.get('[data-cy=collection-files-panel]')
- .contains('foo').rightclick();
- cy.get('[data-cy=context-menu]')
- .contains('Rename')
- .click();
- cy.get('[data-cy=form-dialog]')
- .should('contain', 'Rename')
- .within(() => {
- cy.get('input')
- .should('have.value', `${subdir}/foo`)
- .type(`{selectall}{backspace}bar`);
- });
- cy.get('[data-cy=form-submit-btn]').click();
- cy.get('[data-cy=collection-files-panel]')
- .should('contain', subdir) // empty dir kept
- .and('contain', 'bar');
-
- cy.get('[data-cy=collection-files-panel]')
- .contains(subdir).rightclick();
- cy.get('[data-cy=context-menu]')
- .contains('Remove')
- .click();
- cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
- });
- });
- });
-
it('renames a file to a different directory', function () {
// Creates the collection using the admin token so we can set up
// a bogus manifest text without block signatures.
diff --git a/cypress/integration/project.spec.js b/cypress/integration/project.spec.js
index 1c175952..3d5e578e 100644
--- a/cypress/integration/project.spec.js
+++ b/cypress/integration/project.spec.js
@@ -28,7 +28,7 @@ describe('Project tests', function() {
cy.clearLocalStorage();
});
- it('adds creates a new project with properties', function() {
+ it('creates a new project with properties', function() {
const projName = `Test project (${Math.floor(999999 * Math.random())})`;
cy.loginAs(activeUser);
cy.get('[data-cy=side-panel-button]').click();
diff --git a/src/views-components/details-panel/details-panel.tsx b/src/views-components/details-panel/details-panel.tsx
index 058db81b..399f4ef4 100644
--- a/src/views-components/details-panel/details-panel.tsx
+++ b/src/views-components/details-panel/details-panel.tsx
@@ -160,6 +160,7 @@ export const DetailsPanel = withStyles(styles)(
const item = getItem(res);
return <Grid
+ data-cy='details-panel'
container
direction="column"
item
diff --git a/src/views-components/resource-properties-dialog/resource-properties-dialog.tsx b/src/views-components/resource-properties-dialog/resource-properties-dialog.tsx
index b634715f..2502f50a 100644
--- a/src/views-components/resource-properties-dialog/resource-properties-dialog.tsx
+++ b/src/views-components/resource-properties-dialog/resource-properties-dialog.tsx
@@ -60,6 +60,7 @@ export const ResourcePropertiesDialog = connect(mapStateToProps, mapDispatchToPr
onClose={closeDialog}
fullWidth
maxWidth='sm'>
+ <div data-cy='resource-properties-dialog'>
<DialogTitle>Edit properties</DialogTitle>
<DialogContent>
<ResourcePropertiesDialogForm uuid={resource ? resource.uuid : ''} />
@@ -80,12 +81,14 @@ export const ResourcePropertiesDialog = connect(mapStateToProps, mapDispatchToPr
</DialogContent>
<DialogActions>
<Button
+ data-cy='close-dialog-btn'
variant='text'
color='primary'
onClick={closeDialog}>
Close
</Button>
</DialogActions>
+ </div>
</Dialog>
)
));
diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx
index 5aeaef18..adc3e995 100644
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@ -345,7 +345,7 @@ export const CollectionDetailsAttributes = connect(null, mapDispatchToProps)(
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
label='Properties'>
{ !props.twoCol
- ? <div onClick={props.onClick}>
+ ? <div data-cy='property-editor-btn' onClick={props.onClick}>
<RenameIcon className={classes.editIcon} />
</div>
: '' }
commit 454b7e471069c8052027482d6d8370f1e89c0d6a
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Wed Dec 15 16:31:32 2021 -0300
18219: Replaces properties form on collection panel.
* Removes properties form subpanel from the main collection panel.
* Adds property chips to collection's info & details panel.
* Allows property editing from the details panel.
* Replaces resource-specific property form components with a generic one.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/store/collection-panel/collection-panel-action.ts b/src/store/collection-panel/collection-panel-action.ts
index ee476524..c50ff6a8 100644
--- a/src/store/collection-panel/collection-panel-action.ts
+++ b/src/store/collection-panel/collection-panel-action.ts
@@ -9,15 +9,12 @@ import {
import { CollectionResource } from 'models/collection';
import { RootState } from "store/store";
import { ServiceRepository } from "services/services";
-import { TagProperty } from "models/tag";
import { snackbarActions } from "../snackbar/snackbar-actions";
import { resourcesActions } from "store/resources/resources-actions";
import { unionize, ofType, UnionOf } from 'common/unionize';
import { SnackbarKind } from 'store/snackbar/snackbar-actions';
import { navigateTo } from 'store/navigation/navigation-action';
import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
-import { addProperty, deleteProperty } from "lib/resource-properties";
-import { getResource } from "store/resources/resources";
export const collectionPanelActions = unionize({
SET_COLLECTION: ofType<CollectionResource>(),
@@ -27,8 +24,6 @@ export const collectionPanelActions = unionize({
export type CollectionPanelAction = UnionOf<typeof collectionPanelActions>;
-export const COLLECTION_TAG_FORM_NAME = 'collectionTagForm';
-
export const loadCollectionPanel = (uuid: string, forceReload = false) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const { collectionPanel: { item } } = getState();
@@ -44,37 +39,6 @@ export const loadCollectionPanel = (uuid: string, forceReload = false) =>
return collection;
};
-export const createCollectionTag = (data: TagProperty) =>
- (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const item = getState().collectionPanel.item;
- if (!item) { return; }
-
- const properties = Object.assign({}, item.properties);
- const key = data.keyID || data.key;
- const value = data.valueID || data.value;
- const cachedCollection = getResource<CollectionResource>(item.uuid)(getState().resources);
- services.collectionService.update(
- item.uuid, {
- properties: addProperty(properties, key, value)
- }
- ).then(updatedCollection => {
- updatedCollection = {...cachedCollection, ...updatedCollection};
- dispatch(collectionPanelActions.SET_COLLECTION(updatedCollection));
- dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
- dispatch(snackbarActions.OPEN_SNACKBAR({
- message: "Property has been successfully added.",
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS }));
- dispatch<any>(loadDetailsPanel(updatedCollection.uuid));
- return updatedCollection;
- }).catch (e =>
- dispatch(snackbarActions.OPEN_SNACKBAR({
- message: e.errors[0],
- hideDuration: 2000,
- kind: SnackbarKind.ERROR }))
- );
- };
-
export const navigateToProcess = (uuid: string) =>
async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
try {
@@ -84,29 +48,3 @@ export const navigateToProcess = (uuid: string) =>
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This process does not exist!', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
};
-
-export const deleteCollectionTag = (key: string, value: string) =>
- (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const item = getState().collectionPanel.item;
- if (!item) { return; }
-
- const properties = Object.assign({}, item.properties);
- const cachedCollection = getResource<CollectionResource>(item.uuid)(getState().resources);
- services.collectionService.update(
- item.uuid, {
- properties: deleteProperty(properties, key, value)
- }
- ).then(updatedCollection => {
- updatedCollection = {...cachedCollection, ...updatedCollection};
- dispatch(collectionPanelActions.SET_COLLECTION(updatedCollection));
- dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully deleted.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
- dispatch<any>(loadDetailsPanel(updatedCollection.uuid));
- return updatedCollection;
- }).catch (e => {
- dispatch(snackbarActions.OPEN_SNACKBAR({
- message: e.errors[0],
- hideDuration: 2000,
- kind: SnackbarKind.ERROR }));
- });
- };
diff --git a/src/store/details-panel/details-panel-action.ts b/src/store/details-panel/details-panel-action.ts
index bda35441..90ca0f4f 100644
--- a/src/store/details-panel/details-panel-action.ts
+++ b/src/store/details-panel/details-panel-action.ts
@@ -7,13 +7,9 @@ import { RootState } from 'store/store';
import { Dispatch } from 'redux';
import { dialogActions } from 'store/dialog/dialog-actions';
import { getResource } from 'store/resources/resources';
-import { ProjectResource } from "models/project";
import { ServiceRepository } from 'services/services';
-import { TagProperty } from 'models/tag';
-import { startSubmit, stopSubmit } from 'redux-form';
import { resourcesActions } from 'store/resources/resources-actions';
import {snackbarActions, SnackbarKind} from 'store/snackbar/snackbar-actions';
-import { addProperty, deleteProperty } from 'lib/resource-properties';
import { FilterBuilder } from 'services/api/filter-builder';
import { OrderBuilder } from 'services/api/order-builder';
import { CollectionResource } from 'models/collection';
@@ -29,8 +25,8 @@ export const detailsPanelActions = unionize({
export type DetailsPanelAction = UnionOf<typeof detailsPanelActions>;
-export const PROJECT_PROPERTIES_FORM_NAME = 'projectPropertiesFormName';
-export const PROJECT_PROPERTIES_DIALOG_NAME = 'projectPropertiesDialogName';
+export const RESOURCE_PROPERTIES_FORM_NAME = 'resourcePropertiesFormName';
+export const RESOURCE_PROPERTIES_DIALOG_NAME = 'resourcePropertiesDialogName';
export const loadDetailsPanel = (uuid: string) =>
(dispatch: Dispatch, getState: () => RootState) => {
@@ -55,9 +51,9 @@ export const openDetailsPanel = (uuid?: string, tabNr: number = 0) =>
}
};
-export const openProjectPropertiesDialog = () =>
+export const openResourcePropertiesDialog = () =>
(dispatch: Dispatch) => {
- dispatch<any>(dialogActions.OPEN_DIALOG({ id: PROJECT_PROPERTIES_DIALOG_NAME, data: { } }));
+ dispatch<any>(dialogActions.OPEN_DIALOG({ id: RESOURCE_PROPERTIES_DIALOG_NAME, data: { } }));
};
export const refreshCollectionVersionsList = (uuid: string) =>
@@ -76,49 +72,6 @@ export const refreshCollectionVersionsList = (uuid: string) =>
);
};
-export const deleteProjectProperty = (key: string, value: string) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const { detailsPanel, resources } = getState();
- const project = getResource(detailsPanel.resourceUuid)(resources) as ProjectResource;
- if (!project) { return; }
-
- const properties = Object.assign({}, project.properties);
-
- try {
- const updatedProject = await services.projectService.update(
- project.uuid, {
- properties: deleteProperty(properties, key, value),
- });
- dispatch(resourcesActions.SET_RESOURCES([updatedProject]));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully deleted.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
- } catch (e) {
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
- }
- };
-
-export const createProjectProperty = (data: TagProperty) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const { detailsPanel, resources } = getState();
- const project = getResource(detailsPanel.resourceUuid)(resources) as ProjectResource;
- if (!project) { return; }
-
- dispatch(startSubmit(PROJECT_PROPERTIES_FORM_NAME));
- try {
- const key = data.keyID || data.key;
- const value = data.valueID || data.value;
- const properties = Object.assign({}, project.properties);
- const updatedProject = await services.projectService.update(
- project.uuid, {
- properties: addProperty(properties, key, value),
- }
- );
- dispatch(resourcesActions.SET_RESOURCES([updatedProject]));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully added.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
- dispatch(stopSubmit(PROJECT_PROPERTIES_FORM_NAME));
- } catch (e) {
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
- }
- };
export const toggleDetailsPanel = () => (dispatch: Dispatch, getState: () => RootState) => {
// because of material-ui issue resizing details panel breaks tabs.
// triggering window resize event fixes that.
diff --git a/src/store/resources/resources-actions.ts b/src/store/resources/resources-actions.ts
index cdb76e0b..8bd12e5f 100644
--- a/src/store/resources/resources-actions.ts
+++ b/src/store/resources/resources-actions.ts
@@ -3,11 +3,15 @@
// SPDX-License-Identifier: AGPL-3.0
import { unionize, ofType, UnionOf } from 'common/unionize';
-import { extractUuidKind, Resource } from 'models/resource';
+import { extractUuidKind, Resource, ResourceWithProperties } from 'models/resource';
import { Dispatch } from 'redux';
import { RootState } from 'store/store';
import { ServiceRepository } from 'services/services';
import { getResourceService } from 'services/services';
+import { addProperty, deleteProperty } from 'lib/resource-properties';
+import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
+import { getResource } from './resources';
+import { TagProperty } from 'models/tag';
export const resourcesActions = unionize({
SET_RESOURCES: ofType<Resource[]>(),
@@ -31,3 +35,59 @@ export const loadResource = (uuid: string, showErrors?: boolean) =>
} catch {}
return undefined;
};
+
+export const deleteResourceProperty = (uuid: string, key: string, value: string) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const { resources } = getState();
+
+ const rsc = getResource(uuid)(resources) as ResourceWithProperties;
+ if (!rsc) { return; }
+
+ const kind = extractUuidKind(uuid);
+ const service = getResourceService(kind)(services);
+ if (!service) { return; }
+
+ const properties = Object.assign({}, rsc.properties);
+
+ try {
+ let updatedRsc = await service.update(
+ uuid, {
+ properties: deleteProperty(properties, key, value),
+ });
+ updatedRsc = {...rsc, ...updatedRsc};
+ dispatch<any>(updateResources([updatedRsc]));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully deleted.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
+ } catch (e) {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
+ }
+ };
+
+export const createResourceProperty = (data: TagProperty) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const { uuid } = data;
+ const { resources } = getState();
+
+ const rsc = getResource(uuid)(resources) as ResourceWithProperties;
+ if (!rsc) { return; }
+
+ const kind = extractUuidKind(uuid);
+ const service = getResourceService(kind)(services);
+ if (!service) { return; }
+
+ try {
+ const key = data.keyID || data.key;
+ const value = data.valueID || data.value;
+ const properties = Object.assign({}, rsc.properties);
+ let updatedRsc = await service.update(
+ rsc.uuid, {
+ properties: addProperty(properties, key, value),
+ }
+ );
+ updatedRsc = {...rsc, ...updatedRsc};
+ dispatch<any>(updateResources([updatedRsc]));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully added.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
+ } catch (e) {
+ const errorMsg = e.errors && e.errors.length > 0 ? e.errors[0] : "Error while adding property";
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: errorMsg, hideDuration: 2000, kind: SnackbarKind.ERROR }));
+ }
+ };
diff --git a/src/views-components/details-panel/project-details.tsx b/src/views-components/details-panel/project-details.tsx
index 41ba6f00..82e3e754 100644
--- a/src/views-components/details-panel/project-details.tsx
+++ b/src/views-components/details-panel/project-details.tsx
@@ -4,7 +4,7 @@
import React from 'react';
import { connect } from 'react-redux';
-import { openProjectPropertiesDialog } from 'store/details-panel/details-panel-action';
+import { openResourcePropertiesDialog } from 'store/details-panel/details-panel-action';
import { ProjectIcon, RenameIcon, FilterGroupIcon } from 'components/icon/icon';
import { ProjectResource } from 'models/project';
import { formatDate } from 'common/formatters';
@@ -55,7 +55,7 @@ interface ProjectDetailsComponentActionProps {
}
const mapDispatchToProps = (dispatch: Dispatch) => ({
- onClick: () => dispatch<any>(openProjectPropertiesDialog()),
+ onClick: () => dispatch<any>(openResourcePropertiesDialog()),
});
type ProjectDetailsComponentProps = ProjectDetailsComponentDataProps & ProjectDetailsComponentActionProps & WithStyles<CssRules>;
diff --git a/src/views-components/project-properties-dialog/project-properties-dialog.tsx b/src/views-components/project-properties-dialog/project-properties-dialog.tsx
deleted file mode 100644
index 19d3bb56..00000000
--- a/src/views-components/project-properties-dialog/project-properties-dialog.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import React from "react";
-import { Dispatch } from "redux";
-import { connect } from "react-redux";
-import { RootState } from 'store/store';
-import { withDialog, WithDialogProps } from "store/dialog/with-dialog";
-import { ProjectResource } from 'models/project';
-import { PROJECT_PROPERTIES_DIALOG_NAME, deleteProjectProperty } from 'store/details-panel/details-panel-action';
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, withStyles, StyleRulesCallback, WithStyles } from '@material-ui/core';
-import { ArvadosTheme } from 'common/custom-theme';
-import { ProjectPropertiesForm } from 'views-components/project-properties-dialog/project-properties-form';
-import { getResource } from 'store/resources/resources';
-import { getPropertyChip } from "../resource-properties-form/property-chip";
-
-type CssRules = 'tag';
-
-const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
- tag: {
- marginRight: theme.spacing.unit,
- marginBottom: theme.spacing.unit
- }
-});
-
-interface ProjectPropertiesDialogDataProps {
- project: ProjectResource;
-}
-
-interface ProjectPropertiesDialogActionProps {
- handleDelete: (key: string, value: string) => void;
-}
-
-const mapStateToProps = ({ detailsPanel, resources, properties }: RootState): ProjectPropertiesDialogDataProps => ({
- project: getResource(detailsPanel.resourceUuid)(resources) as ProjectResource,
-});
-
-const mapDispatchToProps = (dispatch: Dispatch): ProjectPropertiesDialogActionProps => ({
- handleDelete: (key: string, value: string) => () => dispatch<any>(deleteProjectProperty(key, value)),
-});
-
-type ProjectPropertiesDialogProps = ProjectPropertiesDialogDataProps & ProjectPropertiesDialogActionProps & WithDialogProps<{}> & WithStyles<CssRules>;
-
-export const ProjectPropertiesDialog = connect(mapStateToProps, mapDispatchToProps)(
- withStyles(styles)(
- withDialog(PROJECT_PROPERTIES_DIALOG_NAME)(
- ({ classes, open, closeDialog, handleDelete, project }: ProjectPropertiesDialogProps) =>
- <Dialog open={open}
- onClose={closeDialog}
- fullWidth
- maxWidth='sm'>
- <DialogTitle>Properties</DialogTitle>
- <DialogContent>
- <ProjectPropertiesForm />
- {project && project.properties &&
- Object.keys(project.properties).map(k =>
- Array.isArray(project.properties[k])
- ? project.properties[k].map((v: string) =>
- getPropertyChip(
- k, v,
- handleDelete(k, v),
- classes.tag))
- : getPropertyChip(
- k, project.properties[k],
- handleDelete(k, project.properties[k]),
- classes.tag)
- )
- }
- </DialogContent>
- <DialogActions>
- <Button
- variant='text'
- color='primary'
- onClick={closeDialog}>
- Close
- </Button>
- </DialogActions>
- </Dialog>
- )
- ));
diff --git a/src/views-components/project-properties-dialog/project-properties-form.tsx b/src/views-components/resource-properties-dialog/resource-properties-dialog-form.tsx
similarity index 56%
rename from src/views-components/project-properties-dialog/project-properties-form.tsx
rename to src/views-components/resource-properties-dialog/resource-properties-dialog-form.tsx
index f36bacf4..cfb999cc 100644
--- a/src/views-components/project-properties-dialog/project-properties-form.tsx
+++ b/src/views-components/resource-properties-dialog/resource-properties-dialog-form.tsx
@@ -3,17 +3,18 @@
// SPDX-License-Identifier: AGPL-3.0
import { reduxForm, reset } from 'redux-form';
-import { PROJECT_PROPERTIES_FORM_NAME, createProjectProperty } from 'store/details-panel/details-panel-action';
+import { RESOURCE_PROPERTIES_FORM_NAME } from 'store/details-panel/details-panel-action';
import { ResourcePropertiesForm, ResourcePropertiesFormData } from 'views-components/resource-properties-form/resource-properties-form';
import { withStyles } from '@material-ui/core';
import { Dispatch } from 'redux';
+import { createResourceProperty } from 'store/resources/resources-actions';
const Form = withStyles(({ spacing }) => ({ container: { marginBottom: spacing.unit * 2 } }))(ResourcePropertiesForm);
-export const ProjectPropertiesForm = reduxForm<ResourcePropertiesFormData>({
- form: PROJECT_PROPERTIES_FORM_NAME,
+export const ResourcePropertiesDialogForm = reduxForm<ResourcePropertiesFormData, {uuid: string}>({
+ form: RESOURCE_PROPERTIES_FORM_NAME,
onSubmit: (data, dispatch: Dispatch) => {
- dispatch<any>(createProjectProperty(data));
- dispatch(reset(PROJECT_PROPERTIES_FORM_NAME));
+ dispatch<any>(createResourceProperty(data));
+ dispatch(reset(RESOURCE_PROPERTIES_FORM_NAME));
}
})(Form);
diff --git a/src/views-components/resource-properties-dialog/resource-properties-dialog.tsx b/src/views-components/resource-properties-dialog/resource-properties-dialog.tsx
new file mode 100644
index 00000000..b634715f
--- /dev/null
+++ b/src/views-components/resource-properties-dialog/resource-properties-dialog.tsx
@@ -0,0 +1,91 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import React from "react";
+import { Dispatch } from "redux";
+import { connect } from "react-redux";
+import { RootState } from 'store/store';
+import { withDialog, WithDialogProps } from "store/dialog/with-dialog";
+import { RESOURCE_PROPERTIES_DIALOG_NAME } from 'store/details-panel/details-panel-action';
+import {
+ Dialog,
+ DialogTitle,
+ DialogContent,
+ DialogActions,
+ Button,
+ withStyles,
+ StyleRulesCallback,
+ WithStyles
+} from '@material-ui/core';
+import { ArvadosTheme } from 'common/custom-theme';
+import { ResourcePropertiesDialogForm } from 'views-components/resource-properties-dialog/resource-properties-dialog-form';
+import { getResource } from 'store/resources/resources';
+import { getPropertyChip } from "../resource-properties-form/property-chip";
+import { deleteResourceProperty } from "store/resources/resources-actions";
+import { ResourceWithProperties } from "models/resource";
+
+type CssRules = 'tag';
+
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ tag: {
+ marginRight: theme.spacing.unit,
+ marginBottom: theme.spacing.unit
+ }
+});
+
+interface ResourcePropertiesDialogDataProps {
+ resource: ResourceWithProperties;
+}
+
+interface ResourcePropertiesDialogActionProps {
+ handleDelete: (uuid: string, key: string, value: string) => void;
+}
+
+const mapStateToProps = ({ detailsPanel, resources, properties }: RootState): ResourcePropertiesDialogDataProps => ({
+ resource: getResource(detailsPanel.resourceUuid)(resources) as ResourceWithProperties,
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): ResourcePropertiesDialogActionProps => ({
+ handleDelete: (uuid: string, key: string, value: string) => () => dispatch<any>(deleteResourceProperty(uuid, key, value)),
+});
+
+type ResourcePropertiesDialogProps = ResourcePropertiesDialogDataProps & ResourcePropertiesDialogActionProps & WithDialogProps<{}> & WithStyles<CssRules>;
+
+export const ResourcePropertiesDialog = connect(mapStateToProps, mapDispatchToProps)(
+ withStyles(styles)(
+ withDialog(RESOURCE_PROPERTIES_DIALOG_NAME)(
+ ({ classes, open, closeDialog, handleDelete, resource }: ResourcePropertiesDialogProps) =>
+ <Dialog open={open}
+ onClose={closeDialog}
+ fullWidth
+ maxWidth='sm'>
+ <DialogTitle>Edit properties</DialogTitle>
+ <DialogContent>
+ <ResourcePropertiesDialogForm uuid={resource ? resource.uuid : ''} />
+ {resource && resource.properties &&
+ Object.keys(resource.properties).map(k =>
+ Array.isArray(resource.properties[k])
+ ? resource.properties[k].map((v: string) =>
+ getPropertyChip(
+ k, v,
+ handleDelete(resource.uuid, k, v),
+ classes.tag))
+ : getPropertyChip(
+ k, resource.properties[k],
+ handleDelete(resource.uuid, k, resource.properties[k]),
+ classes.tag)
+ )
+ }
+ </DialogContent>
+ <DialogActions>
+ <Button
+ variant='text'
+ color='primary'
+ onClick={closeDialog}>
+ Close
+ </Button>
+ </DialogActions>
+ </Dialog>
+ )
+ ));
diff --git a/src/views-components/resource-properties-form/resource-properties-form.tsx b/src/views-components/resource-properties-form/resource-properties-form.tsx
index 38d76e46..94a3c955 100644
--- a/src/views-components/resource-properties-form/resource-properties-form.tsx
+++ b/src/views-components/resource-properties-form/resource-properties-form.tsx
@@ -11,16 +11,18 @@ import { ProgressButton } from 'components/progress-button/progress-button';
import { GridClassKey } from '@material-ui/core/Grid';
export interface ResourcePropertiesFormData {
+ uuid: string;
[PROPERTY_KEY_FIELD_NAME]: string;
[PROPERTY_KEY_FIELD_ID]: string;
[PROPERTY_VALUE_FIELD_NAME]: string;
[PROPERTY_VALUE_FIELD_ID]: string;
}
-export type ResourcePropertiesFormProps = InjectedFormProps<ResourcePropertiesFormData> & WithStyles<GridClassKey>;
+export type ResourcePropertiesFormProps = {uuid: string; } & InjectedFormProps<ResourcePropertiesFormData, {uuid: string; }> & WithStyles<GridClassKey>;
-export const ResourcePropertiesForm = ({ handleSubmit, submitting, invalid, classes }: ResourcePropertiesFormProps ) =>
- <form data-cy='resource-properties-form' onSubmit={handleSubmit}>
+export const ResourcePropertiesForm = ({ handleSubmit, change, submitting, invalid, classes, uuid }: ResourcePropertiesFormProps ) => {
+ change('uuid', uuid); // Sets the uuid field to the uuid of the resource.
+ return <form data-cy='resource-properties-form' onSubmit={handleSubmit}>
<Grid container spacing={16} classes={classes}>
<Grid item xs>
<PropertyKeyField />
@@ -40,7 +42,7 @@ export const ResourcePropertiesForm = ({ handleSubmit, submitting, invalid, clas
</Button>
</Grid>
</Grid>
- </form>;
+ </form>};
export const Button = withStyles(theme => ({
root: { marginTop: theme.spacing.unit }
diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx
index 794e093f..5aeaef18 100644
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@ -3,6 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import React from 'react';
+import { Dispatch } from 'redux';
import {
StyleRulesCallback,
WithStyles,
@@ -11,22 +12,21 @@ import {
Grid,
Tooltip,
Typography,
- Card, CardHeader, CardContent,
+ Card
} from '@material-ui/core';
import { connect, DispatchProp } from "react-redux";
import { RouteComponentProps } from 'react-router';
import { ArvadosTheme } from 'common/custom-theme';
import { RootState } from 'store/store';
-import { MoreOptionsIcon, CollectionIcon, ReadOnlyIcon, CollectionOldVersionIcon } from 'components/icon/icon';
+import { MoreOptionsIcon, CollectionIcon, ReadOnlyIcon, CollectionOldVersionIcon, RenameIcon } from 'components/icon/icon';
import { DetailsAttribute } from 'components/details-attribute/details-attribute';
import { CollectionResource, getCollectionUrl } from 'models/collection';
import { CollectionPanelFiles } from 'views-components/collection-panel-files/collection-panel-files';
-import { CollectionTagForm } from './collection-tag-form';
-import { deleteCollectionTag, navigateToProcess, collectionPanelActions } from 'store/collection-panel/collection-panel-action';
+import { navigateToProcess, collectionPanelActions } from 'store/collection-panel/collection-panel-action';
import { getResource } from 'store/resources/resources';
import { openContextMenu, resourceUuidToContextMenuKind } from 'store/context-menu/context-menu-actions';
import { formatDate, formatFileSize } from "common/formatters";
-import { openDetailsPanel } from 'store/details-panel/details-panel-action';
+import { openDetailsPanel, openResourcePropertiesDialog } from 'store/details-panel/details-panel-action';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { getPropertyChip } from 'views-components/resource-properties-form/property-chip';
import { IllegalNamingWarning } from 'components/warning/warning';
@@ -148,7 +148,6 @@ export const CollectionPanel = withStyles(styles)(
const { classes, item, dispatch, isWritable, isOldVersion, isLoadingFiles, tooManyFiles } = this.props;
const panelsData: MPVPanelState[] = [
{name: "Details"},
- {name: "Properties"},
{name: "Files"},
];
return item
@@ -203,37 +202,6 @@ export const CollectionPanel = withStyles(styles)(
</Grid>
</Card>
</MPVPanelContent>
- <MPVPanelContent xs="auto" data-cy='collection-properties-panel'>
- <Card className={classes.propertiesCard}>
- <CardHeader title="Properties" />
- <CardContent><Grid container>
- {isWritable && <Grid item xs={12}>
- <CollectionTagForm />
- </Grid>}
- <Grid item xs={12}>
- {Object.keys(item.properties).length > 0
- ? Object.keys(item.properties).map(k =>
- Array.isArray(item.properties[k])
- ? item.properties[k].map((v: string) =>
- getPropertyChip(
- k, v,
- isWritable
- ? this.handleDelete(k, v)
- : undefined,
- classes.tag))
- : getPropertyChip(
- k, item.properties[k],
- isWritable
- ? this.handleDelete(k, item.properties[k])
- : undefined,
- classes.tag)
- )
- : <div className={classes.centeredLabel}>No properties set on this collection.</div>
- }
- </Grid>
- </Grid></CardContent>
- </Card>
- </MPVPanelContent>
<MPVPanelContent xs>
<Card className={classes.filesCard}>
<CollectionPanelFiles
@@ -275,10 +243,6 @@ export const CollectionPanel = withStyles(styles)(
kind: SnackbarKind.SUCCESS
}))
- handleDelete = (key: string, value: string) => () => {
- this.props.dispatch<any>(deleteCollectionTag(key, value));
- }
-
openCollectionDetails = (e: React.MouseEvent<HTMLElement>) => {
const { item } = this.props;
if (item) {
@@ -295,9 +259,25 @@ export const CollectionPanel = withStyles(styles)(
)
);
-export const CollectionDetailsAttributes = (props: { item: CollectionResource, twoCol: boolean, classes?: Record<CssRules, string>, showVersionBrowser?: () => void }) => {
+interface CollectionDetailsActionProps {
+ onClick: () => void;
+}
+
+interface CollectionDetailsProps {
+ item: CollectionResource;
+ classes?: any;
+ twoCol?: boolean;
+ showVersionBrowser?: () => void;
+}
+
+const mapDispatchToProps = (dispatch: Dispatch) => ({
+ onClick: () => dispatch<any>(openResourcePropertiesDialog()),
+});
+
+export const CollectionDetailsAttributes = connect(null, mapDispatchToProps)(
+(props: CollectionDetailsProps & CollectionDetailsActionProps) => {
const item = props.item;
- const classes = props.classes || { label: '', value: '', button: '' };
+ const classes = props.classes || { label: '', value: '', button: '', tag: '' };
const isOldVersion = item && item.currentVersionUuid !== item.uuid;
const mdSize = props.twoCol ? 6 : 12;
const showVersionBrowser = props.showVersionBrowser;
@@ -361,5 +341,22 @@ export const CollectionDetailsAttributes = (props: { item: CollectionResource, t
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
label='Storage classes' value={item.storageClassesDesired.join(', ')} />
</Grid>
+ <Grid item xs={12} md={mdSize}>
+ <DetailsAttribute classLabel={classes.label} classValue={classes.value}
+ label='Properties'>
+ { !props.twoCol
+ ? <div onClick={props.onClick}>
+ <RenameIcon className={classes.editIcon} />
+ </div>
+ : '' }
+ </DetailsAttribute>
+ { Object.keys(item.properties).length > 0
+ ? Object.keys(item.properties).map(k =>
+ Array.isArray(item.properties[k])
+ ? item.properties[k].map((v: string) =>
+ getPropertyChip(k, v, undefined, classes.tag))
+ : getPropertyChip(k, item.properties[k], undefined, classes.tag))
+ : <div className={classes.value}>No properties</div> }
+ </Grid>
</Grid>;
-};
+});
diff --git a/src/views/collection-panel/collection-tag-form.tsx b/src/views/collection-panel/collection-tag-form.tsx
deleted file mode 100644
index 6d9cbd59..00000000
--- a/src/views/collection-panel/collection-tag-form.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import { reduxForm, reset } from 'redux-form';
-import { createCollectionTag, COLLECTION_TAG_FORM_NAME } from 'store/collection-panel/collection-panel-action';
-import { ResourcePropertiesForm, ResourcePropertiesFormData } from 'views-components/resource-properties-form/resource-properties-form';
-import { withStyles } from '@material-ui/core';
-import { Dispatch } from 'redux';
-
-const Form = withStyles(({ spacing }) => ({ container: { marginBottom: spacing.unit * 2 } }))(ResourcePropertiesForm);
-
-export const CollectionTagForm = reduxForm<ResourcePropertiesFormData>({
- form: COLLECTION_TAG_FORM_NAME,
- onSubmit: (data, dispatch: Dispatch) => {
- dispatch<any>(createCollectionTag(data));
- dispatch(reset(COLLECTION_TAG_FORM_NAME));
- }
-})(Form);
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 1c6bf03f..520ea455 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -54,7 +54,7 @@ import { AdvancedTabDialog } from 'views-components/advanced-tab-dialog/advanced
import { ProcessInputDialog } from 'views-components/process-input-dialog/process-input-dialog';
import { VirtualMachineUserPanel } from 'views/virtual-machine-panel/virtual-machine-user-panel';
import { VirtualMachineAdminPanel } from 'views/virtual-machine-panel/virtual-machine-admin-panel';
-import { ProjectPropertiesDialog } from 'views-components/project-properties-dialog/project-properties-dialog';
+import { ResourcePropertiesDialog } from 'views-components/resource-properties-dialog/resource-properties-dialog';
import { RepositoriesPanel } from 'views/repositories-panel/repositories-panel';
import { KeepServicePanel } from 'views/keep-service-panel/keep-service-panel';
import { ApiClientAuthorizationPanel } from 'views/api-client-authorization-panel/api-client-authorization-panel';
@@ -246,7 +246,7 @@ export const WorkbenchPanel =
<PartialCopyToCollectionDialog />
<ProcessCommandDialog />
<ProcessInputDialog />
- <ProjectPropertiesDialog />
+ <ResourcePropertiesDialog />
<RestoreCollectionVersionDialog />
<RemoveApiClientAuthorizationDialog />
<RemoveGroupDialog />
commit 263f3eaf676961962df14cdbfe32e9aff9a2e178
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Dec 14 18:27:49 2021 -0300
18219: Extracts 'properties' into a separate interface for typing reasons.
We'll be treating Collections, Projects, etc as "ResourcesWithProperties".
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/models/collection.ts b/src/models/collection.ts
index baa25c7a..3effe672 100644
--- a/src/models/collection.ts
+++ b/src/models/collection.ts
@@ -2,13 +2,16 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ResourceKind, TrashableResource } from "./resource";
+import {
+ ResourceKind,
+ TrashableResource,
+ ResourceWithProperties
+} from "./resource";
-export interface CollectionResource extends TrashableResource {
+export interface CollectionResource extends TrashableResource, ResourceWithProperties {
kind: ResourceKind.COLLECTION;
name: string;
description: string;
- properties: any;
portableDataHash: string;
manifestText: string;
replicationDesired: number;
diff --git a/src/models/container-request.ts b/src/models/container-request.ts
index 9a57a41d..99ec4cf0 100644
--- a/src/models/container-request.ts
+++ b/src/models/container-request.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { Resource, ResourceKind } from "./resource";
+import { Resource, ResourceKind, ResourceWithProperties } from "./resource";
import { MountType } from "models/mount-types";
import { RuntimeConstraints } from './runtime-constraints';
import { SchedulingParameters } from './scheduling-parameters';
@@ -13,11 +13,10 @@ export enum ContainerRequestState {
FINAL = "Final"
}
-export interface ContainerRequestResource extends Resource {
+export interface ContainerRequestResource extends Resource, ResourceWithProperties {
kind: ResourceKind.CONTAINER_REQUEST;
name: string;
description: string;
- properties: any;
state: ContainerRequestState;
requestingContainerUuid: string | null;
containerUuid: string | null;
diff --git a/src/models/group.ts b/src/models/group.ts
index 365e9cce..0f469ca8 100644
--- a/src/models/group.ts
+++ b/src/models/group.ts
@@ -2,14 +2,17 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ResourceKind, TrashableResource } from "./resource";
+import {
+ ResourceKind,
+ ResourceWithProperties,
+ TrashableResource
+} from "./resource";
-export interface GroupResource extends TrashableResource {
+export interface GroupResource extends TrashableResource, ResourceWithProperties {
kind: ResourceKind.GROUP;
name: string;
groupClass: GroupClass | null;
description: string;
- properties: any;
writableBy: string[];
ensure_unique_name: boolean;
}
diff --git a/src/models/link.ts b/src/models/link.ts
index 828dced2..f55c5ccf 100644
--- a/src/models/link.ts
+++ b/src/models/link.ts
@@ -2,16 +2,15 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { Resource, ResourceKind } from 'models/resource';
+import { Resource, ResourceKind, ResourceWithProperties } from 'models/resource';
-export interface LinkResource extends Resource {
+export interface LinkResource extends Resource, ResourceWithProperties {
headUuid: string;
headKind: ResourceKind;
tailUuid: string;
tailKind: string;
linkClass: string;
name: string;
- properties: any;
kind: ResourceKind.LINK;
}
diff --git a/src/models/log.ts b/src/models/log.ts
index 55967f88..3397993b 100644
--- a/src/models/log.ts
+++ b/src/models/log.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { Resource } from "./resource";
+import { Resource, ResourceWithProperties } from "./resource";
import { ResourceKind } from 'models/resource';
export enum LogEventType {
@@ -18,11 +18,10 @@ export enum LogEventType {
STDERR = 'stderr',
}
-export interface LogResource extends Resource {
+export interface LogResource extends Resource, ResourceWithProperties {
kind: ResourceKind.LOG;
objectUuid: string;
eventAt: string;
eventType: string;
summary: string;
- properties: any;
}
diff --git a/src/models/resource.ts b/src/models/resource.ts
index c94c4b25..fd867277 100644
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -14,6 +14,10 @@ export interface Resource {
etag: string;
}
+export interface ResourceWithProperties extends Resource {
+ properties: any;
+}
+
export interface EditableResource extends Resource {
isEditable: boolean;
}
diff --git a/src/models/tag.ts b/src/models/tag.ts
index f4e5854a..fa36486d 100644
--- a/src/models/tag.ts
+++ b/src/models/tag.ts
@@ -10,6 +10,7 @@ export interface TagResource extends LinkResource {
}
export interface TagProperty {
+ uuid: string;
key: string;
keyID?: string;
value: string;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list