@@ -90,51 +90,44 @@ export default function DefinitionOutdated(props) {
90
90
*/
91
91
function showdiff ( ) {
92
92
setIsRendering ( true ) ;
93
- const promisedServices = ServiceCatalog . searchServiceByKey ( api . serviceInfo . key ) ;
94
- promisedServices . then ( ( data ) => {
95
- return ServiceCatalog . getServiceDefinition ( data . body . list [ 0 ] . id ) . then ( ( file ) => {
96
- api . getSwagger ( api . id ) . then ( ( resp ) => {
97
- setOldDefinition ( JSON . stringify ( resp . obj , null , 2 ) ) ;
93
+ const promisedNewServiceDef = ServiceCatalog . searchServiceByKey ( api . serviceInfo . key ) ;
94
+ const promisedOldServiceDef = api . getSwagger ( api . id ) ;
95
+ Promise . all ( [ promisedNewServiceDef , promisedOldServiceDef ] )
96
+ . then ( ( response ) => {
97
+ const newServiceDef = response [ 0 ] ;
98
+ const oldServiceDef = response [ 1 ] ;
99
+ return ServiceCatalog . getServiceDefinition ( newServiceDef . body . list [ 0 ] . id ) . then ( ( file ) => {
98
100
setNewDefinition ( JSON . stringify ( file , null , 2 ) ) ;
101
+ setOldDefinition ( JSON . stringify ( oldServiceDef . obj , null , 2 ) ) ;
99
102
} ) . catch ( ( error ) => {
100
103
if ( error . response ) {
101
104
Alert . error ( error . response . body . description ) ;
102
105
} else {
103
106
Alert . error (
104
107
< FormattedMessage
105
- id = 'Apis.Details.APIDefinition.DefinitionOutdated.outdated .definition.error'
106
- defaultMessage = 'Something went wrong while getting the outdated API definition.'
108
+ id = 'Apis.Details.APIDefinition.DefinitionOutdated.new.api .definition.error'
109
+ defaultMessage = 'Something went wrong while retrieving new API definition.'
107
110
/> ,
108
111
) ;
109
112
}
110
- } ) . finally ( ( ) => {
111
- setShowDiff ( true ) ;
112
- setIsRendering ( false ) ;
113
+ console . error ( error ) ;
113
114
} ) ;
114
115
} ) . catch ( ( error ) => {
115
116
if ( error . response ) {
116
117
Alert . error ( error . response . body . description ) ;
117
118
} else {
118
119
Alert . error (
119
120
< FormattedMessage
120
- id = 'Apis.Details.APIDefinition.DefinitionOutdated.new.api.definition .error'
121
- defaultMessage = 'Something went wrong while getting the new API definition. '
121
+ id = 'Apis.Details.APIDefinition.DefinitionOutdated.service.retrieve .error'
122
+ defaultMessage = 'Something went wrong while rendering diff for API Definition '
122
123
/> ,
123
124
) ;
124
125
}
126
+ console . error ( error ) ;
127
+ } ) . finally ( ( ) => {
128
+ setShowDiff ( true ) ;
129
+ setIsRendering ( false ) ;
125
130
} ) ;
126
- } ) . catch ( ( error ) => {
127
- if ( error . response ) {
128
- Alert . error ( error . response . body . description ) ;
129
- } else {
130
- Alert . error (
131
- < FormattedMessage
132
- id = 'Apis.Details.APIDefinition.DefinitionOutdated.service.retrieve.error'
133
- defaultMessage = 'Something went wrong while retrieving service information'
134
- /> ,
135
- ) ;
136
- }
137
- } ) ;
138
131
}
139
132
140
133
const hideDiff = ( ) => {
0 commit comments