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

Use Vue for bugzilla template editor #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use Vue for bugzilla template editor #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 0 additions & 68 deletions server/crashmanager/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,67 +22,6 @@ class Row(Div):


class BugzillaTemplateBugForm(ModelForm):
helper = FormHelper()
helper.layout = Layout(
HTML("""<div v-pre>"""),
Row(Field("name", wrapper_class="col-md-6")),
"summary",
Row(
Field("product", wrapper_class="col-md-6"),
Field("component", wrapper_class="col-md-6"),
),
HTML("""</div>"""),
HTML("""<ppcselect></ppcselect>"""),
HTML("""<div v-pre>"""),
Row(
Field("whiteboard", wrapper_class="col-md-6"),
Field("keywords", wrapper_class="col-md-6"),
),
Row(
Field("op_sys", wrapper_class="col-md-6"),
Field("platform", wrapper_class="col-md-6"),
),
Row(
Field("cc", wrapper_class="col-md-6"),
Field("assigned_to", wrapper_class="col-md-6"),
),
Row(
Field("priority", wrapper_class="col-md-6"),
Field("severity", wrapper_class="col-md-6"),
),
Row(
Field("alias", wrapper_class="col-md-6"),
Field("qa_contact", wrapper_class="col-md-6"),
),
Row(
Field("version", wrapper_class="col-md-6"),
Field("target_milestone", wrapper_class="col-md-6"),
),
Row(
Field("blocks", wrapper_class="col-md-6"),
Field("dependson", wrapper_class="col-md-6"),
),
"attrs",
"description",
"security",
Row(Field("security_group", wrapper_class="col-md-6")),
Row(Field("testcase_filename", wrapper_class="col-md-6")),
Submit("submit", "Save", css_class="btn btn-danger"),
HTML(
"""<a href="{% url 'crashmanager:templates' %}" class="btn btn-default">"""
"""Cancel</a>"""
),
HTML("""</div>"""),
)
product = CharField(
label="Current product (choose below)",
widget=TextInput(attrs={"disabled": True}),
)
component = CharField(
label="Current component (choose below)",
widget=TextInput(attrs={"disabled": True}),
)

class Meta:
model = BugzillaTemplate
fields = [
Expand Down Expand Up @@ -135,13 +74,6 @@ class Meta:
"dependson": "Depends On",
}

widgets = {}
for field in fields:
if field not in ["description", "attrs", "security"]:
widgets[field] = TextInput()

widgets["attrs"] = Textarea(attrs={"rows": 2})


class BugzillaTemplateCommentForm(ModelForm):
helper = FormHelper()
Expand Down
17 changes: 13 additions & 4 deletions server/crashmanager/templates/bugzilla/create_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,19 @@
<div class="panel panel-info">
<div class="panel-heading"><i class="bi bi-card-list"></i> {{ title }}</div>
<div class="panel-body">
<form method="post">
{% csrf_token %}
{% crispy form %}
</form>
{% if mode == "Comment" %}
<form method="post">
{% csrf_token %}
{% crispy form %}
</form>
{% else %}
<bugpublicationform
:provider-id="{{ provider.pk }}"
:entry-id="1"
:template-id="{{ template_id }}"
:is-bug-template-creation="true"
/>
{% endif %}
</div>
</div>
{% endblock body_content %}
20 changes: 20 additions & 0 deletions server/crashmanager/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,17 @@ class BugzillaTemplateEditView(UpdateView):

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)

if "provider" in self.request.POST:
provider = get_object_or_404(BugProvider, pk=self.request.GET["provider"])
else:
user = User.get_or_create_restricted(self.request.user)[0]
provider = get_object_or_404(BugProvider, pk=user.defaultProviderId)

context["title"] = "Edit template"
context["template_id"] = self.kwargs[self.pk_url_kwarg]
context["provider"] = provider
context["mode"] = "Bug" if self.object.mode == BugzillaTemplateMode.Bug else "Comment"
return context

def get_form_class(self):
Expand All @@ -1628,6 +1638,15 @@ class BugzillaTemplateBugCreateView(CreateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = "Create a bug template"

if "provider" in self.request.GET:
provider = get_object_or_404(BugProvider, pk=self.request.GET["provider"])
else:
user = User.get_or_create_restricted(self.request.user)[0]
provider = get_object_or_404(BugProvider, pk=user.defaultProviderId)

context["provider"] = provider
context["mode"] = "Bug"
return context

def form_valid(self, form):
Expand All @@ -1644,6 +1663,7 @@ class BugzillaTemplateCommentCreateView(CreateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["title"] = "Create a comment template"
context["mode"] = "Comment"
return context

def form_valid(self, form):
Expand Down
15 changes: 13 additions & 2 deletions server/frontend/src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@ export const listCrashes = async (params) =>
export const listBugProviders = async () =>
(await mainAxios.get("/crashmanager/rest/bugproviders/")).data;

export const listTemplates = async () =>
(await mainAxios.get("/crashmanager/rest/bugzilla/templates/")).data;
export const listTemplates = async (id) =>
(
await mainAxios.get(
`/crashmanager/rest/bugzilla/templates${id !== -1 && id ? `/${id}/` : "/"}`,
)
).data;

export const listUnreadNotifications = async (params) =>
(await mainAxios.get("/crashmanager/rest/inbox/", { params })).data;
Expand All @@ -65,6 +69,13 @@ export const listPools = async (params) =>
export const listTasks = async (params) =>
(await mainAxios.get("/taskmanager/rest/tasks/", { params })).data;

export const createBugzillaBugTemplate = async (data) =>
(await mainAxios.post("/crashmanager/bugzilla/templates/create-bug/", data))
.data;

export const updateBugzillaBugTemplate = async (id, data) =>
(await mainAxios.post(`/crashmanager/bugzilla/templates/${id}/`, data)).data;

export const covManagerDiffStats = async ({ path, params, cb }) =>
await mainAxios
.get("/covmanager/collections/diff/api/" + path, { params })
Expand Down
22 changes: 21 additions & 1 deletion server/frontend/src/components/Bugs/FullPPCSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
:template-product="templateProduct"
:template-component="templateComponent"
style-class="col-md-4"
@update-product="product = $event"
@update-component="component = $event"
/>
</div>
</template>
Expand Down Expand Up @@ -45,11 +47,13 @@ export default defineComponent({
default: "",
},
},
setup(props) {
setup(props, { emit }) {
const providers = ref([]);
const selectedProvider = ref(null);
const providerHostname = ref("");
const provider = ref(null);
const product = ref("");
const component = ref("");

onMounted(async () => {
const data = await api.listBugProviders();
Expand All @@ -71,11 +75,27 @@ export default defineComponent({
providerHostname.value = provider.value.hostname;
});

watch(
() => product.value,
() => {
emit("update-product", product.value);
},
);

watch(
() => component.value,
() => {
emit("update-component", component.value);
},
);

return {
providers,
selectedProvider,
providerHostname,
provider,
product,
component,
};
},
});
Expand Down
Loading