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

Jump to bottom

fix: various fixes #1352

Merged
merged 6 commits into from
Jul 26, 2023
Merged

fix: various fixes #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cfa4385
chore: remove undeclared field
nextchamp-saqib Jul 26, 2023
9da57c7
fix: ticket type list routing
nextchamp-saqib Jul 26, 2023
bc3545f
fix: show add button in add agent dialog
nextchamp-saqib Jul 26, 2023
599e21a
fix: cannot add a contact
nextchamp-saqib Jul 26, 2023
641f2a9
chore: add spaces between buttons
nextchamp-saqib Jul 26, 2023
eaaad0d
chore: hide email list unless an email is added
nextchamp-saqib Jul 26, 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
10 changes: 5 additions & 5 deletions desk/src/components/desk/global/AddNewAgentsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
<Button
appearance="primary"
type="submit"
v-if="currentInputIsValidEmail"
icon="arrow-down"
:disabled="!currentInputIsValidEmail"

Check failure on line 25 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Replace `↹↹↹↹↹↹↹` with `··············`

Raw Output:
{"ruleId":"prettier/prettier","severity":2,"message":"Replace `↹↹↹↹↹↹↹` with `··············`","line":25,"column":1,"nodeType":null,"messageId":"replace","endLine":25,"endColumn":8,"fix":{"range":[526,533],"text":"              "}}
@click="
() => {
addToInviteQueue(searchInput)
Expand All @@ -36,9 +35,9 @@
</form>
<div
class="bg-gray-100 min-h-[100px] max-h-[300px] overflow-y-auto px-2 rounded border flex flex-col"
v-if="inviteQueue.length"

Check failure on line 38 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Replace `↹↹↹↹↹↹` with `············`

Raw Output:
{"ruleId":"prettier/prettier","severity":2,"message":"Replace `↹↹↹↹↹↹` with `············`","line":38,"column":1,"nodeType":null,"messageId":"replace","endLine":38,"endColumn":7,"fix":{"range":[851,857],"text":"            "}}

Check warning on line 38 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Attribute "v-if" should go before "class".

Raw Output:
{"ruleId":"vue/attributes-order","severity":1,"message":"Attribute \"v-if\" should go before \"class\".","line":38,"column":7,"nodeType":"VAttribute","endLine":38,"endColumn":32,"fix":{"range":[753,882],"text":"v-if=\"inviteQueue.length\"\n\t\t\t\t\t\tclass=\"bg-gray-100 min-h-[100px] max-h-[300px] overflow-y-auto px-2 rounded border flex flex-col\""}}
>
<ul
v-if="inviteQueue.length"
class="flex flex-wrap gap-2 py-2"
>
<li
Expand All @@ -61,15 +60,16 @@
</div>
</div>
</template>
<template #actions>
<template #actions v-if="inviteQueue.length">

Check failure on line 63 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Replace `↹↹↹` with `······`

Raw Output:
{"ruleId":"prettier/prettier","severity":2,"message":"Replace `↹↹↹` with `······`","line":63,"column":1,"nodeType":null,"messageId":"replace","endLine":63,"endColumn":4,"fix":{"range":[1503,1506],"text":"      "}}

Check warning on line 63 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Attribute "v-if" should go before "#actions".

Raw Output:
{"ruleId":"vue/attributes-order","severity":1,"message":"Attribute \"v-if\" should go before \"#actions\".","line":63,"column":23,"nodeType":"VAttribute","endLine":63,"endColumn":48,"fix":{"range":[1516,1550],"text":"v-if=\"inviteQueue.length\" #actions"}}
<Button
:disabled="inviteQueue.length == 0"
appearance="primary"
@click="sentInvites()"
class="mr-2"

Check failure on line 68 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Replace `↹↹↹↹↹` with `··········`

Raw Output:
{"ruleId":"prettier/prettier","severity":2,"message":"Replace `↹↹↹↹↹` with `··········`","line":68,"column":1,"nodeType":null,"messageId":"replace","endLine":68,"endColumn":6,"fix":{"range":[1659,1664],"text":"          "}}

Check warning on line 68 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Attribute "class" should go before "@click".

Raw Output:
{"ruleId":"vue/attributes-order","severity":1,"message":"Attribute \"class\" should go before \"@click\".","line":68,"column":6,"nodeType":"VAttribute","endLine":68,"endColumn":18,"fix":{"range":[1636,1676],"text":"class=\"mr-2\"\n\t\t\t\t\t@click=\"sentInvites()\""}}
:loading="$resources.sentInvites.loading"
>Send Invites</Button
>
<Button appearance="secondary" @click="close()">Cancel</Button>
<Button appearance="secondary" class="mr-2" @click="close()">Cancel</Button>

Check failure on line 72 in desk/src/components/desk/global/AddNewAgentsDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Replace `↹↹↹↹<Button·appearance="secondary"·class="mr-2"·@click="close()">Cancel</Button` with `········<Button·appearance="secondary"·class="mr-2"·@click="close()"⏎··········>Cancel</Button⏎········`

Raw Output:
{"ruleId":"prettier/prettier","severity":2,"message":"Replace `↹↹↹↹<Button·appearance=\"secondary\"·class=\"mr-2\"·@click=\"close()\">Cancel</Button` with `········<Button·appearance=\"secondary\"·class=\"mr-2\"·@click=\"close()\"⏎··········>Cancel</Button⏎········`","line":72,"column":1,"nodeType":null,"messageId":"replace","endLine":72,"endColumn":80,"fix":{"range":[1757,1836],"text":"        <Button appearance=\"secondary\" class=\"mr-2\" @click=\"close()\"\n          >Cancel</Button\n        "}}
<div class="grow">
<Button
@click="removeAllEmailFromQueue()"
Expand Down
2 changes: 1 addition & 1 deletion desk/src/components/desk/global/AddNewTicketTypeDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
return {
url: "frappe.client.insert",
onSuccess: (doc) => {
this.$router.push(`/ticket_types`)
this.$router.push(`/ticket-types`)

Check failure on line 155 in desk/src/components/desk/global/AddNewTicketTypeDialog.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Replace `↹↹↹↹↹this.$router.push(`/ticket-types`)` with `··········this.$router.push(`/ticket-types`);`

Raw Output:
{"ruleId":"prettier/prettier","severity":2,"message":"Replace `↹↹↹↹↹this.$router.push(`/ticket-types`)` with `··········this.$router.push(`/ticket-types`);`","line":155,"column":1,"nodeType":null,"messageId":"replace","endLine":155,"endColumn":40,"fix":{"range":[3058,3097],"text":"          this.$router.push(`/ticket-types`);"}}
},
}
},
Expand Down
5 changes: 4 additions & 1 deletion desk/src/components/desk/global/NewContactDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
:loading="$resources.createContact.loading"
theme="gray"
variant="solid"
@click="createContact()"
@click="validateInputs() ? null : createContact()"
/>
</div>
</div>
Expand Down Expand Up @@ -204,6 +204,9 @@ export default {
let error = this.validateEmailInput(this.emailId);
error += this.validateFirstName(this.firstName);
error += this.validatePhone(this.phone);
error += this.validateCustomer(
this.fdCustomer != null ? this.fdCustomer : this.selectedCustomer
);
return error;
},
validateEmailInput(value) {
Expand Down
2 changes: 1 addition & 1 deletion desk/src/components/desk/settings/SettingsSideBarMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{
label: "Ticket Types",
pageName: "TicketTypes",
route: "/settings/ticket_types",
route: "/ticket-types",

Check failure on line 38 in desk/src/components/desk/settings/SettingsSideBarMenu.vue

View workflow job for this annotation

GitHub Actions / ESLint - Reviewdog 

[eslint] reported by reviewdog 🐶
Replace `↹↹↹↹↹` with `··········`

Raw Output:
{"ruleId":"prettier/prettier","severity":2,"message":"Replace `↹↹↹↹↹` with `··········`","line":38,"column":1,"nodeType":null,"messageId":"replace","endLine":38,"endColumn":6,"fix":{"range":[813,818],"text":"          "}}
},
{
label: "Support Policies",
Expand Down
4 changes: 2 additions & 2 deletions desk/src/components/desk/settings/ticket_types/TicketTypeInfo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export default {
url: "frappe.client.rename_doc",
onSuccess: (res) => {
this.$router.push({
path: `/settings/ticket_types/${res}`,
path: `/ticket-types/${res}`,
});
},
};
Expand All @@ -192,7 +192,7 @@ export default {
url: "frappe.client.insert",
onSuccess: (res) => {
this.$router.push({
path: `/settings/ticket_types/${res.name}`,
path: `/ticket-types/${res.name}`,
});
},
};
Expand Down
1 change: 0 additions & 1 deletion desk/src/components/global/Autocomplete.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
>
<slot
name="input-holder"
:open="foo"
:selectedValue="selectedValue"
>
<div
Expand Down
Loading