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.

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

Submission Id issue fixed in filter search #1987

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion forms-flow-api/src/formsflow_api/services/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def get_user_filters(**kwargs):
)
filter_data = filter_schema.dump(filters, many=True)
default_variables = [
{"name": "applicationId", "label": "Submission ID"},
{"name": "applicationId", "label": "Submission Id"},
{"name": "formName", "label": "Form Name"},
]
# User who created the filter or admin have edit permission.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ afterEach(() => {

test("Render Submission Detail Component with submission prop passed", () => {
render(<ApplicationDetails application={mockApplication1} />);
expect(screen.getByText("Submission ID"));
expect(screen.getByText("Submission Id"));
expect(screen.getByText("Form Name"));
expect(screen.getByText("Created By"));
expect(screen.getByText("Submission Status"));
Expand All @@ -34,7 +34,7 @@ test("Render Detail Component with submission prop passed", () => {
useSelector.mockImplementation((callback) => callback(appState));
const { rerender } = render(<Details application={mockApplication1} />);
expect(screen.queryByText("Loading...")).toBeNull();
expect(screen.getByText("Submission ID"));
expect(screen.getByText("Submission Id"));
expect(screen.getByTestId("application-id")).toHaveTextContent(
mockApplication1.id
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const addApplicationDetailsToFormComponent = (formObjData) => {
input: true,
tableView: true,
key: "applicationId",
title: "Submission ID",
title: "Submission Id",
});
}
return formObjData;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const ApplicationDetails = React.memo((props) => {
<tbody>
<tr>
<td className="border-0">
<Translation>{(t) => t("Submission ID")}</Translation>
<Translation>{(t) => t("Submission Id")}</Translation>
</td>
<td className="border-0">:</td>
<td className="border-0" id="application-id">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ const ServiceTaskListViewDetails = React.memo(() => {
</span>
</Row>
<Row className="ms-0">
<span data-title={t("Submission ID")} className="application-id">
{t("Submission ID")}# {task?.applicationId}
<span data-title={t("Submission Id")} className="application-id">
{t("Submission Id")}# {task?.applicationId}
</span>
</Row>
</Col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ export default function CreateNewFilterDrawer({
...variables,
...(applicationIdExists
? []
: [{ name: "applicationId", label: "Submission ID" }]),
: [{ name: "applicationId", label: "Submission Id" }]),
...(formNameExists ? [] : [{ name: "formName", label: "Form Name" }]),
],
users: users,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function TaskAttributeComponent({
<Col xs={6}>
<Form.Check
type="checkbox"
label={t("Submission ID")}
label={t("Submission Id")}
name="applicationId"
checked={checkboxes.applicationId}
onChange={handleCheckboxChange}
Expand Down
Loading