|
@@ -23,9 +23,18 @@ export default DS.JSONAPISerializer.extend({
|
|
internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
|
|
internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
|
|
requestType) {
|
|
requestType) {
|
|
if (payload.app) {
|
|
if (payload.app) {
|
|
- payload = payload.app;
|
|
|
|
|
|
+ payload = payload.app;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ var timeoutInSecs = -1;
|
|
|
|
+ var appExpiryTime = Converter.timeStampToDate(payload.finishedTime);
|
|
|
|
+ if (payload.timeouts && payload.timeouts.timeout && payload.timeouts.timeout[0]) {
|
|
|
|
+ timeoutInSecs = payload.timeouts.timeout[0].remainingTimeInSeconds;
|
|
|
|
+ if (timeoutInSecs > -1) {
|
|
|
|
+ appExpiryTime = Converter.isoDateToDate(payload.timeouts.timeout[0].expiryTime);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
var fixedPayload = {
|
|
var fixedPayload = {
|
|
id: id,
|
|
id: id,
|
|
type: primaryModelClass.modelName, // yarn-app
|
|
type: primaryModelClass.modelName, // yarn-app
|
|
@@ -58,7 +67,9 @@ export default DS.JSONAPISerializer.extend({
|
|
numAMContainerPreempted: payload.numAMContainerPreempted,
|
|
numAMContainerPreempted: payload.numAMContainerPreempted,
|
|
clusterUsagePercentage: payload.clusterUsagePercentage,
|
|
clusterUsagePercentage: payload.clusterUsagePercentage,
|
|
queueUsagePercentage: payload.queueUsagePercentage,
|
|
queueUsagePercentage: payload.queueUsagePercentage,
|
|
- currentAppAttemptId: payload.currentAppAttemptId
|
|
|
|
|
|
+ currentAppAttemptId: payload.currentAppAttemptId,
|
|
|
|
+ remainingTimeoutInSeconds: timeoutInSecs,
|
|
|
|
+ applicationExpiryTime: appExpiryTime
|
|
}
|
|
}
|
|
};
|
|
};
|
|
|
|
|
|
@@ -67,7 +78,7 @@ export default DS.JSONAPISerializer.extend({
|
|
|
|
|
|
normalizeSingleResponse(store, primaryModelClass, payload, id,
|
|
normalizeSingleResponse(store, primaryModelClass, payload, id,
|
|
requestType) {
|
|
requestType) {
|
|
- var p = this.internalNormalizeSingleResponse(store,
|
|
|
|
|
|
+ var p = this.internalNormalizeSingleResponse(store,
|
|
primaryModelClass, payload, id, requestType);
|
|
primaryModelClass, payload, id, requestType);
|
|
return { data: p };
|
|
return { data: p };
|
|
},
|
|
},
|
|
@@ -90,4 +101,4 @@ export default DS.JSONAPISerializer.extend({
|
|
|
|
|
|
return normalizedArrayResponse;
|
|
return normalizedArrayResponse;
|
|
}
|
|
}
|
|
-});
|
|
|
|
|
|
+});
|