develop to main

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,58 @@
+---
+name: Bug Report
+description: Report a bug encountered while using Frappe Helpdesk
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Welcome to Frappe Helpdesk issue tracker! Before creating an issue, please consider the following:
+
+        1. This tracker should only be used to report bugs and request features / enhancements to Frappe Helpdesk
+            - For questions and general support, checkout the [documentation](https://docs.frappe.io/helpdesk) or use the [forum](https://discuss.frappe.io) to get inputs from the open source community.
+            - For documentation issues, propose edit on the [documentation site](https://docs.frappe.io/helpdesk) directly.
+        2. When making a bug report, make sure you provide all required information. The easier it is for
+           maintainers to reproduce, the faster it'll be fixed.
+        3. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
+
+  - type: textarea
+    id: bug-info
+    attributes:
+      label: Information about bug
+      description: Also tell us, what did you expect to happen? If applicable, add screenshots to help explain your problem.
+      placeholder: Please provide as much information as possible.
+    validations:
+      required: true
+
+  - type: textarea
+    id: exact-version
+    attributes:
+      label: Version
+      description: Share exact version number of Frappe, and Frappe Helpdesk you are using.
+      placeholder: |
+        Frappe version -
+        Frappe Helpdesk version -
+    validations:
+      required: true
+
+  - type: dropdown
+    id: install-method
+    attributes:
+      label: Installation method
+      options:
+        - docker
+        - easy-install
+        - manual install
+        - FrappeCloud
+    validations:
+      required: false
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output / Stack trace / Full Error Message.
+      description: Please copy and paste any relevant log output. This will be automatically formatted.
+      render: shell
+
+...

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,50 @@
+---
+name: Feature Request
+description: Suggest an idea to improve Frappe Helpdesk
+labels: ["feature-request"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Welcome to Frappe Helpdesk issue tracker! Before submitting a request, please consider the following:
+
+        1. This tracker should only be used to report bugs and request features / enhancements to Frappe Helpdesk
+            - For questions and general support, checkout the [documentation](https://docs.frappe.io/helpdesk) or use the [forum](https://discuss.frappe.io) to get inputs from the open source community.
+        2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+          the original discussion.
+        3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
+
+
+        Please keep in mind that we get many many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature.
+
+        If you're in urgent need to a feature, please try the following channels to get paid developments done quickly:
+        1. Certified Frappe partners: https://frappe.io/partners
+        2. Developer community on Frappe forums: https://discuss.frappe.io/c/developers/5
+        3. Telegram group for Frappe Helpdesk development work: https://t.me/+eBnEZm7urwEwYTc1
+
+  - type: textarea
+    id: problem-info
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. Eg. I'm always frustrated when [...]
+      placeholder: Please provide as much information as possible.
+
+  - type: textarea
+    id: solution-info
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+
+  - type: textarea
+    id: alternatives-info
+    attributes:
+      label: Describe the alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+...

.github/workflows/lint.yml

@@ -68,9 +68,12 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
+
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
+
+      - name: Download semgrep
+        run: pip install semgrep
+
       - name: Run Semgrep rules
-        run: |
-          pip install semgrep==0.97.0
-          semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
+        run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "frappe-ui"]
+	path = frappe-ui
+	url = https://github.com/frappe/frappe-ui.git

desk/src/components/CommentBox.vue

@@ -16,7 +16,7 @@
           </span>
         </Tooltip>
       </div>
-      <div v-if="authStore.userId === commenter" class="px-4">
+      <div v-if="authStore.userId === commentedBy" class="px-4">
         <Dropdown
           :options="[{ label: 'Delete', onClick: () => (showDialog = true) }]"
         >
@@ -74,6 +74,10 @@ const props = defineProps({
     type: String,
     required: true,
   },
+  commentedBy: {
+    type: String,
+    required: true,
+  },
 });
 
 const emit = defineEmits(["update"]);

desk/src/components/desk/global/NewCustomerDialog.vue

@@ -1,19 +1,22 @@
 <template>
   <div>
-    <Dialog v-model="open" :options="{ title: 'Add New Customer', size: 'sm' }">
+    <Dialog
+      v-model="model"
+      :options="{ title: 'Add New Customer', size: 'sm' }"
+    >
       <template #body-content>
         <div class="space-y-4">
           <div class="space-y-1">
             <Input
-              v-model="customer"
+              v-model="state.customer"
               label="Customer Name"
               type="text"
               placeholder="Tesla Inc."
             />
           </div>
           <div class="space-y-1">
             <Input
-              v-model="domain"
+              v-model="state.domain"
               label="Domain"
               type="text"
               placeholder="eg: tesla.com, mycompany.com"
@@ -24,13 +27,7 @@
               label="Add"
               theme="gray"
               variant="solid"
-              @click="
-                () => {
-                  addCustomer();
-                  close();
-                  $router.go();
-                }
-              "
+              @click.prevent="addCustomer"
             />
           </div>
         </div>
@@ -39,69 +36,63 @@
   </div>
 </template>
 
-<script>
-import { Input, Dialog, ErrorMessage } from "frappe-ui";
-import { computed, ref, inject } from "vue";
-export default {
-  name: "NewCustomerDialog",
-  components: {
-    Dialog,
-    Input,
-  },
-  props: {
-    modelValue: {
-      type: Boolean,
-      required: true,
+<script setup lang="ts">
+import { reactive } from "vue";
+import { Input, Dialog, createResource } from "frappe-ui";
+import { createToast } from "@/utils";
+
+const emit = defineEmits(["customerCreated"]);
+const model = defineModel<boolean>();
+
+const state = reactive({
+  customer: "",
+  domain: "",
+});
+
+const customerResource = createResource({
+  url: "frappe.client.insert",
+  method: "POST",
+  data: {
+    doc: {
+      doctype: "HD Customer",
+      customer_name: state.customer,
+      domain: state.domain,
     },
   },
-  setup(props, { emit }) {
-    let open = computed({
-      get: () => props.modelValue,
-      set: (val) => {
-        emit("update:modelValue", val);
-        if (!val) {
-          emit("close");
-        }
-      },
+  onSuccess: () => {
+    state.customer = "";
+    state.domain = "";
+    createToast({
+      title: "Customer Created Successfully ",
+      icon: "check",
+      iconClasses: "text-green-600",
     });
-    return {
-      open,
-    };
-  },
-  data() {
-    return {
-      customer: "",
-      domain: "",
-    };
+    emit("customerCreated");
   },
-  methods: {
-    addCustomer() {
-      const inputParams = {
-        customer_name: this.customer,
-        domain: this.domain,
-      };
-      this.$resources.newCustomer.submit({
-        doc: {
-          doctype: "HD Customer",
-          ...inputParams,
-        },
-      });
-    },
-    close() {
-      this.customer = "";
-      this.domain = "";
-      this.$emit("close");
-    },
+  onError: (err) => {
+    createToast({
+      title: err.messages[0],
+      icon: "x",
+      iconClasses: "text-red-600",
+    });
   },
-  resources: {
-    newCustomer() {
-      return {
-        url: "frappe.client.insert",
-        onSuccess: (doc) => {
-          this.$router.push(`/customers`);
-        },
-      };
+});
+
+function addCustomer() {
+  if (!state.customer) {
+    createToast({
+      title: "Customer Name is required",
+      icon: "x",
+      iconClasses: "text-red-600",
+    });
+    return;
+  }
+  customerResource.submit({
+    doc: {
+      doctype: "HD Customer",
+      customer_name: state.customer,
+      domain: state.domain,
     },
-  },
-};
+  });
+}
 </script>

desk/src/components/ticket/TicketsAgentList.vue

@@ -48,6 +48,9 @@
               variant="outline"
             />
           </div>
+          <div v-if="column.type === 'Rating'">
+            <StarRating :rating="item" />
+          </div>
           <div v-else-if="column.key === 'response_by'">
             <Badge
               v-if="
@@ -129,7 +132,7 @@ import {
   ListHeader,
   ListFooter,
 } from "frappe-ui";
-import { MultipleAvatar } from "@/components";
+import { MultipleAvatar, StarRating } from "@/components";
 
 const ticketStatusStore = useTicketStatusStore();
 const router = useRouter();