diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 95d869399..3aacdbdec 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -29808,6 +29808,27 @@
+
+ selectview
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
sublets
false
@@ -29850,6 +29871,27 @@
+
+ viewname
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
diff --git a/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx b/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
index f6e16daec..0f7381c84 100644
--- a/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
+++ b/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
@@ -3,7 +3,7 @@ import React, { useState } from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
-import { Button, notification } from "antd";
+import { Button, Form, Input, notification, Popover, Space } from "antd";
import { useTranslation } from "react-i18next";
import { UPDATE_SHOP } from "../../graphql/bodyshop.queries";
import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -23,21 +23,31 @@ export function ProductionListSaveConfigButton({
}) {
const [updateShop] = useMutation(UPDATE_SHOP);
const [loading, setLoading] = useState(false);
+ const [visible, setVisible] = useState(false);
+ const [form] = Form.useForm();
+
const { t } = useTranslation();
- const handleSaveConfig = async () => {
+ const handleSaveConfig = async (values) => {
logImEXEvent("production_save_config");
setLoading(true);
const result = await updateShop({
variables: {
id: bodyshop.id,
shop: {
- production_config: {
- columnKeys: columns.map((i) => {
- return { key: i.key, width: i.width };
- }),
- tableState,
- },
+ production_config: [
+ ...bodyshop.production_config.filter((b) => b.name !== values.name),
+ //Assign it to the name
+ {
+ name: values.name,
+ columns: {
+ columnKeys: columns.map((i) => {
+ return { key: i.key, width: i.width };
+ }),
+ tableState,
+ },
+ },
+ ],
},
},
});
@@ -50,13 +60,44 @@ export function ProductionListSaveConfigButton({
}),
});
}
+ form.resetFields();
+ setVisible(false);
setLoading(false);
};
+ const popMenu = (
+
+
+
+ );
return (
-
+
+
+
);
}
export default connect(
diff --git a/client/src/components/production-list-table/production-list-table-view-select.component.jsx b/client/src/components/production-list-table/production-list-table-view-select.component.jsx
new file mode 100644
index 000000000..3cc78c102
--- /dev/null
+++ b/client/src/components/production-list-table/production-list-table-view-select.component.jsx
@@ -0,0 +1,119 @@
+import { useMutation } from "@apollo/client";
+import { Button, Popconfirm, Select } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_ACTIVE_PROD_LIST_VIEW } from "../../graphql/associations.queries";
+import { UPDATE_SHOP } from "../../graphql/bodyshop.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import {
+ selectBodyshop,
+ selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import ProductionListColumns from "../production-list-columns/production-list-columns.data";
+import { DeleteOutlined } from "@ant-design/icons";
+const mapStateToProps = createStructuredSelector({
+ bodyshop: selectBodyshop,
+ technician: selectTechnician,
+ currentUser: selectCurrentUser,
+});
+
+export function ProductionListTable({
+ bodyshop,
+ technician,
+ currentUser,
+ state,
+ setColumns,
+}) {
+ const { t } = useTranslation();
+ const [updateDefaultProdView] = useMutation(UPDATE_ACTIVE_PROD_LIST_VIEW);
+ const [updateShop] = useMutation(UPDATE_SHOP);
+
+ const handleSelect = async (value, option) => {
+ setColumns(
+ bodyshop.production_config
+ .filter((pc) => pc.name === value)[0]
+ .columns.columnKeys.map((k) => {
+ return {
+ ...ProductionListColumns({ technician, state }).find(
+ (e) => e.key === k.key
+ ),
+ width: k.width,
+ };
+ })
+ );
+
+ const assoc = bodyshop.associations.find(
+ (a) => a.useremail === currentUser.email
+ );
+ if (assoc) {
+ await updateDefaultProdView({
+ variables: { assocId: assoc.id, view: value },
+ });
+ }
+ };
+
+ const handleTrash = async (name) => {
+ await updateShop({
+ variables: {
+ id: bodyshop.id,
+ shop: {
+ production_config: bodyshop.production_config.filter(
+ (b) => b.name !== name
+ ),
+ },
+ },
+ awaitRefetchQueries: true,
+ });
+
+ setColumns(
+ bodyshop.production_config[0].columns.columnKeys.map((k) => {
+ return {
+ ...ProductionListColumns({ technician, state }).find(
+ (e) => e.key === k.key
+ ),
+ width: k.width,
+ };
+ })
+ );
+ };
+
+ return (
+
+
+