From bda4db3ed5352c3eac344dfbd3a1eab540ea9a07 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Tue, 16 Mar 2021 14:29:05 -0700 Subject: [PATCH] IO-779 Added shop sub status and blockers. --- bodyshop_translations.babel | 26 ++ .../jira-support-widget.component.jsx | 2 +- .../rbac-wrapper/rbac-wrapper.component.jsx | 6 - .../shop-sub-status.component.jsx | 33 ++ client/src/graphql/bodyshop.queries.js | 2 + .../pages/manage/manage.page.component.jsx | 420 ++++++++---------- .../pages/manage/manage.page.container.jsx | 11 +- client/src/translations/en_us/common.json | 3 + client/src/translations/es/common.json | 3 + client/src/translations/fr/common.json | 3 + .../down.yaml | 5 + .../up.yaml | 6 + .../down.yaml | 78 ++++ .../up.yaml | 79 ++++ hasura/migrations/metadata.yaml | 1 + 15 files changed, 435 insertions(+), 243 deletions(-) create mode 100644 client/src/components/shop-sub-status/shop-sub-status.component.jsx create mode 100644 hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/down.yaml create mode 100644 hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/up.yaml create mode 100644 hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/down.yaml create mode 100644 hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/up.yaml diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index b2195fade..3d67ca6d0 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -11882,6 +11882,32 @@ + + sub_status + + + expired + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + sunday false diff --git a/client/src/components/jira-support-widget/jira-support-widget.component.jsx b/client/src/components/jira-support-widget/jira-support-widget.component.jsx index 54280f8dc..e450c297a 100644 --- a/client/src/components/jira-support-widget/jira-support-widget.component.jsx +++ b/client/src/components/jira-support-widget/jira-support-widget.component.jsx @@ -3,7 +3,7 @@ import React, { useEffect } from "react"; export default function JiraSupportComponent() { useScript(); - return
Jira Temp Widget
; + return
; } const useScript = () => { diff --git a/client/src/components/rbac-wrapper/rbac-wrapper.component.jsx b/client/src/components/rbac-wrapper/rbac-wrapper.component.jsx index d9fb24870..6da4f06a2 100644 --- a/client/src/components/rbac-wrapper/rbac-wrapper.component.jsx +++ b/client/src/components/rbac-wrapper/rbac-wrapper.component.jsx @@ -29,12 +29,6 @@ function RbacWrapper({ }) { const { t } = useTranslation(); - console.log( - "********object :>> ", - action, - rbacDefaults[action], - bodyshop.md_rbac[action] - ); if ( (requiredAuthLevel && requiredAuthLevel <= authLevel) || ((bodyshop.md_rbac && bodyshop.md_rbac[action]) || rbacDefaults[action]) <= diff --git a/client/src/components/shop-sub-status/shop-sub-status.component.jsx b/client/src/components/shop-sub-status/shop-sub-status.component.jsx new file mode 100644 index 000000000..b6f04b836 --- /dev/null +++ b/client/src/components/shop-sub-status/shop-sub-status.component.jsx @@ -0,0 +1,33 @@ +import { Button, Result } from "antd"; +import React from "react"; +import { useTranslation } from "react-i18next"; +import { connect } from "react-redux"; +import { createStructuredSelector } from "reselect"; +import { selectBodyshop } from "../../redux/user/user.selectors"; +const mapStateToProps = createStructuredSelector({ + bodyshop: selectBodyshop, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(ShopSubStatus); + +export function ShopSubStatus({ bodyshop }) { + const { t } = useTranslation(); + const { sub_status } = bodyshop; + return ( + { + alert("Not implemented yet."); + }} + > + {t("general.actions.submitticket")} + + } + /> + ); +} diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js index 880e1402d..33d359845 100644 --- a/client/src/graphql/bodyshop.queries.js +++ b/client/src/graphql/bodyshop.queries.js @@ -80,6 +80,7 @@ export const QUERY_BODYSHOP = gql` use_fippa md_payment_types md_hour_split + sub_status employees { id first_name @@ -158,6 +159,7 @@ export const UPDATE_SHOP = gql` use_fippa md_payment_types md_hour_split + sub_status employees { id first_name diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index 333c63cc9..ea7af17dc 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -12,8 +12,10 @@ import ChatAffixContainer from "../../components/chat-affix/chat-affix.container import ConflictComponent from "../../components/conflict/conflict.component"; import ErrorBoundary from "../../components/error-boundary/error-boundary.component"; import FcmNotification from "../../components/fcm-notification/fcm-notification.component"; +import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component"; //import FooterComponent from "../../components/footer/footer.component"; //Component Imports + import HeaderContainer from "../../components/header/header.container"; import JiraSupportComponent from "../../components/jira-support-widget/jira-support-widget.component"; import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; @@ -21,7 +23,10 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container"; import TestComponent from "../../components/_test/test.component"; import { QUERY_STRIPE_ID } from "../../graphql/bodyshop.queries"; -import { selectInstanceConflict } from "../../redux/user/user.selectors"; +import { + selectBodyshop, + selectInstanceConflict, +} from "../../redux/user/user.selectors"; import client from "../../utils/GraphQLClient"; import "./manage.page.styles.scss"; @@ -166,15 +171,198 @@ const stripePromise = new Promise((resolve, reject) => { const mapStateToProps = createStructuredSelector({ conflict: selectInstanceConflict, + bodyshop: selectBodyshop, }); -export function Manage({ match, conflict }) { +export function Manage({ match, conflict, bodyshop }) { const { t } = useTranslation(); useEffect(() => { document.title = t("titles.app"); }, [t]); + const AppRouteTable = ( + } + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + // + } + + + + + + + + + + + + + + + ); + + let PageContent; + + if (conflict) PageContent = ; + else if (bodyshop && bodyshop.sub_status !== "active") + PageContent = ; + else PageContent = AppRouteTable; + return (
@@ -183,233 +371,7 @@ export function Manage({ match, conflict }) { - - {conflict ? ( - - ) : ( - - } - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - // - } - - - - - - - - - - - - - - - )} - + {PageContent} diff --git a/client/src/pages/manage/manage.page.container.jsx b/client/src/pages/manage/manage.page.container.jsx index c7e06ecf3..c3e5903b6 100644 --- a/client/src/pages/manage/manage.page.container.jsx +++ b/client/src/pages/manage/manage.page.container.jsx @@ -1,15 +1,14 @@ import { useQuery } from "@apollo/client"; import React, { useEffect } from "react"; +import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; +import { createStructuredSelector } from "reselect"; import AlertComponent from "../../components/alert/alert.component"; +import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; import { QUERY_BODYSHOP } from "../../graphql/bodyshop.queries"; import { setBodyshop } from "../../redux/user/user.actions"; -import ManagePage from "./manage.page.component"; -import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; -import { useTranslation } from "react-i18next"; -import { createStructuredSelector } from "reselect"; import { selectBodyshop } from "../../redux/user/user.selectors"; -import NoShop from "../../components/no-shop/no-shop.component"; +import ManagePage from "./manage.page.component"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop }); @@ -32,8 +31,6 @@ function ManagePageContainer({ match, setBodyshop, bodyshop }) { return ; if (error) return ; - if (bodyshop && bodyshop.notfound) return ; - return ; } diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 17dca9d16..1a2fef3e2 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -764,6 +764,9 @@ "sendagain": "Send Again", "sendby": "Send By", "signin": "Sign In", + "sub_status": { + "expired": "The subscription for this shop has expired. Please contact technical support to reactivate the subscription. " + }, "sunday": "Sunday", "text": "Text", "thursday": "Thursday", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 872d22bc8..b360f802d 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -764,6 +764,9 @@ "sendagain": "", "sendby": "", "signin": "", + "sub_status": { + "expired": "" + }, "sunday": "", "text": "", "thursday": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 6561ab687..6809b4952 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -764,6 +764,9 @@ "sendagain": "", "sendby": "", "signin": "", + "sub_status": { + "expired": "" + }, "sunday": "", "text": "", "thursday": "", diff --git a/hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/down.yaml b/hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/down.yaml new file mode 100644 index 000000000..caca3a404 --- /dev/null +++ b/hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "sub_status"; + type: run_sql diff --git a/hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/up.yaml b/hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/up.yaml new file mode 100644 index 000000000..7dd40c290 --- /dev/null +++ b/hasura/migrations/1615929091635_alter_table_public_bodyshops_add_column_sub_status/up.yaml @@ -0,0 +1,6 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "sub_status" text NOT NULL DEFAULT + 'active'; + type: run_sql diff --git a/hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/down.yaml new file mode 100644 index 000000000..5a5ac5eec --- /dev/null +++ b/hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/down.yaml @@ -0,0 +1,78 @@ +- args: + role: user + table: + name: bodyshops + schema: public + type: drop_select_permission +- args: + permission: + allow_aggregations: false + columns: + - accountingconfig + - address1 + - address2 + - appt_alt_transport + - appt_colors + - appt_length + - bill_tax_rates + - city + - country + - created_at + - default_adjustment_rate + - deliverchecklist + - email + - enforce_class + - federal_tax_id + - id + - imexshopid + - inhousevendorid + - insurance_vendor_id + - intakechecklist + - logo_img_path + - md_categories + - md_classes + - md_hour_split + - md_ins_cos + - md_labor_rates + - md_messaging_presets + - md_notes_presets + - md_order_statuses + - md_parts_locations + - md_payment_types + - md_rbac + - md_referral_sources + - md_responsibility_centers + - md_ro_statuses + - messagingservicesid + - phone + - prodtargethrs + - production_config + - region_config + - schedule_end_time + - schedule_start_time + - scoreboard_target + - shopname + - shoprates + - speedprint + - ssbuckets + - state + - state_tax_id + - stripe_acct_id + - target_touchtime + - template_header + - textid + - updated_at + - use_fippa + - workingdays + - zip_post + computed_fields: [] + filter: + associations: + user: + authid: + _eq: X-Hasura-User-Id + role: user + table: + name: bodyshops + schema: public + type: create_select_permission diff --git a/hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/up.yaml new file mode 100644 index 000000000..7541894cb --- /dev/null +++ b/hasura/migrations/1615929109833_update_permission_user_public_table_bodyshops/up.yaml @@ -0,0 +1,79 @@ +- args: + role: user + table: + name: bodyshops + schema: public + type: drop_select_permission +- args: + permission: + allow_aggregations: false + columns: + - accountingconfig + - address1 + - address2 + - appt_alt_transport + - appt_colors + - appt_length + - bill_tax_rates + - city + - country + - created_at + - default_adjustment_rate + - deliverchecklist + - email + - enforce_class + - federal_tax_id + - id + - imexshopid + - inhousevendorid + - insurance_vendor_id + - intakechecklist + - logo_img_path + - md_categories + - md_classes + - md_hour_split + - md_ins_cos + - md_labor_rates + - md_messaging_presets + - md_notes_presets + - md_order_statuses + - md_parts_locations + - md_payment_types + - md_rbac + - md_referral_sources + - md_responsibility_centers + - md_ro_statuses + - messagingservicesid + - phone + - prodtargethrs + - production_config + - region_config + - schedule_end_time + - schedule_start_time + - scoreboard_target + - shopname + - shoprates + - speedprint + - ssbuckets + - state + - state_tax_id + - stripe_acct_id + - sub_status + - target_touchtime + - template_header + - textid + - updated_at + - use_fippa + - workingdays + - zip_post + computed_fields: [] + filter: + associations: + user: + authid: + _eq: X-Hasura-User-Id + role: user + table: + name: bodyshops + schema: public + type: create_select_permission diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml index 39ac4dae1..dfff958f5 100644 --- a/hasura/migrations/metadata.yaml +++ b/hasura/migrations/metadata.yaml @@ -777,6 +777,7 @@ tables: - state - state_tax_id - stripe_acct_id + - sub_status - target_touchtime - template_header - textid