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.

Sign up for GitHub

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

No operator action required issues #1040

Merged
merged 8 commits into from
Jun 25, 2021
Merged

No operator action required issues #1040

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
71a8681
Introduced new error code: ERR_INFRA_REQUEST_THROTTLING
grolu Jun 22, 2021
c885ac6
small text corrections
grolu Jun 22, 2021
c2d1ee4
Rm dedicated icon for temporary errors
grolu Jun 23, 2021
33e1b22
Update frontend/src/views/ShootList.vue
grolu Jun 23, 2021
21d2734
Apply suggestions from code review
grolu Jun 24, 2021
bfd7aa4
changes as discussed
grolu Jun 24, 2021
1b435c1
removed icon function
grolu Jun 24, 2021
3697542
Added ERR_RETRYABLE_INFRA_DEPENDENCIES to known errors
grolu Jun 25, 2021
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
17 changes: 7 additions & 10 deletions frontend/src/components/ShootMessageDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ SPDX-License-Identifier: Apache-2.0
<div v-for="(lastErrorDescription, index) in errorDescriptions" :key="index">
<v-divider v-if="index > 0" class="my-2"></v-divider>
<v-alert
v-for="({ description, userError, temporaryError, infraAccountError }) in lastErrorDescription.errorCodeObjects" :key="description"
v-for="errorCodeObject in lastErrorDescription.errorCodeObjects" :key="errorCodeObject.description"
color="error"
:icon="icon(userError, temporaryError)"
:prominent="!!userError ? true : false"
:icon="icon(errorCodeObject)"
:prominent="!!errorCodeObject.userError"
>
<h4 v-if="userError">Action required</h4>
<h4 v-if="errorCodeObject.userError">Action required</h4>
<span class="wrap">
<span v-if="infraAccountError">There is a problem with your secret
<span v-if="errorCodeObject.infraAccountError">There is a problem with your secret
<code>
<router-link v-if="canLinkToSecret"
:to="{ name: 'Secret', params: { name: secretBindingName, namespace: namespace } }"
Expand All @@ -84,7 +84,7 @@ SPDX-License-Identifier: Apache-2.0
</router-link>
<span v-else>{{secretBindingName}}</span>
</code>:</span>
{{description}}
{{errorCodeObject.description}}
</span>
</v-alert>
<ansi-text class="error--text" :text="lastErrorDescription.description"></ansi-text>
Expand Down Expand Up @@ -138,13 +138,10 @@ export default {
}
},
methods: {
icon (userError, temporaryError) {
icon ({ userError, temporaryError }) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to keep this method remove the unused temporaryError

if (userError) {
return 'mdi-account-alert'
}
if (temporaryError) {
return 'mdi-clock-alert'
}
return 'mdi-alert'
}
}
Expand Down
6 changes: 2 additions & 4 deletions frontend/src/components/ShootStatus.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ SPDX-License-Identifier: Apache-2.0
<div>
<span class="font-weight-bold">{{tooltip.title}}</span>
<span v-if="tooltip.progress" class="ml-1">({{tooltip.progress}}%)</span>
<div v-for="({ shortDescription, userError, temporaryError }) in tooltip.errorCodeObjects" :key="shortDescription">
<v-icon v-if="userError" class="mr-1" color="white" small>mdi-account-alert</v-icon>
<v-icon v-else-if="temporaryError" class="mr-1" color="white" small>mdi-clock-alert</v-icon>
<v-icon v-else class="mr-1" color="white" small>mdi-alert</v-icon>
<div v-for="({ shortDescription, userError }) in tooltip.errorCodeObjects" :key="shortDescription">
<v-icon v-if="userError" class="mr-1" color="white" small>{{ userError ? 'mdi-account-alert' : 'mdi-alert' }}</v-icon>
<span class="font-weight-bold text--lighten-2">{{shortDescription}}</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/utils/errorCodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ export function isUserError (errorCodesArray) {
return false
}

return find(objectsFromErrorCodes(errorCodesArray), { userError: true })
return !!find(objectsFromErrorCodes(errorCodesArray), 'userError')
}

export function isTemporaryError (errorCodesArray) {
if (isEmpty(errorCodesArray)) {
return false
}

return find(objectsFromErrorCodes(errorCodesArray), { temporaryError: true })
return !!find(objectsFromErrorCodes(errorCodesArray), 'temporaryError')
}

export function objectsFromErrorCodes (errorCodesArray) {
Expand Down