Skip to content

Commit f57412c

Browse files
s-rubensteins-rubenstein
authored
Merge branch 'dev' into sr/dcj-742-update-codeowners
2 parents c304067 + 08d1adf commit f57412c

File tree

19 files changed

+1362
-275
lines changed

19 files changed

+1362
-275
lines changed

‎.github/CODEOWNERS

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
# Each line is a file pattern followed by one or more owners.
22
# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
3-
/src/analysis @DataBiosphere/broad-interactive-analysis
4-
/src/billing-core/ @DataBiosphere/broadworkspaces-terra-ui
5-
/src/billing/ @DataBiosphere/broadworkspaces-terra-ui
6-
/src/groups/ @DataBiosphere/broadworkspaces-terra-ui
7-
/src/pages/EnvironmentsPage/ @DataBiosphere/broad-interactive-analysis
3+
/src/analysis @DataBiosphere/dsp-analysis
4+
/src/billing-core/ @DataBiosphere/broad-core-services
5+
/src/billing/ @DataBiosphere/broad-core-services
6+
/src/groups/ @DataBiosphere/broad-core-services
7+
/src/pages/EnvironmentsPage/ @DataBiosphere/dsp-analysis
88
/src/constants/datasets.js @DataBiosphere/dsp-data-team-eng
9-
/src/import-data/ @DataBiosphere/dsp-data-team-eng @DataBiosphere/analysisjourneys
9+
/src/import-data/ @DataBiosphere/dsp-data-team-eng @DataBiosphere/broad-core-services
1010
/src/libs/brand*.js @DataBiosphere/terra-cobranding
1111
/src/libs/colors.js @DataBiosphere/terra-cobranding
12-
/src/libs/ajax/Apps.ts @DataBiosphere/broad-interactive-analysis
13-
/src/libs/ajax/Runtimes.ts @DataBiosphere/broad-interactive-analysis
14-
/src/libs/ajax/AzureStorage.js @DataBiosphere/broad-interactive-analysis
15-
/src/libs/ajax/billing/ @DataBiosphere/broadworkspaces-terra-ui
16-
/src/libs/ajax/GoogleStorage.js @DataBiosphere/broad-interactive-analysis
17-
/src/libs/ajax/Groups.ts @DataBiosphere/broadworkspaces-terra-ui
12+
/src/libs/ajax/Apps.ts @DataBiosphere/dsp-analysis
13+
/src/libs/ajax/Runtimes.ts @DataBiosphere/dsp-analysis
14+
/src/libs/ajax/AzureStorage.js @DataBiosphere/dsp-analysis
15+
/src/libs/ajax/billing/ @DataBiosphere/broad-core-services
16+
/src/libs/ajax/GoogleStorage.js @DataBiosphere/dsp-analysis
17+
/src/libs/ajax/Groups.ts @DataBiosphere/broad-core-services
1818
/src/libs/ajax/Catalog.ts @DataBiosphere/dsp-data-team-eng
19-
/src/libs/ajax/workflows-app/ @DataBiosphere/broad-workflow-management @DataBiosphere/broad-workflow-execution
20-
/src/libs/ajax/workspaces/ @DataBiosphere/broadworkspaces-terra-ui
19+
/src/libs/ajax/workflows-app/ @DataBiosphere/dsp-analysis
20+
/src/libs/ajax/workspaces/ @DataBiosphere/broad-core-services
2121
/src/pages/library/DataBrowser* @DataBiosphere/dsp-data-team-eng
2222
/src/pages/library/Datasets* @DataBiosphere/dsp-data-team-eng
2323
/src/pages/library/SearchAndFilterComponent* @DataBiosphere/dsp-data-team-eng
2424
/src/dataset-builder/ @DataBiosphere/dsp-data-team-eng
2525
/src/data-catalog/ @DataBiosphere/dsp-data-team-eng
2626
/src/pages/LandingPage* @DataBiosphere/terra-cobranding
27-
/src/pages/billing/ @DataBiosphere/broadworkspaces-terra-ui
28-
/src/pages/groups/ @DataBiosphere/broadworkspaces-terra-ui
29-
/src/pages/workspaces/* @DataBiosphere/broadworkspaces-terra-ui
30-
/src/profile/notification-settings/* @DataBiosphere/broadworkspaces-terra-ui
31-
/src/workflows-app/ @DataBiosphere/broad-workflow-management @DataBiosphere/broad-workflow-execution
32-
/src/workspace-data/ @DataBiosphere/analysisjourneys
33-
/src/workspaces/ @DataBiosphere/broadworkspaces-terra-ui
34-
/integration-tests/tests/billing-projects.js @DataBiosphere/broadworkspaces-terra-ui
35-
/integration-tests/tests/delete-orphaned-workspaces.js @DataBiosphere/broadworkspaces-terra-ui
36-
/integration-tests/tests/run-analysis.js @DataBiosphere/broad-interactive-analysis
37-
/integration-tests/tests/run-analysis-azure.js @DataBiosphere/broad-interactive-analysis
38-
/integration-tests/tests/run-rstudio.js @DataBiosphere/broad-interactive-analysis
39-
/integration-tests/tests/analysis-context-bar.js @DataBiosphere/broad-interactive-analysis
27+
/src/pages/billing/ @DataBiosphere/broad-core-services
28+
/src/pages/groups/ @DataBiosphere/broad-core-services
29+
/src/pages/workspaces/* @DataBiosphere/broad-core-services
30+
/src/profile/notification-settings/* @DataBiosphere/broad-core-services
31+
/src/workflows-app/ @DataBiosphere/dsp-analysis
32+
/src/workspace-data/ @DataBiosphere/broad-core-services
33+
/src/workspaces/ @DataBiosphere/broad-core-services
34+
/integration-tests/tests/billing-projects.js @DataBiosphere/broad-core-services
35+
/integration-tests/tests/delete-orphaned-workspaces.js @DataBiosphere/broad-core-services
36+
/integration-tests/tests/run-analysis.js @DataBiosphere/dsp-analysis
37+
/integration-tests/tests/run-analysis-azure.js @DataBiosphere/dsp-analysis
38+
/integration-tests/tests/run-rstudio.js @DataBiosphere/dsp-analysis
39+
/integration-tests/tests/analysis-context-bar.js @DataBiosphere/dsp-analysis
4040
/integration-tests/tests/export-*-dataset-to-workspace.js @DataBiosphere/dsp-data-team-eng
4141
/integration-tests/tests/preview-dataset.js @DataBiosphere/dsp-data-team-eng
4242
/integration-tests/tests/request-access.js @DataBiosphere/dsp-data-team-eng
4343
/integration-tests/tests/run-catalog* @DataBiosphere/dsp-data-team-eng
4444
/integration-tests/utils/catalog-utils.js @DataBiosphere/dsp-data-team-eng
45-
/integration-tests/utils/import-tdr-snapshot.ts @DataBiosphere/analysisjourneys
45+
/integration-tests/utils/import-tdr-snapshot.ts @DataBiosphere/broad-core-services

‎integration-tests/slack/slack-notify-channels.json

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,6 @@
4343
}
4444
]
4545
},
46-
{
47-
"name": "dsp-workspaces-test-alerts",
48-
"id": "C03F21QEWV7",
49-
"tests": [
50-
{
51-
"name": "billing-projects"
52-
},
53-
{
54-
"name": "delete-orphaned-workspaces"
55-
}
56-
]
57-
},
5846
{
5947
"name": "jade-data-explorer",
6048
"id": "C01TU3W2AL9",
@@ -80,20 +68,8 @@
8068
]
8169
},
8270
{
83-
"name": "identiteam-alerts",
84-
"id": "C03HV2AD20N",
85-
"tests": [
86-
{
87-
"name": "register-user"
88-
},
89-
{
90-
"name": "request-access"
91-
}
92-
]
93-
},
94-
{
95-
"name": "dsp-analysis-journeys-alerts",
96-
"id": "C031KGQUVB4",
71+
"name": "dsp-core-services-alerts",
72+
"id": "C07Q8H7F8LV",
9773
"tests": [
9874
{
9975
"name": "import-cohort-data"
@@ -103,6 +79,18 @@
10379
},
10480
{
10581
"name": "import-tdr-snapshot"
82+
},
83+
{
84+
"name": "billing-projects"
85+
},
86+
{
87+
"name": "delete-orphaned-workspaces"
88+
},
89+
{
90+
"name": "register-user"
91+
},
92+
{
93+
"name": "request-access"
10694
}
10795
]
10896
}

‎src/libs/ajax.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import * as qs from 'qs';
2-
import { fetchGoogleForms } from 'src/libs/ajax/ajax-common';
31
import { AzureStorage } from 'src/libs/ajax/AzureStorage';
42
import { Billing } from 'src/libs/ajax/billing/Billing';
53
import { Catalog } from 'src/libs/ajax/Catalog';
@@ -18,6 +16,7 @@ import { Metrics } from 'src/libs/ajax/Metrics';
1816
import { OAuth2 } from 'src/libs/ajax/OAuth2';
1917
import { SamResources } from 'src/libs/ajax/SamResources';
2018
import { Support } from 'src/libs/ajax/Support';
19+
import { Surveys } from 'src/libs/ajax/surveys/Surveys';
2120
import { TermsOfService } from 'src/libs/ajax/TermsOfService';
2221
import { User } from 'src/libs/ajax/User';
2322
import { Cbas } from 'src/libs/ajax/workflows-app/Cbas';
@@ -28,10 +27,6 @@ import { WorkspaceData } from 'src/libs/ajax/WorkspaceDataService';
2827
import { WorkspaceManagerResources } from 'src/libs/ajax/WorkspaceManagerResources';
2928
import { Workspaces } from 'src/libs/ajax/workspaces/Workspaces';
3029

31-
const Surveys = (signal?: AbortSignal) => ({
32-
submitForm: (formId, data) => fetchGoogleForms(`${formId}/formResponse?${qs.stringify(data)}`, { signal }),
33-
});
34-
3530
export const Ajax = (signal?: AbortSignal) => {
3631
return {
3732
Apps: Apps(signal), // used for e2e testing

‎src/libs/ajax/methods/Methods.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,19 @@ export const Methods = (signal?: AbortSignal) => ({
5151
return res.json();
5252
},
5353

54+
permissions: async () => {
55+
const res = await fetchOrchestration(`api/${root}/permissions`, _.merge(authOpts(), { signal }));
56+
return res.json();
57+
},
58+
59+
setPermissions: async (payload) => {
60+
const res = await fetchOrchestration(
61+
`api/${root}/permissions`,
62+
_.mergeAll([authOpts(), jsonBody(payload), { signal, method: 'POST' }])
63+
);
64+
return res.json();
65+
},
66+
5467
allConfigs: async () => {
5568
const res = await fetchAgora(`methods/${namespace}/${name}/configurations`, _.merge(authOpts(), { signal }));
5669
return res.json();

‎src/libs/ajax/surveys/Surveys.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import * as qs from 'qs';
2+
import { fetchGoogleForms } from 'src/libs/ajax/ajax-common';
3+
4+
export const Surveys = (signal?: AbortSignal) => ({
5+
submitForm: (formId, data) => fetchGoogleForms(`${formId}/formResponse?${qs.stringify(data)}`, { signal }),
6+
});
7+
8+
export type SurveysAjaxContract = ReturnType<typeof Surveys>;

‎src/libs/events.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ const eventsList = {
8787
notificationToggle: 'notification:toggle',
8888
pageView: 'page:view',
8989
permissionsSynchronizationDelay: 'permissions:propagationDelay',
90+
provenanceColumn: 'provenance:column',
91+
provenanceFile: 'provenance:file',
9092
resourceLeave: 'resource:leave',
9193
uploaderCreateCollection: 'uploader:collection:create',
9294
uploaderUploadMetadata: 'uploader:metadata:upload',

‎src/libs/feature-previews-config.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,6 @@ export type FeaturePreview = {
4545
};
4646

4747
const featurePreviewsConfig: readonly FeaturePreview[] = [
48-
{
49-
id: 'data-table-versioning',
50-
title: 'Data Table Versioning',
51-
description:
52-
'Enabling this feature will allow you to save uniquely named versions of data tables. These saved versions will appear in the Data tab and can be restored at any time.',
53-
groups: ['preview-data-versioning-and-provenance'],
54-
feedbackUrl: `mailto:[email protected]?subject=${encodeURIComponent('Feedback on data table versioning')}`,
55-
},
56-
{
57-
id: 'data-table-provenance',
58-
title: 'Data Table Provenance',
59-
description:
60-
'Enabling this feature will allow you to view information about the workflow that generated data table columns and files.',
61-
groups: ['preview-data-versioning-and-provenance'],
62-
feedbackUrl: `mailto:[email protected]?subject=${encodeURIComponent('Feedback on data table provenance')}`,
63-
},
6448
{
6549
id: JUPYTERLAB_GCP_FEATURE_ID,
6650
title: 'JupyterLab on GCP',
@@ -80,7 +64,7 @@ const featurePreviewsConfig: readonly FeaturePreview[] = [
8064
title: 'Azure PFB Import',
8165
description: 'Enabling this feature will allow PFB import into Azure workspaces.',
8266
groups: ['preview-azure-pfb-import'],
83-
feedbackUrl: `mailto:dsp-analysis-journeys@broadinstitute.org?subject=${encodeURIComponent(
67+
feedbackUrl: `mailto:dsp-core-services@broadinstitute.org?subject=${encodeURIComponent(
8468
'Feedback on Azure PFB Import'
8569
)}`,
8670
},
@@ -89,7 +73,7 @@ const featurePreviewsConfig: readonly FeaturePreview[] = [
8973
title: 'Azure TDR Import',
9074
description: 'Enabling this feature will allow importing TDR snapshots into Azure workspaces.',
9175
groups: ['preview-azure-tdr-import'],
92-
feedbackUrl: `mailto:dsp-analysis-journeys@broadinstitute.org?subject=${encodeURIComponent(
76+
feedbackUrl: `mailto:dsp-core-services@broadinstitute.org?subject=${encodeURIComponent(
9377
'Feedback on Azure TDR snapshot Import'
9478
)}`,
9579
},
@@ -115,7 +99,7 @@ const featurePreviewsConfig: readonly FeaturePreview[] = [
11599
title: 'GCP Workspace Bucket Lifecycle Rules',
116100
description:
117101
'Enabling this feature will allow GCP bucket lifecycle rules to be set via the Workspace Settings dialog.',
118-
feedbackUrl: `mailto:dsp-workspaces@broadinstitute.org?subject=${encodeURIComponent(
102+
feedbackUrl: `mailto:dsp-core-services@broadinstitute.org?subject=${encodeURIComponent(
119103
'Feedback on GCP Bucket Lifecycle Rules'
120104
)}`,
121105
},

0 commit comments

Comments
 (0)