Added rates containers + cached language selection

client/src/components/current-user-dropdown/current-user-dropdown.component.jsx

@@ -1,4 +1,4 @@
-import { useQuery } from "@apollo/react-hooks";
+import { useQuery, useApolloClient } from "@apollo/react-hooks";
 import { Avatar, Col, Dropdown, Icon, Menu, Row } from "antd";
 import i18next from "i18next";
 import React from "react";
@@ -12,13 +12,14 @@ import SignOut from "../sign-out/sign-out.component";
 export default function CurrentUserDropdown() {
   const { t } = useTranslation();
   const { loading, error, data } = useQuery(GET_CURRENT_USER);
+  const client = useApolloClient();
 
   const handleMenuClick = e => {
-    console.log("e", e);
     if (e.item.props.actiontype === "lang-select") {
       i18next.changeLanguage(e.key, (err, t) => {
         if (err)
           return console.log("Error encountered when changing languages.", err);
+        client.writeData({ data: { language: e.key } });
       });
     }
   };

client/src/components/jobs-list/jobs-list.component.jsx

@@ -25,6 +25,7 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
+      width: "8%",
       // onFilter: (value, record) => record.ro_number.includes(value),
       // filteredValue: state.filteredInfo.text || null,
       sorter: (a, b) => alphaSort(a, b),
@@ -45,6 +46,7 @@ export default withRouter(function JobsList({
       key: "owner",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      width: "25%",
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -64,6 +66,7 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.phone1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
+      width: "12%",
       ellipsis: true,
       render: (text, record) => {
         return record.ownr_ph1 ? (
@@ -86,6 +89,7 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
+      width: "10%",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a, b),
       sortOrder:
@@ -99,6 +103,7 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicle",
       key: "vehicle",
+      width: "15%",
       ellipsis: true,
       render: (text, record) => {
         return record.vehicle ? (
@@ -115,6 +120,7 @@ export default withRouter(function JobsList({
       title: t("vehicles.fields.plate_no"),
       dataIndex: "plate_no",
       key: "plate_no",
+      width: "8%",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a, b),
       sortOrder:
@@ -131,6 +137,7 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
+      width: "12%",
       ellipsis: true,
       sorter: (a, b) => alphaSort(a, b),
       sortOrder:
@@ -147,11 +154,12 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.clm_total"),
       dataIndex: "clm_total",
       key: "clm_total",
-      sorter: (a, b) => {
-        return a > b;
-      },
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
+      width: "8%",
+      // sorter: (a, b) => {
+      //   return a > b;
+      // },
+      // sortOrder:
+      //   state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
       render: (text, record) => {
         return record.clm_total ? (
           <span>{record.clm_total}</span>
@@ -164,6 +172,7 @@ export default withRouter(function JobsList({
       title: t("jobs.fields.owner_owing"),
       dataIndex: "owner_owing",
       key: "owner_owing",
+      width: "8%",
       render: (text, record) => {
         return record.owner_owing ? (
           <span>{record.owner_owing}</span>

client/src/components/jobs-rates/jobs-rates.component.jsx

@@ -0,0 +1,5 @@
+import React from "react";
+
+export default function JobsRatesComponent() {
+  return <div>Jobs Rates Comp</div>;
+}

client/src/components/jobs-rates/jobs-rates.container.jsx

@@ -0,0 +1,6 @@
+import React from "react";
+import JobsRatesComponent from "./jobs-rates.component";
+
+export default function JobsRatesContainer() {
+  return <JobsRatesComponent />;
+}

client/src/components/language-selector/langauge-selector.component.jsx

@@ -1,27 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-import i18next from "i18next";
-import { Dropdown, Menu, Icon } from "antd";
-
-export default function LanguageSelector() {
-  const { t } = useTranslation();
-
-  const handleMenuClick = e => {
-    i18next.changeLanguage(e.key, (err, t) => {
-      if (err)
-        return console.log("Error encountered when changing languages.", err);
-    });
-  };
-  const menu = (
-    <Menu onClick={handleMenuClick}>
-      <Menu.Item key="en_us">{t("general.languages.english")}</Menu.Item>
-      <Menu.Item key="fr">{t("general.languages.french")}</Menu.Item>
-      <Menu.Item key="es">{t("general.languages.spanish")}</Menu.Item>
-    </Menu>
-  );
-  return (
-    <Dropdown overlay={menu}>
-      <Icon type="global" />
-    </Dropdown>
-  );
-}