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

fix: Merge meeds-io/MIPs#99 : update usage of v-alert to use the common method - EXO-67165 #55

Merged
merged 2 commits into from
Oct 28, 2023
Merged

fix: Merge meeds-io/MIPs#99 : update usage of v-alert to use the common method - EXO-67165 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7160576
fix: Merge meeds-io/MIPs#99 : update usage of v-alert to use the comm…
rdenarie Oct 25, 2023
e06daf3
fix
rdenarie Oct 25, 2023
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
51 changes: 15 additions & 36 deletions ...main/webapp/javascript/automatic-translation/components/ActivityCommentTranslatedBody.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,21 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<template>
<div>
<v-alert
v-model="alert"
:type="type"
dismissible>
{{ message }}
</v-alert>
<div
v-if="isTranslatedBodyNotEmpty && !translationHidden">
<dynamic-html-element
v-sanitized-html="translatedBody"
:element="element"
class="reset-style-box text-break overflow-hidden font-italic text-light-color translationContent"
dir="auto" />
<div
v-if="isTranslatedBodyNotEmpty && !translationHidden">
<dynamic-html-element
v-sanitized-html="translatedBody"
:element="element"
class="reset-style-box text-break overflow-hidden font-italic text-light-color translationContent"
dir="auto" />
<div
class="font-italic text-light-color clickable caption"
:class="$vuetify.rtl ? 'float-left' : 'float-right'"
@click="hideTranslation">
<v-icon size="12">mdi-translate</v-icon>
<span>
{{ $t('automaticTranslation.hideTranslation') }}
</span>
</div>
class="font-italic text-light-color clickable caption"
:class="$vuetify.rtl ? 'float-left' : 'float-right'"
@click="hideTranslation">
<v-icon size="12">mdi-translate</v-icon>
<span>
{{ $t('automaticTranslation.hideTranslation') }}
</span>
</div>
</div>
</template>
Expand All @@ -61,9 +53,6 @@ export default {
data: () => ({
translatedBody: null,
translationHidden: true,
alert: false,
type: '',
message: ''
}),
computed: {
isTranslatedBodyNotEmpty() {
Expand All @@ -87,10 +76,7 @@ export default {
});
document.addEventListener('activity-translation-error', (event) => {
if (event.detail.id === this.activity.id) {
this.displayMessage({
type: 'error',
message: this.$t('automaticTranslation.errorTranslation')
});
this.$root.$emit('alert-message', this.$t('automaticTranslation.errorTranslation'), 'error');
}
});
this.retrieveCommentProperties();
Expand All @@ -111,13 +97,6 @@ export default {
this.translationHidden=false;
this.$el.parentNode.parentNode.firstChild.classList.add('hide');
},
displayMessage(message) {
this.message=message.message;
this.type=message.type;
this.alert = true;
window.setTimeout(() => this.alert = false, 5000);
}

},
};
</script>
56 changes: 18 additions & 38 deletions ...ps/src/main/webapp/javascript/automatic-translation/components/ActivityTranslatedBody.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,25 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<template>
<div>
<v-alert
v-model="alert"
:type="type"
dismissible>
{{ message }}
</v-alert>
<div
v-if="isTranslatedBodyNotEmpty && !translationHidden">
<v-divider class="mb-2" />
<dynamic-html-element
v-sanitized-html="translatedBody"
:element="element"
class="reset-style-box text-break overflow-hidden font-italic text-light-color"
dir="auto" />
<div
v-if="isTranslatedBodyNotEmpty && !translationHidden">
<v-divider class="mb-2" />
<dynamic-html-element
v-sanitized-html="translatedBody"
:element="element"
class="reset-style-box text-break overflow-hidden font-italic text-light-color"
dir="auto" />

<div
class="font-italic text-light-color clickable caption"
:class="$vuetify.rtl ? 'float-left' : 'float-right'"
@click="hideTranslation">
<v-icon size="12">mdi-translate</v-icon>
<span>
{{ $t('automaticTranslation.hideTranslation') }}
</span>
</div>
<div
class="font-italic text-light-color clickable caption"
:class="$vuetify.rtl ? 'float-left' : 'float-right'"
@click="hideTranslation">
<v-icon size="12">mdi-translate</v-icon>
<span>
{{ $t('automaticTranslation.hideTranslation') }}
</span>
</div>
</div>
</div>
</template>

