18284: Add update vm login dialog, remove default group, update tests

[arvados-workbench2.git] / src / views-components / form-fields / resource-form-fields.tsx

diff --git a/src/views-components/form-fields/resource-form-fields.tsx b/src/views-components/form-fields/resource-form-fields.tsx
index 0ba357c33248212b71cfeba92e1869348b005e37..f2bb97f4282b5c93fbe7db522feb0a109c820c92 100644 (file)
--- a/src/views-components/form-fields/resource-form-fields.tsx
+++ b/src/views-components/form-fields/resource-form-fields.tsx
@@ -2,32 +2,32 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from "react";
+import React from "react";
 import { connect } from "react-redux";
-import { RootState } from "~/store/store";
+import { RootState } from "store/store";
 import { Field } from "redux-form";
-import { ResourcesState, getResource } from "~/store/resources/resources";
-import { GroupResource } from "~/models/group";
-import { TextField } from "~/components/text-field/text-field";
-import { getUserUuid } from "~/common/getuser";
+import { ResourcesState, getResource } from "store/resources/resources";
+import { GroupResource } from "models/group";
+import { TextField } from "components/text-field/text-field";
+import { getUserUuid } from "common/getuser";
 
-interface ResourceLocationFieldProps {
+interface ResourceParentFieldProps {
     resources: ResourcesState;
     userUuid: string|undefined;
 }
 
-export const ResourceLocationField = connect(
+export const ResourceParentField = connect(
     (state: RootState) => {
         return {
             resources: state.resources,
             userUuid: getUserUuid(state),
         };
     })
-    ((props: ResourceLocationFieldProps) =>
-        <Field
+    ((props: ResourceParentFieldProps) =>
+        <span data-cy='parent-field'><Field
             name='ownerUuid'
             disabled={true}
-            label='Location'
+            label='Parent project'
             format={
                 (value, name) => {
                     if (value === props.userUuid) {
@@ -35,10 +35,10 @@ export const ResourceLocationField = connect(
                     }
                     const rsc = getResource<GroupResource>(value)(props.resources);
                     if (rsc !== undefined) {
-                        return `Project '${rsc.name}' (${rsc.uuid})`;
+                        return `${rsc.name} (${rsc.uuid})`;
                     }
                     return value;
                 }
             }
-            component={TextField} />
+            component={TextField as any} /></span>
     );