admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-868 IO-706 Unique vendor & employee names.

Browse Source
This commit is contained in:
Patrick Fic
2021-04-09 11:03:40 -07:00
parent bb83894e37
commit 136541b291
13 changed files with 334 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
bodyshop_translations.babel
View File

@@ -11365,6 +11365,32 @@
</concept_node>
</children>
</folder_node>
<folder_node>
<name>validations</name>
<children>
<concept_node>
<name>unique_employee_number</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children>
</folder_node>
<folder_node>
@@ -33828,6 +33854,32 @@
</concept_node>
</children>
</folder_node>
<folder_node>
<name>validation</name>
<children>
<concept_node>
<name>unique_vendor_name</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children>
</folder_node>
</children>

36
client/src/components/shop-employees/shop-employees-form.component.jsx
View File

@@ -6,7 +6,10 @@ import { useApolloClient } from "@apollo/client";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { QUERY_USERS_BY_EMAIL } from "../../graphql/employees.queries";
import {
CHECK_EMPLOYEE_NUMBER,
QUERY_USERS_BY_EMAIL,
} from "../../graphql/employees.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import FormDatePicker from "../form-date-picker/form-date-picker.component";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
@@ -85,11 +88,42 @@ export function ShopEmployeesFormComponent({
<Form.Item
name="employee_number"
label={t("employees.fields.employee_number")}
validateTrigger="onBlur"
hasFeedback
rules={[
{
required: true,
message: t("general.validation.required"),
},
({ getFieldValue }) => ({
async validator(rule, value) {
if (value) {
const response = await client.query({
query: CHECK_EMPLOYEE_NUMBER,
variables: {
employeenumber: value,
},
});
if (
response.data.employees_aggregate.aggregate.count === 0
) {
return Promise.resolve();
} else if (
response.data.employees_aggregate.nodes.length === 1 &&
response.data.employees_aggregate.nodes[0].id ===
form.getFieldValue("id")
) {
return Promise.resolve();
}
return Promise.reject(
t("employees.validation.unique_employee_number")
);
} else {
return Promise.resolve();
}
},
}),
]}
>
<Input />

37
client/src/components/vendors-form/vendors-form.component.jsx
View File

@@ -1,4 +1,5 @@
import { DeleteFilled } from "@ant-design/icons";
import { useApolloClient } from "@apollo/client";
import {
Button,
Divider,
@@ -12,6 +13,7 @@ import {
} from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { CHECK_VENDOR_NAME } from "../../graphql/vendors.queries";
import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
import FormItemEmail from "../form-items-formatted/email-form-item.component";
import PhoneFormItem, {
@@ -25,6 +27,7 @@ export default function VendorsFormComponent({
responsibilityCenters,
}) {
const { t } = useTranslation();
const client = useApolloClient();
const { getFieldValue } = form;
return (
<div>
@@ -58,8 +61,40 @@ export default function VendorsFormComponent({
<Form.Item
label={t("vendors.fields.name")}
name="name"
validateTrigger="onBlur"
hasFeedback
rules={[
{ required: true, message: t("general.validation.required") },
{
required: true,
message: t("general.validation.required"),
},
({ getFieldValue }) => ({
async validator(rule, value) {
if (value) {
const response = await client.query({
query: CHECK_VENDOR_NAME,
variables: {
name: value,
},
});
if (response.data.vendors_aggregate.aggregate.count === 0) {
return Promise.resolve();
} else if (
response.data.vendors_aggregate.nodes.length === 1 &&
response.data.vendors_aggregate.nodes[0].id ===
form.getFieldValue("id")
) {
return Promise.resolve();
}
return Promise.reject(
t("vendors.validation.unique_vendor_name")
);
} else {
return Promise.resolve();
}
},
}),
]}
>
<Input />

15
client/src/graphql/employees.queries.js
View File

@@ -18,6 +18,21 @@ export const QUERY_EMPLOYEES = gql`
}
`;
export const CHECK_EMPLOYEE_NUMBER = gql`
query CHECK_EMPLOYEE_NUMBER($employeenumber: String!) {
employees_aggregate(
where: { employee_number: { _ilike: $employeenumber } }
) {
aggregate {
count
}
nodes {
id
}
}
}
`;
export const QUERY_ACTIVE_EMPLOYEES = gql`
query QUERY_ACTIVE_EMPLOYEES {
employees(where: { active: { _eq: true } }) {

12
client/src/graphql/vendors.queries.js
View File

@@ -21,6 +21,18 @@ export const QUERY_VENDOR_BY_ID = gql`
}
}
`;
export const CHECK_VENDOR_NAME = gql`
query CHECK_VENDOR_NAME($name: String!) {
vendors_aggregate(where: { name: { _ilike: $name } }) {
aggregate {
count
}
nodes {
id
}
}
}
`;
export const UPDATE_VENDOR = gql`
mutation UPDATE_VENDOR($id: uuid!, $vendor: vendors_set_input!) {

6
client/src/translations/en_us/common.json
View File

@@ -734,6 +734,9 @@
"successes": {
"delete": "Employee deleted successfully.",
"save": "Employee saved successfully."
},
"validations": {
"unique_employee_number": "You must enter a unique employee number."
}
},
"general": {
@@ -2038,6 +2041,9 @@
"successes": {
"deleted": "Vendor deleted successfully. ",
"saved": "Vendor saved successfully."
},
"validation": {
"unique_vendor_name": "You must enter a unique vendor name."
}
}
}

6
client/src/translations/es/common.json
View File

@@ -734,6 +734,9 @@
"successes": {
"delete": "Empleado eliminado con éxito.",
"save": "Empleado guardado con éxito."
},
"validations": {
"unique_employee_number": ""
}
},
"general": {
@@ -2038,6 +2041,9 @@
"successes": {
"deleted": "Proveedor eliminado correctamente.",
"saved": "Proveedor guardado con éxito."
},
"validation": {
"unique_vendor_name": ""
}
}
}

6
client/src/translations/fr/common.json
View File

@@ -734,6 +734,9 @@
"successes": {
"delete": "L'employé a bien été supprimé.",
"save": "L'employé a enregistré avec succès."
},
"validations": {
"unique_employee_number": ""
}
},
"general": {
@@ -2038,6 +2041,9 @@
"successes": {
"deleted": "Le fournisseur a bien été supprimé.",
"saved": "Le fournisseur a bien enregistré."
},
"validation": {
"unique_vendor_name": ""
}
}
}

39
hasura/migrations/1617990757965_update_permission_user_public_table_employees/down.yaml Normal file
View File

@@ -0,0 +1,39 @@
- args:
role: user
table:
name: employees
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- active
- created_at
- employee_number
- first_name
- flat_rate
- hire_date
- id
- last_name
- pin
- rates
- shopid
- termination_date
- updated_at
- user_email
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: employees
schema: public
type: create_select_permission

39
hasura/migrations/1617990757965_update_permission_user_public_table_employees/up.yaml Normal file
View File

@@ -0,0 +1,39 @@
- args:
role: user
table:
name: employees
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- active
- created_at
- employee_number
- first_name
- flat_rate
- hire_date
- id
- last_name
- pin
- rates
- shopid
- termination_date
- updated_at
- user_email
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: employees
schema: public
type: create_select_permission

43
hasura/migrations/1617990875647_update_permission_user_public_table_vendors/down.yaml Normal file
View File

@@ -0,0 +1,43 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- active
- bodyshopid
- city
- cost_center
- country
- created_at
- discount
- due_date
- email
- favorite
- id
- name
- phone
- state
- street1
- street2
- updated_at
- zip
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: vendors
schema: public
type: create_select_permission

43
hasura/migrations/1617990875647_update_permission_user_public_table_vendors/up.yaml Normal file
View File

@@ -0,0 +1,43 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- active
- bodyshopid
- city
- cost_center
- country
- created_at
- discount
- due_date
- email
- favorite
- id
- name
- phone
- state
- street1
- street2
- updated_at
- zip
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: vendors
schema: public
type: create_select_permission

2
hasura/migrations/metadata.yaml
View File

@@ -1686,6 +1686,7 @@ tables:
_eq: X-Hasura-User-Id
- active:
_eq: true
allow_aggregations: true
update_permissions:
- role: user
permission:
@@ -4172,6 +4173,7 @@ tables:
_eq: X-Hasura-User-Id
- active:
_eq: true
allow_aggregations: true
update_permissions:
- role: user
permission: