From 3862f7f11fdc304c0c97421b71510a16ebbde2f5 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 10 Aug 2020 09:09:53 -0700
Subject: [PATCH] Added form list moving to all lists. BOD-242
---
.../invoice-form.lines.component.jsx | 9 +++-
.../parts-order-modal.component.jsx | 8 ++-
.../shop-info/shop-info.component.jsx | 14 ++++-
.../shop-info.orderstatus.component.jsx | 34 ++++++++----
.../shop-info.rostatus.component.jsx | 54 ++++++++++++-------
.../shop-info.scheduling.component.jsx | 8 ++-
6 files changed, 93 insertions(+), 34 deletions(-)
diff --git a/client/src/components/invoice-form/invoice-form.lines.component.jsx b/client/src/components/invoice-form/invoice-form.lines.component.jsx
index ba9e906d0..015b8768e 100644
--- a/client/src/components/invoice-form/invoice-form.lines.component.jsx
+++ b/client/src/components/invoice-form/invoice-form.lines.component.jsx
@@ -4,7 +4,7 @@ import React from "react";
import { useTranslation } from "react-i18next";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import InvoiceLineSearchSelect from "../invoice-line-search-select/invoice-line-search-select.component";
-
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
export default function InvoiceEnterModalLinesComponent({
lineData,
discount,
@@ -16,7 +16,7 @@ export default function InvoiceEnterModalLinesComponent({
return (
- {(fields, { add, remove }) => {
+ {(fields, { add, remove, move }) => {
return (
{fields.map((field, index) => (
@@ -197,6 +197,11 @@ export default function InvoiceEnterModalLinesComponent({
remove(field.name);
}}
/>
+
))}
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index a1ddd036d..a2a87d24d 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
import FormDatePicker from "../form-date-picker/form-date-picker.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
export default function PartsOrderModalComponent({
vendorList,
@@ -49,7 +50,7 @@ export default function PartsOrderModalComponent({
{t("parts_orders.labels.inthisorder")}
- {(fields, { add, remove }) => {
+ {(fields, { add, remove, move }) => {
return (
{fields.map((field, index) => (
@@ -101,6 +102,11 @@ export default function PartsOrderModalComponent({
remove(field.name);
}}
/>
+
))}
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index fa48a3c00..a5e0116ff 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -214,7 +214,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
- {(fields, { add, remove }) => {
+ {(fields, { add, remove, move }) => {
return (
{fields.map((field, index) => (
@@ -256,6 +256,11 @@ export default function ShopInfoComponent({ form, saveLoading }) {
remove(field.name);
}}
/>
+
))}
@@ -276,7 +281,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
- {(fields, { add, remove }) => {
+ {(fields, { add, remove, move }) => {
return (
{fields.map((field, index) => (
@@ -318,6 +323,11 @@ export default function ShopInfoComponent({ form, saveLoading }) {
remove(field.name);
}}
/>
+
))}
diff --git a/client/src/components/shop-info/shop-info.orderstatus.component.jsx b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
index 0e55aca8b..81a6b66e3 100644
--- a/client/src/components/shop-info/shop-info.orderstatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
@@ -2,6 +2,7 @@ import { DeleteFilled } from "@ant-design/icons";
import { Button, Form, Input, Select, Row, Col } from "antd";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
//TODO Fix up styles.
export default function ShopInfoOrderStatusComponent({ form }) {
const { t } = useTranslation();
@@ -20,13 +21,14 @@ export default function ShopInfoOrderStatusComponent({ form }) {
- {(fields, { add, remove }) => {
+ {(fields, { add, remove, move }) => {
return (
{fields.map((field, index) => (
+ style={{ padding: 0, margin: 2 }}
+ >
+ ]}
+ >
+
))}
@@ -73,7 +82,8 @@ export default function ShopInfoOrderStatusComponent({ form }) {
message: t("general.validation.required"),
},
]}
- name={["md_order_statuses", "default_bo"]}>
+ name={["md_order_statuses", "default_bo"]}
+ >