projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18219: Extracts 'properties' into a separate interface for typing reasons.
[arvados-workbench2.git]
/
src
/
models
/
resource.ts
diff --git
a/src/models/resource.ts
b/src/models/resource.ts
index d8cdd4a00503ef2e86b9bd846193cd8750f525b3..fd86727782c2960b15ee78d4237da4dcc53363b4 100644
(file)
--- a/
src/models/resource.ts
+++ b/
src/models/resource.ts
@@
-14,6
+14,10
@@
export interface Resource {
etag: string;
}
etag: string;
}
+export interface ResourceWithProperties extends Resource {
+ properties: any;
+}
+
export interface EditableResource extends Resource {
isEditable: boolean;
}
export interface EditableResource extends Resource {
isEditable: boolean;
}
@@
-32,7
+36,6
@@
export enum ResourceKind {
GROUP = "arvados#group",
LINK = "arvados#link",
LOG = "arvados#log",
GROUP = "arvados#group",
LINK = "arvados#link",
LOG = "arvados#log",
- NODE = "arvados#node",
PROCESS = "arvados#containerRequest",
PROJECT = "arvados#group",
REPOSITORY = "arvados#repository",
PROCESS = "arvados#containerRequest",
PROJECT = "arvados#group",
REPOSITORY = "arvados#repository",
@@
-57,13
+60,13
@@
export enum ResourceObjectType {
VIRTUAL_MACHINE = '2x53u',
WORKFLOW = '7fd4e',
SSH_KEY = 'fngyi',
VIRTUAL_MACHINE = '2x53u',
WORKFLOW = '7fd4e',
SSH_KEY = 'fngyi',
- KEEP_SERVICE = 'bi6l4',
- NODE = '7ekkf'
+ KEEP_SERVICE = 'bi6l4'
}
export const RESOURCE_UUID_PATTERN = '[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}';
}
export const RESOURCE_UUID_PATTERN = '[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}';
+export const PORTABLE_DATA_HASH_PATTERN = '[a-f0-9]{32}\\+\\d+';
export const RESOURCE_UUID_REGEX = new RegExp("^" + RESOURCE_UUID_PATTERN + "$");
export const RESOURCE_UUID_REGEX = new RegExp("^" + RESOURCE_UUID_PATTERN + "$");
-export const COLLECTION_PDH_REGEX =
/^[a-f0-9]{32}\+\d+$/
;
+export const COLLECTION_PDH_REGEX =
new RegExp("^" + PORTABLE_DATA_HASH_PATTERN + "$")
;
export const isResourceUuid = (uuid: string) =>
RESOURCE_UUID_REGEX.test(uuid);
export const isResourceUuid = (uuid: string) =>
RESOURCE_UUID_REGEX.test(uuid);
@@
-100,8
+103,6
@@
export const extractUuidKind = (uuid: string = '') => {
return ResourceKind.SSH_KEY;
case ResourceObjectType.KEEP_SERVICE:
return ResourceKind.KEEP_SERVICE;
return ResourceKind.SSH_KEY;
case ResourceObjectType.KEEP_SERVICE:
return ResourceKind.KEEP_SERVICE;
- case ResourceObjectType.NODE:
- return ResourceKind.NODE;
case ResourceObjectType.API_CLIENT_AUTHORIZATION:
return ResourceKind.API_CLIENT_AUTHORIZATION;
case ResourceObjectType.LINK:
case ResourceObjectType.API_CLIENT_AUTHORIZATION:
return ResourceKind.API_CLIENT_AUTHORIZATION;
case ResourceObjectType.LINK: