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

Refactor CreateOrEditTask.vue component #28

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Refactor CreateOrEditTask.vue component #28

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41338a2
Refactor CreateOrEditTask.vue component
stephdl Oct 7, 2024
bf52fa0
Refactor variable names in component to camelCase
stephdl Oct 14, 2024
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
130 changes: 89 additions & 41 deletions ui/src/components/CreateOrEditTask.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<NsComboBox
v-if="!isEdit"
:options="enabled_mailboxes"
v-model.trim="task.localuser"
v-model.trim="localuser"
:autoFilter="true"
:autoHighlight="true"
:title="$t('tasks.local_user')"
Expand All @@ -49,14 +49,14 @@
</template>
</NsComboBox>
<NsTextInput
v-model.trim="task.remoteusername"
v-model.trim="remoteusername"
:label="$t('tasks.remoteusername')"
ref="remoteusername"
:invalid-message="$t(error.remoteusername)"
:disabled="loading.createTask"
/>
<NsTextInput
v-model.trim="task.remotepassword"
v-model.trim="remotepassword"
type="password"
:label="$t('tasks.remotepassword')"
ref="remotepassword"
Expand All @@ -67,15 +67,15 @@
:disabled="loading.createTask"
/>
<NsTextInput
v-model.trim="task.remotehostname"
v-model.trim="remotehostname"
:label="$t('tasks.remotehostname')"
placeholder="imap.domain.com"
ref="remotehostname"
:invalid-message="$t(error.remotehostname)"
:disabled="loading.createTask"
/>
<NsTextInput
v-model.trim="task.remoteport"
v-model.trim="remoteport"
type="number"
:label="$t('tasks.remoteport')"
ref="remoteport"
Expand All @@ -85,8 +85,8 @@
<cv-dropdown
:light="true"
class="max-dropdown-width"
:value="task.security"
v-model="task.security"
:value="security"
v-model="security"
:up="false"
:inline="false"
:helper-text="$t('tasks.encryption_depends_remote_server')"
Expand Down Expand Up @@ -119,29 +119,29 @@
:name="'radio-group-foldersynchronization'"
:label="$t('tasks.syncronize_all')"
value="all"
v-model="task.foldersynchronization"
v-model="foldersynchronization"
:disabled="loading.createTask"
/>
<cv-radio-button
:name="'radio-group-foldersynchronization'"
:label="$t('tasks.synchronize_only_INBOX')"
value="inbox"
v-model="task.foldersynchronization"
v-model="foldersynchronization"
:disabled="loading.createTask"
/>
<cv-radio-button
:name="'radio-group-foldersynchronization'"
:label="$t('tasks.syncronize_with_exclusion')"
value="exclusion"
v-model="task.foldersynchronization"
v-model="foldersynchronization"
:disabled="loading.createTask"
/>
</cv-radio-group>
<template v-if="task.foldersynchronization == 'exclusion'">
<template v-if="foldersynchronization == 'exclusion'">
<cv-text-area
class="mg-left"
:label="$t('tasks.exclude_folder')"
v-model.trim="task.exclude"
v-model.trim="exclude"
ref="exclude"
:invalid-message="$t(error.exclude)"
:placeholder="$t('tasks.write_one_exclusion_per_line')"
Expand All @@ -166,15 +166,15 @@
:name="'radio-group-delete_local'"
:label="$t('tasks.no_deletion')"
value="no_delete"
v-model="task.delete"
v-model="delete_msg"
:disabled="loading.createTask"
/>

<cv-radio-button
:name="'radio-group-delete_local'"
:label="$t('tasks.delete_on_remote')"
value="delete_remote"
v-model="task.delete"
v-model="delete_msg"
:disabled="loading.createTask"
/>
<!-- <cv-radio-button
Expand All @@ -185,7 +185,7 @@
/> -->
</cv-radio-group>
<NsSlider
v-model="task.cron"
v-model="cron"
:label="$t('tasks.select_your_cron')"
min="1"
max="60"
Expand All @@ -196,11 +196,11 @@
showUnlimited
:unlimitedLabel="$t('tasks.disabled')"
:limitedLabel="$t('tasks.enabled')"
:isUnlimited="!task.cron_enabled"
:isUnlimited="!cron_enabled"
:invalidMessage="$t(error.cron)"
:disabled="loading.createTask"
:unitLabel="$t('tasks.minutes')"
@unlimited="task.cron_enabled = !$event"
@unlimited="cron_enabled = !$event"
class="mg-bottom-xlg"
/>
</cv-form>
Expand Down Expand Up @@ -241,6 +241,17 @@ export default {
loading: {
createTask: false,
},
localuser: "",
Copy link
Contributor

Choose a reason for hiding this comment

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

JS variables should use camelCase, localuser and the following lines use no case or snake_case

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

should be good @andre8244

remoteusername: "",
remotepassword: "",
remotehostname: "",
remoteport: "",
security: "",
foldersynchronization: "all",
exclude: "",
delete_msg: "no_delete",
cron: "0",
cron_enabled: false,
error: {
enabled_mailboxe: "",
createTask: "",
Expand All @@ -256,44 +267,81 @@ export default {
computed: {
...mapState(["instanceName", "core", "appName"]),
},
watch: {
isShown: function () {
if (this.isShown) {
this.clearErrors();
this.localuser = this.task.localuser;
this.remoteusername = this.task.remoteusername;
this.remotepassword = "";
this.remotehostname = this.task.remotehostname;
this.remoteport = this.task.remoteport;
this.security = this.task.security;
this.foldersynchronization = this.task.foldersynchronization;
this.exclude = this.task.exclude;
this.delete_msg = this.task.delete;
this.cron = this.task.cron;
this.cron_enabled = this.task.cron_enabled;
} else {
// hiding modal

if (this.isEditing) {
this.clearFields();
}
}
},
},
methods: {
clearFields() {
this.localuser = "";
this.remoteusername = "";
this.remotepassword = "";
this.remotehostname = "";
this.remoteport = "";
this.security = "";
this.foldersynchronization = "all";
this.exclude = "";
this.delete_msg = "no_delete";
this.cron = "0";
this.cron_enabled = false;
},
validateConfigureModule() {
this.clearErrors(this);

let isValidationOk = true;
if (!this.task.localuser) {
if (!this.localuser) {
this.error.localuser = "common.required";

if (isValidationOk) {
this.focusElement("localuser");
}
isValidationOk = false;
}
if (!this.task.remoteusername) {
if (!this.remoteusername) {
this.error.remoteusername = "common.required";

if (isValidationOk) {
this.focusElement("remoteusername");
}
isValidationOk = false;
}
if (!this.task.remotepassword && !this.isEdit) {
if (!this.remotepassword && !this.isEdit) {
this.error.remotepassword = "common.required";

if (isValidationOk) {
this.focusElement("remotepassword");
}
isValidationOk = false;
}
if (!this.task.remotehostname) {
if (!this.remotehostname) {
this.error.remotehostname = "common.required";

if (isValidationOk) {
this.focusElement("remotehostname");
}
isValidationOk = false;
}
if (!this.task.remoteport) {
if (!this.remoteport) {
this.error.remoteport = "common.required";

if (isValidationOk) {
Expand All @@ -302,8 +350,8 @@ export default {
isValidationOk = false;
}
if (
this.task.foldersynchronization == "exclusion" &&
!this.task.exclude
this.foldersynchronization == "exclusion" &&
!this.exclude
) {
this.error.exclude = "common.required";

Expand Down Expand Up @@ -352,32 +400,32 @@ export default {
this.setCreateTaskCompleted
);
// modify cron value to be compatible with previous format ('',5m, 10m, 15m, 30m, 45m, 1h)
if (this.task.cron === "60" && this.task.cron_enabled) {
this.task.cron = "1h";
} else if (this.task.cron !== "0" && this.task.cron_enabled) {
this.task.cron = this.task.cron + "m";
} else if (!this.task.cron_enabled) {
this.task.cron = "";
if (this.cron === "60" && this.cron_enabled) {
this.cron = "1h";
} else if (this.cron !== "0" && this.cron_enabled) {
this.cron = this.cron + "m";
} else if (!this.cron_enabled) {
this.cron = "";
}
const res = await to(
this.createModuleTaskForApp(this.instanceName, {
action: taskAction,
data: {
task_id: this.task.task_id,
localuser: this.task.localuser,
remotehostname: this.task.remotehostname,
remotepassword: this.task.remotepassword,
remoteport: Number(this.task.remoteport),
remoteusername: this.task.remoteusername,
security: this.task.security,
delete_local: this.task.delete === "delete_local" ? true : false,
delete_remote: this.task.delete === "delete_remote" ? true : false,
exclude: this.task.exclude
localuser: this.localuser,
remotehostname: this.remotehostname,
remotepassword: this.remotepassword,
remoteport: Number(this.remoteport),
remoteusername: this.remoteusername,
security: this.security,
delete_local: this.delete_msg === "delete_local" ? true : false,
delete_remote: this.delete_msg === "delete_remote" ? true : false,
exclude: this.exclude
.split("\n")
.map((item) => item.trim())
.join(","),
cron: this.task.cron,
foldersynchronization: this.task.foldersynchronization,
cron: this.cron,
foldersynchronization: this.foldersynchronization,
},
extra: {
title: this.$t("action." + taskAction),
Expand Down
Loading