diff --git a/Xdev-app-update.yml b/dev-app-update.yml similarity index 100% rename from Xdev-app-update.yml rename to dev-app-update.yml diff --git a/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/down.yaml b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/down.yaml new file mode 100644 index 0000000..d0245ef --- /dev/null +++ b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/down.yaml @@ -0,0 +1,5 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "ppd_diff_alert"; + type: run_sql diff --git a/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/up.yaml b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/up.yaml new file mode 100644 index 0000000..00ae49f --- /dev/null +++ b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/up.yaml @@ -0,0 +1,6 @@ +- args: + cascade: false + read_only: false + sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "ppd_diff_alert" numeric NULL + DEFAULT .05; + type: run_sql diff --git a/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/down.yaml new file mode 100644 index 0000000..da91d45 --- /dev/null +++ b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/down.yaml @@ -0,0 +1,28 @@ +- args: + role: user + table: + name: bodyshops + schema: public + type: drop_select_permission +- args: + permission: + allow_aggregations: false + columns: + - accepted_ins_co + - created_at + - groups + - id + - shopname + - targets + - updated_at + 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/1604011938755_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/up.yaml new file mode 100644 index 0000000..1883517 --- /dev/null +++ b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/up.yaml @@ -0,0 +1,29 @@ +- args: + role: user + table: + name: bodyshops + schema: public + type: drop_select_permission +- args: + permission: + allow_aggregations: false + columns: + - accepted_ins_co + - created_at + - groups + - id + - ppd_diff_alert + - shopname + - targets + - updated_at + 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/1604011944447_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/down.yaml new file mode 100644 index 0000000..1ff07f9 --- /dev/null +++ b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/down.yaml @@ -0,0 +1,24 @@ +- args: + role: user + table: + name: bodyshops + schema: public + type: drop_update_permission +- args: + permission: + columns: + - accepted_ins_co + - groups + - shopname + - targets + filter: + associations: + user: + authid: + _eq: X-Hasura-User-Id + set: {} + role: user + table: + name: bodyshops + schema: public + type: create_update_permission diff --git a/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/up.yaml new file mode 100644 index 0000000..f52f9fc --- /dev/null +++ b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/up.yaml @@ -0,0 +1,25 @@ +- args: + role: user + table: + name: bodyshops + schema: public + type: drop_update_permission +- args: + permission: + columns: + - accepted_ins_co + - groups + - ppd_diff_alert + - shopname + - targets + filter: + associations: + user: + authid: + _eq: X-Hasura-User-Id + set: {} + role: user + table: + name: bodyshops + schema: public + type: create_update_permission diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml index f864e4b..171c7b2 100644 --- a/hasura/migrations/metadata.yaml +++ b/hasura/migrations/metadata.yaml @@ -46,6 +46,7 @@ tables: - created_at - groups - id + - ppd_diff_alert - shopname - targets - updated_at @@ -60,6 +61,7 @@ tables: columns: - accepted_ins_co - groups + - ppd_diff_alert - shopname - targets filter: diff --git a/package.json b/package.json index f2a446f..922a77e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "ImEX RPS", "author": "ImEX Systems Inc. ", "description": "ImEX RPS", - "version": "1.0.8", + "version": "1.0.2", "main": "electron/main.js", "homepage": "./", "dependencies": { diff --git a/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx b/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx index d5c7628..6552071 100644 --- a/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx +++ b/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx @@ -3,13 +3,16 @@ import React from "react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { selectSelectedJobTargetPc } from "../../../redux/application/application.selectors"; +import { selectBodyshop } from "../../../redux/user/user.selectors"; import "./price-diff-pc-formatter.styles.scss"; const mapStateToProps = createStructuredSelector({ selectedJobTargetPc: selectSelectedJobTargetPc, + bodyshop: selectBodyshop, }); export function PriceDiffPcFormatterAtom({ + bodyshop, price_diff_pc, selectedJobTargetPc, }) { @@ -22,7 +25,8 @@ export function PriceDiffPcFormatterAtom({ }} > {(price_diff_pc * 100).toFixed(1)}% - {price_diff_pc === 1 ? ( + {price_diff_pc === 1 || + (price_diff_pc <= bodyshop.ppd_diff_alert && price_diff_pc > 0) ? ( ) : null} diff --git a/src/components/atoms/update-available/update-available.atom.jsx b/src/components/atoms/update-available/update-available.atom.jsx deleted file mode 100644 index 684b25e..0000000 --- a/src/components/atoms/update-available/update-available.atom.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { createStructuredSelector } from "reselect"; -import { selectUpdateAvailable } from "../../../redux/application/application.selectors"; -const mapStateToProps = createStructuredSelector({ - //scanLoading: selectScanLoading, - updateAvailable: selectUpdateAvailable, -}); -const mapDispatchToProps = (dispatch) => ({}); - -export function UpdateAvailableAtom({ available }) { - return
Update Available!
; -} -export default connect( - mapStateToProps, - mapDispatchToProps -)(UpdateAvailableAtom); diff --git a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx index 38584c6..6b1e54a 100644 --- a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx +++ b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx @@ -60,6 +60,18 @@ export default function ShopSettingsFormMolecule({ form, saveLoading }) { >