Skip to content

Commit 90da871

Browse files
futa-ikedaanqiuy
andauthored
add service file support for gravyvalet addon service (#2609) (#2612)
Co-authored-by: An Qiuyu <[email protected]>
1 parent be2a15d commit 90da871

File tree

2 files changed

+227
-1
lines changed

2 files changed

+227
-1
lines changed

app/guid-file/route.ts

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import moment from 'moment-timezone';
1111
import Institution from 'ember-osf-web/models/institution';
1212
import MetaTags, { HeadTagDef } from 'ember-osf-web/services/meta-tags';
1313
import Ready from 'ember-osf-web/services/ready';
14+
import Features from 'ember-feature-flags/services/features';
1415
import OsfStorageFile from 'ember-osf-web/packages/files/osf-storage-file';
1516
import BitbucketFile from 'ember-osf-web/packages/files/bitbucket-file';
1617
import BoxFile from 'ember-osf-web/packages/files/box-file';
@@ -27,6 +28,9 @@ import CurrentUserService from 'ember-osf-web/services/current-user';
2728
import RegistrationModel from 'ember-osf-web/models/registration';
2829
import CustomFileMetadataRecordModel from 'ember-osf-web/models/custom-file-metadata-record';
2930
import ContributorModel from 'ember-osf-web/models/contributor';
31+
import ServiceFile from 'ember-osf-web/packages/files/service-file';
32+
import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
33+
import ConfiguredStorageAddonModel from 'ember-osf-web/models/configured-storage-addon';
3034

3135
export default class GuidFile extends Route {
3236
@service('head-tags') headTagsService!: HeadTagsService;
@@ -35,10 +39,27 @@ export default class GuidFile extends Route {
3539
@service ready!: Ready;
3640
@service currentUser!: CurrentUserService;
3741
@service store!: Store;
42+
@service features!: Features;
3843

3944
headTags?: HeadTagDef[];
4045
metadata!: CustomFileMetadataRecordModel;
4146

47+
@task
48+
@waitFor
49+
async getResourceReference(resource_uri: string) {
50+
const serviceNode: ResourceReferenceModel = this.store.peekAll(
51+
'resource-reference',
52+
).find((ref: ResourceReferenceModel) => ref.resourceUri === resource_uri);
53+
if (serviceNode) {
54+
return serviceNode;
55+
} else {
56+
const references = await this.store.query('resource-reference', {
57+
filter: { resource_uri },
58+
});
59+
return references.firstObject;
60+
}
61+
}
62+
4263
@task
4364
@waitFor
4465
async setHeadTags(model: any) {
@@ -88,7 +109,27 @@ export default class GuidFile extends Route {
88109
const provider = file.provider;
89110
let storageFile;
90111

91-
switch(provider){
112+
if (this.features.isEnabled('gravy_waffle') && provider !== 'osfstorage') {
113+
let resourceReference;
114+
const iri = target?.links?.iri?.toString();
115+
if (iri) {
116+
resourceReference = await taskFor(this.getResourceReference).perform(iri);
117+
}
118+
if (resourceReference) {
119+
const configuredStorageAddonsList = await resourceReference
120+
.hasMany('configuredStorageAddons').load();
121+
const storageAddon = configuredStorageAddonsList.find(
122+
(addon: ConfiguredStorageAddonModel) => addon.externalServiceName === provider,
123+
);
124+
125+
if (storageAddon) {
126+
storageFile = new ServiceFile(this.currentUser, file, storageAddon);
127+
return storageFile;
128+
}
129+
}
130+
}
131+
132+
switch (provider) {
92133
case 'osfstorage':
93134
storageFile = new OsfStorageFile(this.currentUser, file);
94135
break;

tests/unit/guid-file/route-test.ts

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
import { module, test } from 'qunit';
2+
import { setupTest } from 'ember-qunit';
3+
import { setupMirage } from 'ember-cli-mirage/test-support';
4+
import { TestContext } from 'ember-test-helpers';
5+
import sinon from 'sinon';
6+
7+
import { Permission } from 'ember-osf-web/models/osf-model';
8+
import GuidFileRoute from 'ember-osf-web/guid-file/route';
9+
import { ConnectedStorageOperationNames } from 'ember-osf-web/models/addon-operation-invocation';
10+
11+
interface RouteTestContext extends TestContext {
12+
route: GuidFileRoute;
13+
sandbox: sinon.SinonSandbox;
14+
}
15+
16+
module('Unit | Route | guid-file', function(hooks) {
17+
setupTest(hooks);
18+
setupMirage(hooks);
19+
20+
// Helper functions
21+
function createFileWithMetadata(
22+
target: any,
23+
provider: string,
24+
name = `${provider}-file.txt`,
25+
metadataOverrides: any = {},
26+
) {
27+
const file = server.create('file', {
28+
target,
29+
provider,
30+
name,
31+
});
32+
33+
server.create('custom-file-metadata-record', {
34+
id: file.id,
35+
...metadataOverrides,
36+
});
37+
38+
return file;
39+
}
40+
41+
function createNodeWithPermissions(permissions: Permission[] = [Permission.Read], traits: string[] = []) {
42+
return server.create('node', {
43+
currentUserPermissions: permissions,
44+
}, ...traits);
45+
}
46+
47+
function setupFeatures(context: RouteTestContext, features: Record<string, boolean> = {}) {
48+
const featuresService = context.owner.lookup('service:features');
49+
featuresService.setup(features);
50+
}
51+
52+
hooks.beforeEach(function(this: RouteTestContext) {
53+
this.sandbox = sinon.createSandbox();
54+
this.route = this.owner.lookup('route:guid-file');
55+
server.create('user', 'loggedIn');
56+
57+
const features = this.owner.lookup('service:features');
58+
features.setup({});
59+
});
60+
61+
hooks.afterEach(function(this: RouteTestContext) {
62+
this.sandbox.restore();
63+
});
64+
65+
test('it exists', function(this: RouteTestContext, assert) {
66+
assert.ok(this.route, 'Route exists');
67+
});
68+
69+
test('loads OSF storage file', async function(this: RouteTestContext, assert) {
70+
const node = createNodeWithPermissions([Permission.Read], ['withContributors', 'withAffiliatedInstitutions']);
71+
const file = createFileWithMetadata(node, 'osfstorage', 'test-file.txt', {
72+
title: 'Test Metadata Title',
73+
description: 'Test description',
74+
});
75+
76+
const model = await this.route.model({ guid: file.id });
77+
78+
assert.ok(model, 'Model loaded successfully');
79+
assert.equal(model?.constructor.name, 'OsfStorageFile', 'Correct OSF storage file type created');
80+
assert.equal(model?.fileModel.id, file.id, 'File model matches expected ID');
81+
assert.equal(this.route.metadata.id, file.id, 'Metadata loaded correctly');
82+
});
83+
84+
test('loads external storage files for all providers', async function(this: RouteTestContext, assert) {
85+
const providers = [
86+
{ provider: 'bitbucket', expectedClass: 'BitbucketFile' },
87+
{ provider: 'box', expectedClass: 'BoxFile' },
88+
{ provider: 'dataverse', expectedClass: 'DataverseFile' },
89+
{ provider: 'dropbox', expectedClass: 'DropboxFile' },
90+
{ provider: 'figshare', expectedClass: 'FigshareFile' },
91+
{ provider: 'github', expectedClass: 'GithubFile' },
92+
{ provider: 'gitlab', expectedClass: 'GitlabFile' },
93+
{ provider: 'googledrive', expectedClass: 'GoogleDriveFile' },
94+
{ provider: 'onedrive', expectedClass: 'OneDriveFile' },
95+
{ provider: 'owncloud', expectedClass: 'OwnCloudFile' },
96+
{ provider: 's3', expectedClass: 'S3File' },
97+
];
98+
99+
for (const { provider, expectedClass } of providers) {
100+
const node = createNodeWithPermissions();
101+
const file = createFileWithMetadata(node, provider);
102+
103+
const model = await this.route.model({ guid: file.id });
104+
105+
assert.ok(model, `${provider} file loaded successfully`);
106+
assert.equal(model?.constructor.name, expectedClass, `Correct ${provider} file type created`);
107+
assert.equal(model?.fileModel.id, file.id, `${provider} file model ID matches`);
108+
}
109+
});
110+
111+
test('loads service file when gravy_waffle feature is enabled', async function(this: RouteTestContext, assert) {
112+
setupFeatures(this, { gravy_waffle: true });
113+
114+
const node = createNodeWithPermissions([Permission.Admin]);
115+
const file = createFileWithMetadata(node, 'azureblobstorage', 'service-file.txt');
116+
const resourceReference = server.create('resource-reference', { id: node.id });
117+
118+
const azureblobstorage = server.create('external-storage-service', {
119+
id: 'azureblobstorage',
120+
displayName: 'Azure Blob Storage',
121+
supportedFeatures: [],
122+
});
123+
server.create('configured-storage-addon', {
124+
id: 'azureblobstorage',
125+
displayName: 'Azure Blob Storage',
126+
rootFolder: '/woot/',
127+
externalServiceName: 'azureblobstorage',
128+
externalStorageService: azureblobstorage,
129+
authorizedResource: resourceReference,
130+
connectedOperationNames: [
131+
ConnectedStorageOperationNames.HasRevisions,
132+
],
133+
});
134+
135+
const model = await this.route.model({ guid: file.id });
136+
137+
assert.ok(model, 'Model loaded successfully with gravy_waffle');
138+
assert.equal(model?.constructor?.name, 'ServiceFile', 'ServiceFile created when configured addon exists');
139+
assert.equal(model?.fileModel?.id, file.id, 'ServiceFile has correct file model');
140+
});
141+
142+
test('redirects to registration page when target is registration', async function(this: RouteTestContext, assert) {
143+
const registration = server.create('registration', {
144+
withdrawn: true,
145+
currentUserPermissions: [Permission.Read],
146+
});
147+
148+
const file = createFileWithMetadata(registration, 'osfstorage', 'registration-file.txt');
149+
150+
const transitionToStub = this.sandbox.stub(this.route, 'transitionTo');
151+
152+
await this.route.model({ guid: file.id });
153+
154+
assert.ok(
155+
(transitionToStub as any).calledWith('guid-registration', registration.id),
156+
'Redirects to registration page for withdrawn registration',
157+
);
158+
});
159+
160+
test('redirects to not-found for unknown provider', async function(this: RouteTestContext, assert) {
161+
const node = createNodeWithPermissions();
162+
const file = createFileWithMetadata(node, 'unknown-provider', 'unknown-file.txt');
163+
164+
const transitionToStub = this.sandbox.stub(this.route, 'transitionTo');
165+
166+
await this.route.model({ guid: file.id });
167+
168+
assert.ok(
169+
(transitionToStub as any).calledWith('not-found', file.id),
170+
'Redirects to not-found for unknown provider',
171+
);
172+
});
173+
174+
test('handles gravy_waffle feature disabled correctly', async function(this: RouteTestContext, assert) {
175+
setupFeatures(this, { gravy_waffle: false });
176+
177+
const node = createNodeWithPermissions();
178+
const file = createFileWithMetadata(node, 'github', 'feature-disabled-file.txt');
179+
180+
const model = await this.route.model({ guid: file.id });
181+
182+
assert.ok(model, 'Model loaded successfully');
183+
assert.equal(model?.constructor?.name, 'GithubFile', 'Uses provider-specific file when gravy_waffle disabled');
184+
});
185+
});

0 commit comments

Comments
 (0)