@gen3/core 0.10.75 → 0.10.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/index.js +47 -33
- package/dist/cjs/index.js.map +1 -1
- package/dist/dts/features/aiSearch/aiSearchSlice.d.ts +24 -24
- package/dist/dts/features/authz/authzMappingSlice.d.ts +36 -36
- package/dist/dts/features/dataLibrary/dataLibraryApi.d.ts +24 -24
- package/dist/dts/features/download/downloadStatusApi.d.ts +39 -37
- package/dist/dts/features/download/downloadStatusApi.d.ts.map +1 -1
- package/dist/dts/features/fence/credentialsApi.d.ts +12 -12
- package/dist/dts/features/fence/fenceApi.d.ts +39 -37
- package/dist/dts/features/fence/fenceApi.d.ts.map +1 -1
- package/dist/dts/features/fence/jwtApi.d.ts +12 -12
- package/dist/dts/features/gen3Apps/Gen3AppRTKQ.d.ts +3 -3
- package/dist/dts/features/graphQL/graphQLSlice.d.ts +12 -12
- package/dist/dts/features/guppy/guppySlice.d.ts +138 -134
- package/dist/dts/features/guppy/guppySlice.d.ts.map +1 -1
- package/dist/dts/features/metadata/metadataSlice.d.ts +99 -97
- package/dist/dts/features/metadata/metadataSlice.d.ts.map +1 -1
- package/dist/dts/features/sower/sowerApi.d.ts +63 -61
- package/dist/dts/features/sower/sowerApi.d.ts.map +1 -1
- package/dist/dts/features/submission/submissionApi.d.ts +90 -86
- package/dist/dts/features/submission/submissionApi.d.ts.map +1 -1
- package/dist/dts/features/user/externalLoginsSlice.d.ts +54 -50
- package/dist/dts/features/user/externalLoginsSlice.d.ts.map +1 -1
- package/dist/dts/features/user/userSliceRTK.d.ts +123 -121
- package/dist/dts/features/user/userSliceRTK.d.ts.map +1 -1
- package/dist/dts/features/workspace/workspaceApi.d.ts +138 -138
- package/dist/dts/utils/fetch.d.ts +2 -2
- package/dist/dts/utils/fetch.d.ts.map +1 -1
- package/dist/esm/index.js +27 -19
- package/dist/esm/index.js.map +1 -1
- package/dist/index.d.ts +845 -825
- package/package.json +2 -2
package/dist/cjs/index.js
CHANGED
|
@@ -56,12 +56,12 @@ const GEN3_WTS_API = process.env.NEXT_PUBLIC_GEN3_WTS_API || `${GEN3_API}/wts`;
|
|
|
56
56
|
const GEN3_DATA_LIBRARY_API = process.env.NEXT_PUBLIC_GEN3_DATA_LIBRARY_API || `${GEN3_API}/library/lists`;
|
|
57
57
|
const GEN3_CROSSWALK_API = process.env.NEXT_PUBLIC_GEN3_CROSSWALK_API || `${GEN3_API}/mds`;
|
|
58
58
|
const GEN3_SOWER_API = process.env.NEXT_PUBLIC_GEN3_SOWER_API || `${GEN3_API}/jobs`;
|
|
59
|
-
|
|
60
|
-
(function(Accessibility) {
|
|
59
|
+
var Accessibility = /*#__PURE__*/ function(Accessibility) {
|
|
61
60
|
Accessibility["ACCESSIBLE"] = "accessible";
|
|
62
61
|
Accessibility["UNACCESSIBLE"] = "unaccessible";
|
|
63
62
|
Accessibility["ALL"] = "all";
|
|
64
|
-
|
|
63
|
+
return Accessibility;
|
|
64
|
+
}({});
|
|
65
65
|
const FILE_DELIMITERS = {
|
|
66
66
|
tsv: '\t',
|
|
67
67
|
csv: ','
|
|
@@ -639,14 +639,18 @@ const slice$2 = toolkit.createSlice({
|
|
|
639
639
|
const drsHostnamesReducer = slice$2.reducer;
|
|
640
640
|
const { setDRSHostnames } = slice$2.actions;
|
|
641
641
|
|
|
642
|
-
|
|
643
|
-
|
|
642
|
+
/**
|
|
643
|
+
* Defines the modals slice of the Redux store.
|
|
644
|
+
* This slice is used to control the display of standard Gen3 modals.
|
|
645
|
+
* and can be extended to add custom modals by representing them as strings.
|
|
646
|
+
*/ var Modals = /*#__PURE__*/ function(Modals) {
|
|
644
647
|
Modals["FirstTimeModal"] = "FirstTimeModal";
|
|
645
648
|
Modals["SessionExpireModal"] = "SessionExpireModal";
|
|
646
649
|
Modals["NoAccessModal"] = "NoAccessModal";
|
|
647
650
|
Modals["CreateCredentialsAPIKeyModal"] = "CreateCredentialsAPIKeyModal";
|
|
648
651
|
Modals["GeneralErrorModal"] = "GeneralErrorModal";
|
|
649
|
-
|
|
652
|
+
return Modals;
|
|
653
|
+
}({});
|
|
650
654
|
const initialState$2 = {
|
|
651
655
|
currentModal: null
|
|
652
656
|
};
|
|
@@ -1387,8 +1391,9 @@ toolkit.createSelector([
|
|
|
1387
1391
|
(_, rootObjectId)=>rootObjectId
|
|
1388
1392
|
], (dataLibrary, rootObjectId)=>dataLibrary[rootObjectId] || []);
|
|
1389
1393
|
|
|
1390
|
-
|
|
1391
|
-
|
|
1394
|
+
/**
|
|
1395
|
+
* Workspace Pod status
|
|
1396
|
+
*/ var WorkspaceStatus = /*#__PURE__*/ function(WorkspaceStatus) {
|
|
1392
1397
|
WorkspaceStatus["Launching"] = "Launching";
|
|
1393
1398
|
WorkspaceStatus["Running"] = "Running";
|
|
1394
1399
|
WorkspaceStatus["Terminating"] = "Terminating";
|
|
@@ -1396,28 +1401,31 @@ exports.WorkspaceStatus = void 0;
|
|
|
1396
1401
|
WorkspaceStatus["NotFound"] = "Not Found";
|
|
1397
1402
|
WorkspaceStatus["Errored"] = "Errored";
|
|
1398
1403
|
WorkspaceStatus["StatusError"] = "Status Error";
|
|
1399
|
-
|
|
1400
|
-
|
|
1401
|
-
|
|
1404
|
+
return WorkspaceStatus;
|
|
1405
|
+
}({});
|
|
1406
|
+
/**
|
|
1407
|
+
* requested state of pod, either by user or workspace monitor
|
|
1408
|
+
*/ var RequestedWorkspaceStatus = /*#__PURE__*/ function(RequestedWorkspaceStatus) {
|
|
1402
1409
|
RequestedWorkspaceStatus["Launch"] = "Launch";
|
|
1403
1410
|
RequestedWorkspaceStatus["Terminate"] = "Terminate";
|
|
1404
1411
|
RequestedWorkspaceStatus["Unset"] = "Unset";
|
|
1405
|
-
|
|
1406
|
-
|
|
1407
|
-
|
|
1412
|
+
return RequestedWorkspaceStatus;
|
|
1413
|
+
}({});
|
|
1414
|
+
var PodConditionType = /*#__PURE__*/ function(PodConditionType) {
|
|
1408
1415
|
PodConditionType["PodScheduled"] = "PodScheduled";
|
|
1409
1416
|
PodConditionType["Initialized"] = "Initialized";
|
|
1410
1417
|
PodConditionType["ContainersReady"] = "ContainersReady";
|
|
1411
1418
|
PodConditionType["PodReadyToStartContainers"] = "PodReadyToStartContainers";
|
|
1412
1419
|
PodConditionType["ProxyConnected"] = "ProxyConnected";
|
|
1413
1420
|
PodConditionType["Ready"] = "Ready";
|
|
1414
|
-
|
|
1415
|
-
|
|
1416
|
-
|
|
1421
|
+
return PodConditionType;
|
|
1422
|
+
}({});
|
|
1423
|
+
var PodStatus = /*#__PURE__*/ function(PodStatus) {
|
|
1417
1424
|
PodStatus["True"] = "True";
|
|
1418
1425
|
PodStatus["False"] = "False";
|
|
1419
1426
|
PodStatus["Unknown"] = "Unknown";
|
|
1420
|
-
|
|
1427
|
+
return PodStatus;
|
|
1428
|
+
}({});
|
|
1421
1429
|
|
|
1422
1430
|
// Using the built-in Date object
|
|
1423
1431
|
const getCurrentTimestamp = ()=>{
|
|
@@ -1437,8 +1445,8 @@ const isTimeGreaterThan = (startTime, minutes)=>{
|
|
|
1437
1445
|
const NO_WORKSPACE_ID = 'none';
|
|
1438
1446
|
const initialState = {
|
|
1439
1447
|
id: NO_WORKSPACE_ID,
|
|
1440
|
-
status:
|
|
1441
|
-
requestedStatus:
|
|
1448
|
+
status: WorkspaceStatus.NotFound,
|
|
1449
|
+
requestedStatus: RequestedWorkspaceStatus.Unset,
|
|
1442
1450
|
requestedStatusTimestamp: getCurrentTimestamp()
|
|
1443
1451
|
};
|
|
1444
1452
|
const slice = toolkit.createSlice({
|
|
@@ -1857,7 +1865,7 @@ const useGetStatus = ()=>{
|
|
|
1857
1865
|
}
|
|
1858
1866
|
}),
|
|
1859
1867
|
getRawDataAndTotalCounts: builder.query({
|
|
1860
|
-
query: ({ type, fields, filters, sort, offset = 0, size = 20, accessibility =
|
|
1868
|
+
query: ({ type, fields, filters, sort, offset = 0, size = 20, accessibility = Accessibility.ALL, format = undefined })=>{
|
|
1861
1869
|
const gqlFilter = convertFilterSetToGqlFilter(filters);
|
|
1862
1870
|
const params = [
|
|
1863
1871
|
...sort ? [
|
|
@@ -1914,7 +1922,7 @@ const useGetStatus = ()=>{
|
|
|
1914
1922
|
}
|
|
1915
1923
|
}),
|
|
1916
1924
|
getAggs: builder.query({
|
|
1917
|
-
query: ({ type, fields, filters, accessibility =
|
|
1925
|
+
query: ({ type, fields, filters, accessibility = Accessibility.ALL })=>{
|
|
1918
1926
|
const queryStart = isFilterEmpty(filters) ? `
|
|
1919
1927
|
query getAggs {
|
|
1920
1928
|
_aggregation {
|
|
@@ -1939,7 +1947,7 @@ const useGetStatus = ()=>{
|
|
|
1939
1947
|
}
|
|
1940
1948
|
}),
|
|
1941
1949
|
getSubAggs: builder.query({
|
|
1942
|
-
query: ({ type, mainField, termsFields = undefined, missingFields = undefined, numericAggAsText = false, gqlFilter = undefined, accessibility =
|
|
1950
|
+
query: ({ type, mainField, termsFields = undefined, missingFields = undefined, numericAggAsText = false, gqlFilter = undefined, accessibility = Accessibility.ALL })=>{
|
|
1943
1951
|
const nestedAggFields = {
|
|
1944
1952
|
termsFields: termsFields,
|
|
1945
1953
|
missingFields: missingFields
|
|
@@ -1964,7 +1972,7 @@ const useGetStatus = ()=>{
|
|
|
1964
1972
|
}
|
|
1965
1973
|
}),
|
|
1966
1974
|
getCounts: builder.query({
|
|
1967
|
-
query: ({ type, filters, accessibility =
|
|
1975
|
+
query: ({ type, filters, accessibility = Accessibility.ALL })=>{
|
|
1968
1976
|
const gqlFilters = convertFilterSetToGqlFilter(filters);
|
|
1969
1977
|
const queryLine = `query totalCounts ${gqlFilters ? '($filter: JSON)' : ''}{`;
|
|
1970
1978
|
const typeAggsLine = `${type} ${gqlFilters ? '(filter: $filter, ' : '('} accessibility: ${accessibility}) {`;
|
|
@@ -1988,7 +1996,7 @@ const useGetStatus = ()=>{
|
|
|
1988
1996
|
}
|
|
1989
1997
|
}),
|
|
1990
1998
|
getFieldCountSummary: builder.query({
|
|
1991
|
-
query: ({ type, field, filters, accessibility =
|
|
1999
|
+
query: ({ type, field, filters, accessibility = Accessibility.ALL })=>{
|
|
1992
2000
|
const gqlFilters = convertFilterSetToGqlFilter(filters);
|
|
1993
2001
|
const query = `query summary ($filter: JSON) {
|
|
1994
2002
|
_aggregation {
|
|
@@ -2348,7 +2356,7 @@ const coreStore = toolkit.configureStore({
|
|
|
2348
2356
|
query.setupListeners(coreStore.dispatch);
|
|
2349
2357
|
|
|
2350
2358
|
const isNotDefined = (x)=>{
|
|
2351
|
-
return x === undefined || x === null || x ===
|
|
2359
|
+
return x === undefined || x === null || x === undefined;
|
|
2352
2360
|
};
|
|
2353
2361
|
const isObject = (x)=>{
|
|
2354
2362
|
return typeof x === 'object';
|
|
@@ -2900,7 +2908,7 @@ const WorkspaceWithTags = gen3Api.enhanceEndpoints({
|
|
|
2900
2908
|
]
|
|
2901
2909
|
});
|
|
2902
2910
|
const EmptyWorkspaceStatusResponse = {
|
|
2903
|
-
status:
|
|
2911
|
+
status: WorkspaceStatus.NotFound,
|
|
2904
2912
|
conditions: [],
|
|
2905
2913
|
containerStates: [],
|
|
2906
2914
|
idleTimeLimit: 0,
|
|
@@ -2961,7 +2969,7 @@ const workspacesApi = WorkspaceWithTags.injectEndpoints({
|
|
|
2961
2969
|
}
|
|
2962
2970
|
// TODO: Find out IF this is code is required
|
|
2963
2971
|
const workspaceStatusData = workspaceStatus.data;
|
|
2964
|
-
if (workspaceStatusData.status ===
|
|
2972
|
+
if (workspaceStatusData.status === WorkspaceStatus.Running && (currentWorkspaceStatus === 'Not Found' || currentWorkspaceStatus === 'Launching')) {
|
|
2965
2973
|
const proxyStatus = await fetchWithBQ(`${GEN3_WORKSPACE_API}/proxy/`);
|
|
2966
2974
|
let statusError = undefined;
|
|
2967
2975
|
if (isFetchParseError(proxyStatus.error)) {
|
|
@@ -2974,11 +2982,11 @@ const workspacesApi = WorkspaceWithTags.injectEndpoints({
|
|
|
2974
2982
|
return {
|
|
2975
2983
|
data: {
|
|
2976
2984
|
...workspaceStatusData,
|
|
2977
|
-
status:
|
|
2985
|
+
status: WorkspaceStatus.Launching,
|
|
2978
2986
|
conditions: [
|
|
2979
2987
|
{
|
|
2980
2988
|
type: 'ProxyConnected',
|
|
2981
|
-
status:
|
|
2989
|
+
status: PodStatus.False
|
|
2982
2990
|
}
|
|
2983
2991
|
]
|
|
2984
2992
|
}
|
|
@@ -3025,12 +3033,12 @@ const workspaceStatusSelector = workspacesApi.endpoints.getWorkspaceStatus.selec
|
|
|
3025
3033
|
const selectWorkspaceStatusFromService = toolkit.createSelector(workspaceStatusSelector, (status)=>status.data ?? {
|
|
3026
3034
|
...EmptyWorkspaceStatusResponse
|
|
3027
3035
|
});
|
|
3028
|
-
const selectWorkspaceStatus = toolkit.createSelector(workspaceStatusSelector, (status)=>status?.data?.status ??
|
|
3036
|
+
const selectWorkspaceStatus = toolkit.createSelector(workspaceStatusSelector, (status)=>status?.data?.status ?? WorkspaceStatus.NotFound);
|
|
3029
3037
|
const paymodelStatusSelector = workspacesApi.endpoints.getWorkspacePayModels.select();
|
|
3030
3038
|
const selectPaymodelStatus = toolkit.createSelector(paymodelStatusSelector, (status)=>status);
|
|
3031
3039
|
|
|
3032
|
-
const isWorkspaceActive = (status)=>status ===
|
|
3033
|
-
const isWorkspaceRunningOrStopping = (status)=>status ===
|
|
3040
|
+
const isWorkspaceActive = (status)=>status === WorkspaceStatus.Running || status === WorkspaceStatus.Launching || status === WorkspaceStatus.Terminating;
|
|
3041
|
+
const isWorkspaceRunningOrStopping = (status)=>status === WorkspaceStatus.Running || status === WorkspaceStatus.Terminating;
|
|
3034
3042
|
|
|
3035
3043
|
const resourcePathFromProjectID = (projectID)=>{
|
|
3036
3044
|
const split = projectID.split('-');
|
|
@@ -3271,6 +3279,7 @@ const { useGetProjectsQuery, useGetSubmissionGraphQLQuery, useGetProjectsDetails
|
|
|
3271
3279
|
});
|
|
3272
3280
|
const { useGetSowerJobListQuery, useLazyGetSowerJobListQuery, useSubmitSowerJobMutation, useGetSowerJobStatusQuery, useGetSowerOutputQuery, useGetSowerServiceStatusQuery } = loadingStatusApi;
|
|
3273
3281
|
|
|
3282
|
+
exports.Accessibility = Accessibility;
|
|
3274
3283
|
exports.CoreProvider = CoreProvider;
|
|
3275
3284
|
exports.EmptyWorkspaceStatusResponse = EmptyWorkspaceStatusResponse;
|
|
3276
3285
|
exports.GEN3_API = GEN3_API;
|
|
@@ -3288,6 +3297,11 @@ exports.GEN3_SUBMISSION_API = GEN3_SUBMISSION_API;
|
|
|
3288
3297
|
exports.GEN3_WORKSPACE_API = GEN3_WORKSPACE_API;
|
|
3289
3298
|
exports.HTTPError = HTTPError;
|
|
3290
3299
|
exports.HTTPErrorMessages = HTTPErrorMessages;
|
|
3300
|
+
exports.Modals = Modals;
|
|
3301
|
+
exports.PodConditionType = PodConditionType;
|
|
3302
|
+
exports.PodStatus = PodStatus;
|
|
3303
|
+
exports.RequestedWorkspaceStatus = RequestedWorkspaceStatus;
|
|
3304
|
+
exports.WorkspaceStatus = WorkspaceStatus;
|
|
3291
3305
|
exports.clearActiveWorkspaceId = clearActiveWorkspaceId;
|
|
3292
3306
|
exports.clearCohortFilters = clearCohortFilters;
|
|
3293
3307
|
exports.clearDataLibrarySelection = clearDataLibrarySelection;
|