Skip to content
This repository was archived by the owner on May 27, 2021. It is now read-only.

Commit 94a7304

Browse files
committed
Add deleted param to job
1 parent 6f3803b commit 94a7304

File tree

4 files changed

+24
-19
lines changed

4 files changed

+24
-19
lines changed

src/proxy/ResourceProxy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default class ResourceProxy extends SimpleResourceProxy {
7272
/**
7373
* Get target resource
7474
* @param {Number|String|Object} [id=] - The resource id to be requested
75-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
75+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
7676
* @returns {Promise<ResourceBase>} - Target resource
7777
* @throws {ApiError}
7878
*/

src/resources/Job.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ import DownloadedResource from './base/DownloadedResource';
3535
import CrudBase from './base/CrudBase';
3636
import JobResult from './JobResult';
3737
import JobRevision from './JobRevision';
38+
import RequestParameters from '../RequestParameters';
39+
import { encodeQueryString } from '../utils/requests';
3840

3941
export default class Job extends CrudBase {
4042
/**
@@ -94,10 +96,11 @@ export default class Job extends CrudBase {
9496

9597
/**
9698
* Download the job preview
99+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
97100
* @returns {Promise<DownloadedResource>} - Job result preview
98101
*/
99-
async downloadPreview () {
100-
const response = await this.api.axios.get(this.previewUrl, {
102+
async downloadPreview (deleted = RequestParameters.deleted) {
103+
const response = await this.api.axios.get(`${this.previewUrl}?${encodeQueryString({ deleted })}`, {
101104
responseType: 'arraybuffer',
102105
});
103106

@@ -106,10 +109,11 @@ export default class Job extends CrudBase {
106109

107110
/**
108111
* Get archive blob url
112+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
109113
* @returns {Promise<DownloadedResource>} - Job result output
110114
*/
111-
async downloadOutput () {
112-
const response = await this.api.axios.get(this.lastArchiveUrl, {
115+
async downloadOutput (deleted = RequestParameters.deleted) {
116+
const response = await this.api.axios.get(`${this.lastArchiveUrl}?${encodeQueryString({ deleted })}`, {
113117
responseType: 'arraybuffer',
114118
});
115119

@@ -118,11 +122,12 @@ export default class Job extends CrudBase {
118122

119123
/**
120124
* Get the remote output url
125+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
121126
* @returns {Promise<string>} - The url to the output
122127
* @throws {ApiError}
123128
*/
124-
async getOutputUrl () {
125-
const { data: { data } } = await this.api.axios.get(`${this.url}/output-url`);
129+
async getOutputUrl (deleted = RequestParameters.deleted) {
130+
const { data: { data } } = await this.api.axios.get(`${this.url}/output-url?${encodeQueryString({ deleted })}`);
126131

127132
return data.url;
128133
}

src/resources/JobResult.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default class JobResult extends ResourceBase {
7070

7171
/**
7272
* Get archive blob url
73-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
73+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
7474
* @returns {Promise<DownloadedResource>} - Job result output
7575
*/
7676
async downloadOutput (deleted = RequestParameters.deleted) {
@@ -91,7 +91,7 @@ export default class JobResult extends ResourceBase {
9191

9292
/**
9393
* Get the remote output url
94-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
94+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
9595
* @returns {Promise<string>} - The url to the output
9696
* @throws {ApiError}
9797
*/
@@ -111,7 +111,7 @@ export default class JobResult extends ResourceBase {
111111

112112
/**
113113
* Download the job result log
114-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
114+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
115115
* @returns {Promise<DownloadedResource>} - job result log
116116
*/
117117
async downloadLog (deleted = RequestParameters.deleted) {
@@ -132,7 +132,7 @@ export default class JobResult extends ResourceBase {
132132

133133
/**
134134
* Download the job preview
135-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
135+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
136136
* @returns {Promise<DownloadedResource>} - Job result preview
137137
*/
138138
async downloadPreview (deleted = RequestParameters.deleted) {
@@ -148,7 +148,7 @@ export default class JobResult extends ResourceBase {
148148
* This method is for internal use for our support team.
149149
*
150150
* @param {boolean} [value=true] - What to set the dealt-with value to
151-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
151+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
152152
*/
153153
async dealWith (value = true, deleted = RequestParameters.deleted) {
154154
value = Boolean(value);

src/resources/JobRevision.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default class JobRevision extends CrudBase {
6565

6666
/**
6767
* Get the job result
68-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
68+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
6969
* @returns {Promise<JobResult>} - The associated job result
7070
* @throws {ApiError}
7171
*/
@@ -97,7 +97,7 @@ export default class JobRevision extends CrudBase {
9797
* Save updated job revision
9898
* @param {Object} object - Map object
9999
* @param {Array<Layer>|Array<Number>|null} layers - Array containing all layers for this revision. If set to null the same layers will be used
100-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
100+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
101101
* @returns {Promise<JobRevision>} - New job revision
102102
* @throws {TypeError}
103103
* @throws {ApiError}
@@ -128,7 +128,7 @@ export default class JobRevision extends CrudBase {
128128

129129
/**
130130
* Get job object
131-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
131+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
132132
* @returns {Promise<Object>} - The map object
133133
* @throws {ApiError}
134134
* @todo document object format
@@ -142,7 +142,7 @@ export default class JobRevision extends CrudBase {
142142
/**
143143
* Build the revision
144144
* @param {String} callbackUrl - Optional callback url for when the job completes
145-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
145+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
146146
* @throws {ApiError}
147147
*/
148148
async build (callbackUrl, deleted = RequestParameters.deleted) {
@@ -151,7 +151,7 @@ export default class JobRevision extends CrudBase {
151151

152152
/**
153153
* Cancels a running job
154-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
154+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
155155
*/
156156
async cancel (deleted = RequestParameters.deleted) {
157157
await this.api.axios.post(`${this.url}/cancel?${encodeQueryString({ deleted })}`);
@@ -160,7 +160,7 @@ export default class JobRevision extends CrudBase {
160160
/**
161161
* Share the job revision
162162
* @param {String} visibility - See {@link JobShareVisibility}, either `private` or `organisation`
163-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
163+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
164164
* @returns {Promise<String>} - the share link
165165
* @throws {ApiError}
166166
*/
@@ -180,7 +180,7 @@ export default class JobRevision extends CrudBase {
180180
// noinspection JSCheckFunctionSignatures
181181
/**
182182
* Clones a job revision to the user requesting it
183-
* @param {String} deleted - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
183+
* @param {String} [deleted=RequestParameters.deleted] - Determines if the resource should be shown if deleted, requires special resource permissions. Possible values: only, none, all
184184
* @throws {ApiError}
185185
*/
186186
async clone (deleted = RequestParameters.deleted) {

0 commit comments

Comments
 (0)