@livepreso/api 6.54.0 → 6.55.1
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/.rush/temp/chunked-rush-logs/api.build.chunks.jsonl +5 -2
- package/.rush/temp/operation/build/all.log +5 -2
- package/.rush/temp/operation/build/error.log +3 -0
- package/.rush/temp/operation/build/log-chunks.jsonl +5 -2
- package/.rush/temp/operation/build/state.json +1 -1
- package/.rush/temp/shrinkwrap-deps.json +1 -0
- package/CHANGELOG.json +39 -1
- package/CHANGELOG.md +23 -2
- package/cjs/collections.js +0 -22
- package/cjs/collections.js.map +1 -1
- package/cjs/middlewares/base.js +1 -2
- package/cjs/middlewares/base.js.map +1 -1
- package/cjs/models/customer.js +2 -1
- package/cjs/models/customer.js.map +1 -1
- package/cjs/models/deck-layout.js +52 -0
- package/cjs/models/deck-layout.js.map +1 -0
- package/cjs/models/deck-version.js +43 -20
- package/cjs/models/deck-version.js.map +1 -1
- package/cjs/models/image.js +0 -2
- package/cjs/models/image.js.map +1 -1
- package/cjs/models/pack-diff.js +18 -9
- package/cjs/models/pack-diff.js.map +1 -1
- package/cjs/models/user.js +8 -3
- package/cjs/models/user.js.map +1 -1
- package/cjs/models.js +11 -0
- package/cjs/models.js.map +1 -1
- package/cjs/presentation/appointment-presentation.js +3 -1
- package/cjs/presentation/appointment-presentation.js.map +1 -1
- package/cjs/presentation/presentation-deck.js +6 -0
- package/cjs/presentation/presentation-deck.js.map +1 -1
- package/cjs/presentation/presentation-section.js +7 -7
- package/cjs/presentation/presentation-section.js.map +1 -1
- package/cjs/presentation/presentation-section.spec.js +4 -4
- package/cjs/presentation/presentation-section.spec.js.map +1 -1
- package/cjs/presentation/presentation-slide.js +2 -2
- package/cjs/presentation/presentation-slide.js.map +1 -1
- package/cjs/sync.js +17 -9
- package/cjs/sync.js.map +1 -1
- package/package.json +3 -3
- package/rush-logs/api.build.error.log +3 -0
- package/rush-logs/api.build.log +5 -2
- package/src/collections.js +0 -2
- package/src/middlewares/base.js +1 -2
- package/src/models/customer.js +1 -0
- package/src/models/deck-layout.js +54 -0
- package/src/models/deck-version.js +10 -12
- package/src/models/image.js +0 -3
- package/src/models/pack-diff.js +14 -9
- package/src/models/user.js +8 -1
- package/src/models.js +1 -0
- package/src/presentation/appointment-presentation.js +1 -0
- package/src/presentation/presentation-deck.js +6 -0
- package/src/presentation/presentation-section.js +7 -7
- package/src/presentation/presentation-section.spec.js +4 -4
- package/src/presentation/presentation-slide.js +2 -2
- package/src/sync.js +16 -12
- package/.rush/temp/1aebf46f78ad5c45f82f8147751890adb37bef9d.log +0 -10
- package/.rush/temp/256021b5963b4c0221d3dec247b697b9691a9b2c.log +0 -10
- package/.rush/temp/2a322f00f12cf9d1e64afe81275cc78d01c49050.log +0 -10
- package/.rush/temp/30061f1865447dcbb3f20a305061205f3dbe6091.log +0 -10
- package/.rush/temp/3cdc82c352e8ed90607952873f3aa4c200490874.log +0 -10
- package/.rush/temp/45522aea0dee8cb2be1a53248ba45bd235743b43.log +0 -10
- package/.rush/temp/5489ab737e406518983c16c57fc3e1edc07c0341.log +0 -10
- package/.rush/temp/58fcbb7f15a76326d40e0839ab179755da82a891.log +0 -10
- package/.rush/temp/5bc0bba70b733baa4dd976667ba0a1386e516186.log +0 -10
- package/.rush/temp/64f1bb696f8d7d7e72907b80df316b127f72e23e.log +0 -10
- package/.rush/temp/6f640f951414ea68adb65c17e4ed7527cde54faf.log +0 -10
- package/.rush/temp/7c7b958682d4ab5697530be47d0aac62efe1adf1.log +0 -10
- package/.rush/temp/82bfb987463fbcfebf04022e6ed00015c73879c8.log +0 -10
- package/.rush/temp/844034aa6e542115075e8f3dc5ffc640973e0064.log +0 -10
- package/.rush/temp/8b42957a7c15da1f29cb57bee125f13affa70dca.log +0 -10
- package/.rush/temp/924652444ab5a6063f328a2217123a2227058896.log +0 -10
- package/.rush/temp/9f2030f96d62f3e38052e35201819a216566f14f.log +0 -10
- package/.rush/temp/a769db9d81a23000c0e9b1bf4f1a9a9e721d0d7c.log +0 -10
- package/.rush/temp/a87d3a8b4ece87ec66f27c86226a9f205617681f.log +0 -10
- package/.rush/temp/bb7a5bdcc4af4ad1507f81f33774b31f5b4e4fb7.log +0 -10
- package/.rush/temp/build-cache-tar.log +0 -7
- package/.rush/temp/c20e29ccaaa9231b38a28bb24451b4ce7562cdc0.log +0 -10
- package/.rush/temp/chunked-rush-logs/api.test.chunks.jsonl +0 -21
- package/.rush/temp/e21303db8f59b4625fd184c9114377d781fd24f8.log +0 -10
- package/.rush/temp/e6d303862765b6a5f41dd483d0f9ae083a1fae10.log +0 -10
- package/.rush/temp/eaf69fbc059d2f1258d7569136180d4a1d3c7072.log +0 -10
- package/.rush/temp/f85d279e2674966daaec83e1c3986a96f86ef304.log +0 -10
- package/.rush/temp/fc0a332c5b34c6b90006850cf2d93a48fb4b9a6e.log +0 -10
- package/.rush/temp/operation/test/all.log +0 -21
- package/.rush/temp/operation/test/log-chunks.jsonl +0 -21
- package/.rush/temp/operation/test/state.json +0 -3
- package/.rush/temp/package-deps_build.json +0 -185
- package/api.build.log +0 -9
- package/api.test.cache.log +0 -1
- package/api.test.log +0 -19
- package/cjs/collections/created-assets.js +0 -26
- package/cjs/collections/created-assets.js.map +0 -1
- package/cjs/collections/deleted-assets.js +0 -26
- package/cjs/collections/deleted-assets.js.map +0 -1
- package/rush-logs/api.test.cache.log +0 -1
- package/rush-logs/api.test.log +0 -21
- package/src/collections/created-assets.js +0 -26
- package/src/collections/deleted-assets.js +0 -26
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { BaseModel } from "./base.js";
|
|
2
|
+
import { register } from "../state-register.js";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* @constructor
|
|
6
|
+
* @alias models.DeckLayoutModel
|
|
7
|
+
* @extends models.BaseModel
|
|
8
|
+
*/
|
|
9
|
+
export const DeckLayoutModel = BaseModel.extend(
|
|
10
|
+
/** @lends models.DeckLayoutModel# */ {
|
|
11
|
+
modelName: "deck-layout",
|
|
12
|
+
|
|
13
|
+
props: {
|
|
14
|
+
items: "object",
|
|
15
|
+
},
|
|
16
|
+
|
|
17
|
+
fetch(opts) {
|
|
18
|
+
return BaseModel.prototype.fetch.call(this, opts).tap((tags) => {
|
|
19
|
+
this.items = tags;
|
|
20
|
+
});
|
|
21
|
+
},
|
|
22
|
+
|
|
23
|
+
toJSON() {
|
|
24
|
+
return this.items;
|
|
25
|
+
},
|
|
26
|
+
|
|
27
|
+
toServer() {
|
|
28
|
+
return this.items;
|
|
29
|
+
},
|
|
30
|
+
|
|
31
|
+
save() {
|
|
32
|
+
return BaseModel.prototype.save.call(this).tap((tags) => {
|
|
33
|
+
this.items = tags;
|
|
34
|
+
});
|
|
35
|
+
},
|
|
36
|
+
|
|
37
|
+
getPlainURL() {
|
|
38
|
+
const _url = BaseModel.prototype.getPlainURL.call(this);
|
|
39
|
+
|
|
40
|
+
// Because the URL has {id} in it, the matcher replaces the deck id
|
|
41
|
+
// with the value but also automatically adds it as a detail ID (which
|
|
42
|
+
// doesn't make sense here). We strip the extra ID off here.
|
|
43
|
+
//
|
|
44
|
+
// Ie the default plain URL would look like:
|
|
45
|
+
// /api/decks/{id}/layout/{id}/ and this splitting gives us the correct
|
|
46
|
+
// /api/decks/{id}/layout/ instead.
|
|
47
|
+
return _url.split("/").slice(0, -2).concat([""]).join("/");
|
|
48
|
+
},
|
|
49
|
+
},
|
|
50
|
+
);
|
|
51
|
+
|
|
52
|
+
DeckLayoutModel.canBeEmpty = true;
|
|
53
|
+
|
|
54
|
+
register("DeckLayoutModel", DeckLayoutModel);
|
|
@@ -7,6 +7,7 @@ import "./manifest-json.js";
|
|
|
7
7
|
|
|
8
8
|
import { Auth } from "../auth.js";
|
|
9
9
|
import { BaseModel } from "./base.js";
|
|
10
|
+
import { DeckLayoutModel } from "./deck-layout.js";
|
|
10
11
|
import { DeckVersionScreenshotCollection } from "../collections/deck-version-screenshots.js";
|
|
11
12
|
import Promise from "bluebird";
|
|
12
13
|
import { TemplateCollection } from "../collections.js";
|
|
@@ -225,7 +226,7 @@ export const DeckVersionModel = BaseModel.extend(
|
|
|
225
226
|
);
|
|
226
227
|
},
|
|
227
228
|
|
|
228
|
-
fetchLayout: function (presetId, scenarioID) {
|
|
229
|
+
fetchLayout: async function (presetId, scenarioID) {
|
|
229
230
|
let queryParams = { version: this.version };
|
|
230
231
|
if (presetId) {
|
|
231
232
|
queryParams.preset_id = presetId;
|
|
@@ -238,18 +239,15 @@ export const DeckVersionModel = BaseModel.extend(
|
|
|
238
239
|
return Promise.reject(new Error("DeckVersion has no ID."));
|
|
239
240
|
}
|
|
240
241
|
|
|
241
|
-
const
|
|
242
|
+
const layout = new DeckLayoutModel(
|
|
243
|
+
{ id: this.deck.id },
|
|
244
|
+
{
|
|
245
|
+
data: queryParams,
|
|
246
|
+
},
|
|
247
|
+
);
|
|
248
|
+
await layout.fetch();
|
|
242
249
|
|
|
243
|
-
return
|
|
244
|
-
.get(path)
|
|
245
|
-
.set(Auth.headers)
|
|
246
|
-
.query(queryParams)
|
|
247
|
-
.then((res) => {
|
|
248
|
-
if (!res.ok) {
|
|
249
|
-
return Promise.reject(res);
|
|
250
|
-
}
|
|
251
|
-
return res.body;
|
|
252
|
-
});
|
|
250
|
+
return layout.toJSON();
|
|
253
251
|
},
|
|
254
252
|
|
|
255
253
|
toServer() {
|
package/src/models/image.js
CHANGED
|
@@ -50,9 +50,6 @@ export const ImageModel = BaseModel.extend(
|
|
|
50
50
|
})
|
|
51
51
|
.then((blob) => {
|
|
52
52
|
const file = new File([blob], `image.${fileEnd}`, { type: fileType });
|
|
53
|
-
const formData = new FormData();
|
|
54
|
-
formData.append("image_original", file);
|
|
55
|
-
|
|
56
53
|
return this.uploadFile(file);
|
|
57
54
|
});
|
|
58
55
|
},
|
package/src/models/pack-diff.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import "./pack.js";
|
|
2
|
-
import "../collections
|
|
3
|
-
import "../collections/deleted-assets.js";
|
|
2
|
+
import { AssetCollection } from "../collections.js";
|
|
4
3
|
|
|
5
4
|
import { BaseModel } from "./base.js";
|
|
6
5
|
import { register } from "../state-register.js";
|
|
@@ -29,13 +28,19 @@ export const PackDiffModel = BaseModel.extend(
|
|
|
29
28
|
modified_date: "date",
|
|
30
29
|
},
|
|
31
30
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
31
|
+
derived: {
|
|
32
|
+
created: {
|
|
33
|
+
fn: function () {
|
|
34
|
+
const url = `${this.getPlainURL()}created/`;
|
|
35
|
+
return new AssetCollection({ url });
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
deleted: {
|
|
39
|
+
fn: function () {
|
|
40
|
+
const url = `${this.getPlainURL()}deleted/`;
|
|
41
|
+
return new AssetCollection({ url });
|
|
42
|
+
},
|
|
43
|
+
},
|
|
39
44
|
},
|
|
40
45
|
|
|
41
46
|
/**
|
package/src/models/user.js
CHANGED
|
@@ -117,17 +117,23 @@ export const UserModel = BaseModel.extend(
|
|
|
117
117
|
};
|
|
118
118
|
|
|
119
119
|
const presomanager = {
|
|
120
|
+
// Can create or delete slides
|
|
120
121
|
isGlobalTemporarySlideManager:
|
|
121
122
|
this.actions.indexOf("Manage Temporary Slides") > -1,
|
|
122
123
|
isTeamTemporarySlideManager:
|
|
123
124
|
this.actions.indexOf("Manage Team Temporary Slides") > -1,
|
|
124
125
|
|
|
126
|
+
// Can update content within a slide (text, images, etc.)
|
|
127
|
+
isContentAdmin: this.actions.indexOf("Administer Content") > -1,
|
|
125
128
|
isTeamContentManager:
|
|
126
129
|
this.actions.indexOf("Manage Team Editable Text") > -1,
|
|
127
|
-
isContentCreator: this.actions.indexOf("Create Content") > -1,
|
|
128
130
|
|
|
129
131
|
canAddGlobalNotes: this.actions.indexOf("Manage Notes") > -1,
|
|
130
132
|
canAddTeamNotes: this.actions.indexOf("Manage Team Notes") > -1,
|
|
133
|
+
|
|
134
|
+
// This is someone that uses the CDK/publishes content, not someone
|
|
135
|
+
// that edits content.
|
|
136
|
+
isContentCreator: this.actions.indexOf("Create Content") > -1,
|
|
131
137
|
};
|
|
132
138
|
|
|
133
139
|
presomanager.canModifyNotes =
|
|
@@ -139,6 +145,7 @@ export const UserModel = BaseModel.extend(
|
|
|
139
145
|
|
|
140
146
|
presomanager.isPresoManagerUser =
|
|
141
147
|
presomanager.canModifyTemporarySlides ||
|
|
148
|
+
presomanager.canModifyNotes ||
|
|
142
149
|
presomanager.canModifyContent;
|
|
143
150
|
|
|
144
151
|
presomanager.canModifyContent =
|
package/src/models.js
CHANGED
|
@@ -21,6 +21,7 @@ export * from "./models/deck";
|
|
|
21
21
|
export * from "./models/deck-tags";
|
|
22
22
|
export * from "./models/deck-version";
|
|
23
23
|
export * from "./models/deck-version-screenshot";
|
|
24
|
+
export * from "./models/deck-layout";
|
|
24
25
|
export * from "./models/dispatch";
|
|
25
26
|
export * from "./models/dispatch-preview";
|
|
26
27
|
export * from "./models/envs.js";
|
|
@@ -60,6 +60,9 @@ export const PresentationDeck = BasePresentationModel.extend(
|
|
|
60
60
|
title: "string",
|
|
61
61
|
usesImpostorSections: "boolean",
|
|
62
62
|
editable: "boolean",
|
|
63
|
+
titleEditable: "boolean",
|
|
64
|
+
notesEditable: "boolean",
|
|
65
|
+
tagsEditable: "boolean",
|
|
63
66
|
tags: "array",
|
|
64
67
|
version: "number",
|
|
65
68
|
namespacedKey: "string",
|
|
@@ -159,6 +162,9 @@ PresentationDeck.createFromDeckVersion = function (
|
|
|
159
162
|
common: deckVersionModel.manifest_json.common,
|
|
160
163
|
title: deckVersionModel.deck.title,
|
|
161
164
|
editable: tags.indexOf("editable") > -1,
|
|
165
|
+
titleEditable: false,
|
|
166
|
+
notesEditable: true,
|
|
167
|
+
tagsEditable: true,
|
|
162
168
|
tags,
|
|
163
169
|
version: deckVersionModel.version,
|
|
164
170
|
usesImpostorSections: isImpostorDeck(deckVersionModel),
|
|
@@ -316,8 +316,8 @@ PresentationSection.createFromAdjunctSection = function (
|
|
|
316
316
|
deckversion: deckVersionModel.id,
|
|
317
317
|
editable: false,
|
|
318
318
|
titleEditable: false,
|
|
319
|
-
notesEditable:
|
|
320
|
-
tagsEditable:
|
|
319
|
+
notesEditable: true,
|
|
320
|
+
tagsEditable: true,
|
|
321
321
|
index: config.sequence,
|
|
322
322
|
sequence: config.sequence,
|
|
323
323
|
visible: config.visible,
|
|
@@ -419,8 +419,8 @@ PresentationSection.createFromImpostorSection = function (
|
|
|
419
419
|
deckversion: slideModel.section.deckversion.id,
|
|
420
420
|
editable: tags.indexOf("editable") > -1,
|
|
421
421
|
titleEditable: false,
|
|
422
|
-
notesEditable:
|
|
423
|
-
tagsEditable:
|
|
422
|
+
notesEditable: true,
|
|
423
|
+
tagsEditable: true,
|
|
424
424
|
tags,
|
|
425
425
|
index: config.sequence,
|
|
426
426
|
sequence: config.sequence,
|
|
@@ -484,7 +484,7 @@ PresentationSection.createFromManifestImpostor = function (
|
|
|
484
484
|
const slides = section.slides || [];
|
|
485
485
|
section.slides = null;
|
|
486
486
|
|
|
487
|
-
const projectSection = project?.sections.find((s) => s.key ===
|
|
487
|
+
const projectSection = project?.sections.find((s) => s.key === section.key);
|
|
488
488
|
|
|
489
489
|
const presentationSection = new PresentationSection({
|
|
490
490
|
id: parseInt(_.uniqueId(), 10),
|
|
@@ -631,8 +631,8 @@ PresentationSection.createFromTemplate = function (template, index, minID = 0) {
|
|
|
631
631
|
namespacedKey: templateModel.namespaced_key,
|
|
632
632
|
editable: false,
|
|
633
633
|
titleEditable: false,
|
|
634
|
-
notesEditable:
|
|
635
|
-
tagsEditable:
|
|
634
|
+
notesEditable: true,
|
|
635
|
+
tagsEditable: true,
|
|
636
636
|
});
|
|
637
637
|
|
|
638
638
|
return presentationSection;
|
|
@@ -208,8 +208,8 @@ describe("#createFromAdjunctSection", () => {
|
|
|
208
208
|
cmsvalkey_set: [],
|
|
209
209
|
editable: false,
|
|
210
210
|
titleEditable: false,
|
|
211
|
-
notesEditable:
|
|
212
|
-
tagsEditable:
|
|
211
|
+
notesEditable: true,
|
|
212
|
+
tagsEditable: true,
|
|
213
213
|
};
|
|
214
214
|
|
|
215
215
|
expect(presentationSection.toJSON()).toEqual(expected);
|
|
@@ -319,8 +319,8 @@ describe("#createFromImpostorSection", () => {
|
|
|
319
319
|
deckversion: 3,
|
|
320
320
|
editable: false,
|
|
321
321
|
titleEditable: false,
|
|
322
|
-
notesEditable:
|
|
323
|
-
tagsEditable:
|
|
322
|
+
notesEditable: true,
|
|
323
|
+
tagsEditable: true,
|
|
324
324
|
html: "https://staging-test-cdn.salespreso.com/media/pack/427/assets/sections/test-deck/slides/agenda/index.html",
|
|
325
325
|
id: 23898,
|
|
326
326
|
impostor: true,
|
|
@@ -370,8 +370,8 @@ PresentationSlide.createFromManifestJSON = function (
|
|
|
370
370
|
key: slideKey,
|
|
371
371
|
editable: false,
|
|
372
372
|
titleEditable: false,
|
|
373
|
-
notesEditable:
|
|
374
|
-
tagsEditable:
|
|
373
|
+
notesEditable: true,
|
|
374
|
+
tagsEditable: true,
|
|
375
375
|
sequence: manifestJSON.ordering[key],
|
|
376
376
|
thumbnail: null,
|
|
377
377
|
custom: false,
|
package/src/sync.js
CHANGED
|
@@ -40,7 +40,7 @@ export const buildURL = function ({ method, model }) {
|
|
|
40
40
|
return url;
|
|
41
41
|
};
|
|
42
42
|
|
|
43
|
-
export const sync = function (method) {
|
|
43
|
+
export const sync = function (method, model, defaultOpts) {
|
|
44
44
|
const syncArguments = arguments;
|
|
45
45
|
|
|
46
46
|
if (method === "read") {
|
|
@@ -52,18 +52,19 @@ export const sync = function (method) {
|
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
54
|
|
|
55
|
-
return Promise.all(syncActions).then(() => {
|
|
56
|
-
|
|
55
|
+
return Promise.all(syncActions).then((...newOpts) => {
|
|
56
|
+
const joinedOpts = _.merge({}, defaultOpts, ...newOpts.flat());
|
|
57
|
+
return ajaxSync.call(this, method, model, joinedOpts);
|
|
57
58
|
});
|
|
58
59
|
}
|
|
59
|
-
return ajaxSync.
|
|
60
|
+
return ajaxSync.call(this, method, model, defaultOpts);
|
|
60
61
|
};
|
|
61
62
|
|
|
62
63
|
export const ajaxSync = function (method, model, options) {
|
|
63
64
|
const type = methodMap[method];
|
|
64
65
|
|
|
65
66
|
// Default options, unless specified.
|
|
66
|
-
defaults(options ||
|
|
67
|
+
defaults(options || {}, {
|
|
67
68
|
emulateHTTP: false,
|
|
68
69
|
emulateJSON: false,
|
|
69
70
|
});
|
|
@@ -118,7 +119,7 @@ export const ajaxSync = function (method, model, options) {
|
|
|
118
119
|
|
|
119
120
|
middlewares.forEach((middleware) => {
|
|
120
121
|
if (middleware.preflight) {
|
|
121
|
-
middleware.preflight(request);
|
|
122
|
+
middleware.preflight(request, model, options);
|
|
122
123
|
}
|
|
123
124
|
});
|
|
124
125
|
|
|
@@ -155,10 +156,10 @@ export const ajaxSync = function (method, model, options) {
|
|
|
155
156
|
|
|
156
157
|
// TODO: Remove me when this can be moved... for now this removal is quite a complex
|
|
157
158
|
// process.
|
|
158
|
-
if (options.
|
|
159
|
+
if (options.cachedResponse) {
|
|
159
160
|
return Promise.resolve(options.cachedResponse)
|
|
160
161
|
.then(getNextMiddleware(request))
|
|
161
|
-
.then(
|
|
162
|
+
.then((response) => {
|
|
162
163
|
if (!response.data) {
|
|
163
164
|
response.data = JSON.parse(response.text);
|
|
164
165
|
}
|
|
@@ -173,7 +174,7 @@ export const ajaxSync = function (method, model, options) {
|
|
|
173
174
|
return response.data;
|
|
174
175
|
});
|
|
175
176
|
})
|
|
176
|
-
.catch(
|
|
177
|
+
.catch((response) => {
|
|
177
178
|
return Promise.each(middlewares, (middleware) => {
|
|
178
179
|
return middleware.error(response, model);
|
|
179
180
|
}).then(() => {
|
|
@@ -189,9 +190,12 @@ export const ajaxSync = function (method, model, options) {
|
|
|
189
190
|
request
|
|
190
191
|
// Force a timeout on every request. Intermittent connections
|
|
191
192
|
// can have the request continue trying for minutes otherwise.
|
|
192
|
-
|
|
193
|
+
// 60 seconds is the timeout the server has, so we go for 65 seconds,
|
|
194
|
+
// so we give the chance to the server to time out first - helps with
|
|
195
|
+
// debugging.
|
|
196
|
+
.timeout(65 * 1000)
|
|
193
197
|
.then(getNextMiddleware(request))
|
|
194
|
-
.then(
|
|
198
|
+
.then((response) => {
|
|
195
199
|
let data;
|
|
196
200
|
try {
|
|
197
201
|
data = JSON.parse(response.text);
|
|
@@ -223,7 +227,7 @@ export const ajaxSync = function (method, model, options) {
|
|
|
223
227
|
}
|
|
224
228
|
throw e;
|
|
225
229
|
})
|
|
226
|
-
.catch(
|
|
230
|
+
.catch((response) => {
|
|
227
231
|
return Promise.each(middlewares, (middleware) => {
|
|
228
232
|
return middleware.error(response);
|
|
229
233
|
}).then(() => {
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Jul 27 2022 10:27:08 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/1aebf46f78ad5c45f82f8147751890adb37bef9d"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Fri May 06 2022 15:04:15 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/256021b5963b4c0221d3dec247b697b9691a9b2c"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Thu May 19 2022 15:05:38 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/2a322f00f12cf9d1e64afe81275cc78d01c49050"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 02 2022 11:57:30 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/30061f1865447dcbb3f20a305061205f3dbe6091.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Thu Aug 18 2022 10:29:50 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/3cdc82c352e8ed90607952873f3aa4c200490874"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Mon May 09 2022 09:14:42 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/45522aea0dee8cb2be1a53248ba45bd235743b43.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Jul 20 2022 14:55:42 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/5489ab737e406518983c16c57fc3e1edc07c0341.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 02 2022 11:59:28 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/58fcbb7f15a76326d40e0839ab179755da82a891.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Thu May 19 2022 11:32:27 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/5bc0bba70b733baa4dd976667ba0a1386e516186"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 02 2022 11:38:17 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/64f1bb696f8d7d7e72907b80df316b127f72e23e.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Thu Apr 14 2022 14:28:50 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/6f640f951414ea68adb65c17e4ed7527cde54faf.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 02 2022 12:09:00 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/7c7b958682d4ab5697530be47d0aac62efe1adf1.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 30 2022 17:11:25 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/82bfb987463fbcfebf04022e6ed00015c73879c8.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Thu May 19 2022 15:10:22 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/844034aa6e542115075e8f3dc5ffc640973e0064"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 02 2022 11:32:11 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/8b42957a7c15da1f29cb57bee125f13affa70dca.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Fri Sep 02 2022 15:29:16 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/924652444ab5a6063f328a2217123a2227058896.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Tue Jun 13 2023 13:40:11 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/9f2030f96d62f3e38052e35201819a216566f14f.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 02 2022 11:23:03 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/a769db9d81a23000c0e9b1bf4f1a9a9e721d0d7c.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed May 18 2022 10:30:13 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -c -f /home/adam/Programming/work/livepreso/common/temp/build-cache/a87d3a8b4ece87ec66f27c86226a9f205617681f.temp -z --files-from=-"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Wed Mar 02 2022 11:24:53 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/bb7a5bdcc4af4ad1507f81f33774b31f5b4e4fb7"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
Start time: Mon Dec 06 2021 14:47:24 GMT+1100 (Australian Eastern Daylight Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/072ab920f9ddebf006639da2072a348b73b25010"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
5
|
-
======== END PROCESS OUTPUT ========
|
|
6
|
-
|
|
7
|
-
Exited with code "0"
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
Start time: Tue May 31 2022 09:13:07 GMT+1000 (Australian Eastern Standard Time)
|
|
2
|
-
Invoking "/usr/bin/tar -x -m -f /home/adam/Programming/work/livepreso/common/temp/build-cache/c20e29ccaaa9231b38a28bb24451b4ce7562cdc0"
|
|
3
|
-
|
|
4
|
-
======= BEGIN PROCESS INPUT ======
|
|
5
|
-
|
|
6
|
-
======== END PROCESS INPUT =======
|
|
7
|
-
======= BEGIN PROCESS OUTPUT =======
|
|
8
|
-
======== END PROCESS OUTPUT ========
|
|
9
|
-
|
|
10
|
-
Exited with code "0"
|