<script>
Expand All @@ -59,9 +51,6 @@ export default {
data: () => ({
translatedBody: null,
translationHidden: false,
alert: false,
type: '',
message: ''
}),
computed: {
isTranslatedBodyNotEmpty() {
Expand All @@ -83,10 +72,7 @@ export default {
});
document.addEventListener('activity-translation-error', (event) => {
if (event.detail.id === this.activity.id) {
this.displayMessage({
type: 'error',
message: this.$t('automaticTranslation.errorTranslation')
});
this.$root.$emit('alert-message', this.$t('automaticTranslation.errorTranslation'), 'error');
}
});
this.retrieveActivityProperties();
Expand All @@ -99,12 +85,6 @@ export default {
},
hideTranslation() {
this.translationHidden=true;
},
displayMessage(message) {
this.message=message.message;
this.type=message.type;
this.alert = true;
window.setTimeout(() => this.alert = false, 5000);
}
},
};
Expand Down
40 changes: 8 additions & 32 deletions ...automatic-translation-administration/components/AutomaticTranslationAdministrationApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<template>
<v-app role="main" id="automaticTranslationAdministration">
<v-alert
v-model="alert"
:type="type"
dismissible>
{{ message }}
</v-alert>
<v-main class="white rounded-lg pa-5">
<v-container fluid>
<v-row>
Expand Down Expand Up @@ -82,31 +76,25 @@ export default {
data: () => ({
connectors: [],
selectedConnector: '',
alert: false,
type: '',
message: '',
apiKey: ''
}),
mounted() {
this.$nextTick().then(() => this.$root.$emit('application-loaded'));
},
created() {
this.$root.$on('show-alert', message => {
this.displayMessage(message);
});
this.getConfiguration();
},
methods: {
getConfiguration() {
getConfiguration().then(data => {
this.connectors = data && data.connectors || [];
this.connectors = data?.connectors || [];
this.connectors.unshift({'name': 'none','description': this.$t('automatic.translation.administration.noconnectorselected')});
this.selectedConnector = data && data.activeConnector || 'none';
this.apiKey = data && data.activeApiKey || '';
this.selectedConnector = data?.activeConnector || 'none';
this.apiKey = data?.activeApiKey || '';
});
},
closeSelect() {
if (this.$refs.connectorSelector && this.$refs.connectorSelector.isMenuActive) {
if (this.$refs.connectorSelector?.isMenuActive) {
window.setTimeout(() => {
this.$refs.connectorSelector.isMenuActive = false;
}, 100);
Expand All @@ -120,7 +108,7 @@ export default {
setActiveConnector(connector).then(resp => {
let message='';
let type='';
if (resp && resp.ok) {
if (resp?.ok) {
if (connector === null) {
message = this.$t('automatic.translation.administration.changeConnector.noconnector.confirm');
} else {
Expand All @@ -131,18 +119,15 @@ export default {
type='error';
message = this.$t('automatic.translation.administration.changeConnector.error');
}
this.$root.$emit('show-alert', {
type: type,
message: message
});
this.$root.$emit('alert-message', message, type);
this.getConfiguration();
});
},
editApiKey() {
setApiKey(this.selectedConnector, this.apiKey).then(resp => {
let message='';
let type='';
if (resp && resp.ok) {
if (resp?.ok) {
if (this.apiKey === '') {
message = this.$t('automatic.translation.administration.changeApiKey.emptykey.confirm');
} else {
Expand All @@ -153,18 +138,9 @@ export default {
type='error';
message = this.$t('automatic.translation.administration.changeApiKey.error');
}
this.$root.$emit('show-alert', {
type: type,
message: message
});
this.$root.$emit('alert-message', message, type);
this.getConfiguration();
});
},
displayMessage(message) {
this.message=message.message;
this.type=message.type;
this.alert = true;
window.setTimeout(() => this.alert = false, 5000);
}
}
};
Expand Down
8 changes: 2 additions & 6 deletions webapps/src/main/webapp/vue-apps/automatic-translation-administration/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,10 @@ export function init() {
const appElement = document.createElement('div');
appElement.id = appId;

// init Vue app when locale ressources are ready
new Vue({
mounted() {
document.dispatchEvent(new CustomEvent('hideTopBarLoading'));
},
Vue.createApp({
template: `<automatic-translation-administration-app v-cacheable id="${appId}" />`,
vuetify,
i18n
}).$mount(appElement);
}, appElement, 'Automatic Translation Administration');
});
}