Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Include the region query param on the View Raw File link in the task fs explorer #8509

Merged
merged 2 commits into from
Jul 22, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ui/app/components/fs/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import classic from 'ember-classic-decorator';
@classNames('boxed-section', 'task-log')
export default class File extends Component {
@service token;
@service system;

'data-test-file-viewer' = true;

Expand Down Expand Up @@ -54,7 +55,11 @@ export default class File extends Component {
get catUrl() {
const taskUrlPrefix = this.taskState ? `${this.taskState.name}/` : '';
const encodedPath = encodeURIComponent(`${taskUrlPrefix}${this.file}`);
return `/v1/client/fs/cat/${this.allocation.id}?path=${encodedPath}`;
let apiPath = `/v1/client/fs/cat/${this.allocation.id}?path=${encodedPath}`;
if (this.system.shouldIncludeRegion) {
apiPath += `&region=${this.system.activeRegion}`;
}
return apiPath;
}

@computed('isLarge', 'mode')
Expand Down
29 changes: 28 additions & 1 deletion ui/tests/integration/fs/file-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,22 @@ module('Integration | Component | fs/file', function(hooks) {

hooks.beforeEach(function() {
this.server = new Pretender(function() {
this.get('/v1/regions', () => [200, {}, JSON.stringify(['default'])]);
this.get('/v1/agent/members', () => [
200,
{},
JSON.stringify({ ServerRegion: 'default', Members: [] }),
]);
this.get('/v1/regions', () => [200, {}, JSON.stringify(['default', 'region-2'])]);
this.get('/v1/client/fs/stream/:alloc_id', () => [200, {}, logEncode(['Hello World'], 0)]);
this.get('/v1/client/fs/cat/:alloc_id', () => [200, {}, 'Hello World']);
this.get('/v1/client/fs/readat/:alloc_id', () => [200, {}, 'Hello World']);
});
this.system = this.owner.lookup('service:system');
});

hooks.afterEach(function() {
this.server.shutdown();
window.localStorage.clear();
});

const commonTemplate = hbs`
Expand Down Expand Up @@ -145,6 +152,26 @@ module('Integration | Component | fs/file', function(hooks) {
);
});

test('The view raw button respects the active region', async function(assert) {
const region = 'region-2';
window.localStorage.nomadActiveRegion = region;

const props = makeProps(fileStat('image/png', 1234));
this.setProperties(props);

await this.system.get('regions');
await render(commonTemplate);

const rawLink = find('[data-test-log-action="raw"]');
assert.equal(
rawLink.getAttribute('href'),
`/v1/client/fs/cat/${props.allocation.id}?path=${encodeURIComponent(
`${props.taskState.name}/${props.file}`
)}&region=${region}`,
'Raw link href includes the active region from local storage'
);
});

test('The head and tail buttons are not shown when the file is small', async function(assert) {
const props = makeProps(fileStat('application/json', 5000));
this.setProperties(props);
Expand Down