admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-134 Limit shop uploads based on plan.

Browse Source
This commit is contained in:
Patrick Fic
2021-04-05 16:57:44 -07:00
parent e3b0aba892
commit 50581c98e0
25 changed files with 671 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
bodyshop_translations.babel
View File

@@ -10211,6 +10211,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>storageexceeded</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>storageexceeded_title</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>upload</name>
<definition_loaded>false</definition_loaded>
@@ -10232,6 +10274,69 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>upload_limitexceeded</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>upload_limitexceeded_title</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>usage</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>

58
client/src/components/documents-upload/documents-upload.component.jsx
View File

@@ -1,14 +1,15 @@
import { UploadOutlined } from "@ant-design/icons";
import { Upload } from "antd";
import React from "react";
import { notification, Progress, Result, Space, Upload } from "antd";
import React, { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import {
selectBodyshop,
selectCurrentUser,
} from "../../redux/user/user.selectors";
import formatBytes from "../../utils/formatbytes";
import { handleUpload } from "./documents-upload.utility";
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser,
bodyshop: selectBodyshop,
@@ -22,10 +23,46 @@ export function DocumentsUploadComponent({
tagsArray,
billId,
callbackAfterUpload,
totalSize,
}) {
const { t } = useTranslation();
const pct = useMemo(() => {
return parseInt(
(totalSize / ((bodyshop && bodyshop.jobsizelimit) || 1)) * 100
);
}, [bodyshop, totalSize]);
if (pct > 100)
return (
<Result
status="error"
title={t("documents.labels.storageexceeded_title")}
subTitle={t("documents.labels.storageexceeded")}
></Result>
);
return (
<Upload.Dragger
multiple={true}
beforeUpload={(file, fileList) => {
const newFiles = fileList.reduce((acc, val) => acc + val.size, 0);
const shouldStopUpload =
(totalSize + newFiles) / ((bodyshop && bodyshop.jobsizelimit) || 1) >=
1;
//Check to see if old files plus newly uploaded ones will be too much.
if (shouldStopUpload) {
notification.open({
key: "cannotuploaddocuments",
type: "error",
message: t("documents.labels.upload_limitexceeded_title"),
description: t("documents.labels.upload_limitexceeded"),
});
return Upload.LIST_IGNORE;
}
return true;
}}
customRequest={(ev) =>
handleUpload(ev, {
bodyshop: bodyshop,
@@ -39,11 +76,6 @@ export function DocumentsUploadComponent({
accept="audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx"
// showUploadList={false}
>
{
// <Button type="primary">
// <UploadOutlined />
// </Button>
}
{children || (
<>
<p className="ant-upload-drag-icon">
@@ -52,6 +84,16 @@ export function DocumentsUploadComponent({
<p className="ant-upload-text">
Click or drag files to this area to upload.
</p>
<Space wrap className="ant-upload-text">
<Progress type="dashboard" percent={pct} size="small" />
<span>
{t("documents.labels.usage", {
percent: pct,
used: formatBytes(totalSize),
total: formatBytes(bodyshop && bodyshop.jobsizelimit),
})}
</span>
</Space>
</>
)}
</Upload.Dragger>

1
client/src/components/documents-upload/documents-upload.utility.js
View File

@@ -134,6 +134,7 @@ export const uploadToCloudinary = async (
type: fileType,
extension: extension,
bodyshopid: bodyshop.id,
size: file.size || cloudinaryUploadResponse.data.bytes,
},
],
},

5
client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
View File

@@ -16,6 +16,8 @@ function JobsDocumentsComponent({
refetch,
billId,
billsCallback,
totalSize,
bodyshop,
}) {
const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
const { t } = useTranslation();
@@ -104,7 +106,7 @@ function JobsDocumentsComponent({
}, [data, setgalleryImages, t]);
return (
<div className="clea rfix">
<div>
<Row gutter={[16, 16]}>
<Col span={24}>
<Space wrap>
@@ -126,6 +128,7 @@ function JobsDocumentsComponent({
<Card>
<DocumentsUploadComponent
jobId={jobId}
totalSize={totalSize}
billId={billId}
callbackAfterUpload={billsCallback || refetch}
/>

1
client/src/components/jobs-documents-gallery/jobs-documents-gallery.container.jsx
View File

@@ -23,6 +23,7 @@ export default function JobsDocumentsContainer({
return (
<JobDocuments
data={(data && data.documents) || documentsList || []}
totalSize={data && data.documents_aggregate.aggregate.sum.size}
billId={billId}
jobId={jobId}
refetch={refetch}

9
client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
View File

@@ -34,6 +34,15 @@ export function TechClockOffButton({
(e) => e.id === technician && technician.id
)[0];
console.log(
"emps :>> ",
emps,
"e",
bodyshop && bodyshop.employees,
"tech",
technician
);
const handleFinish = async (values) => {
logImEXEvent("tech_clock_out_job");

2
client/src/graphql/bodyshop.queries.js
View File

@@ -81,6 +81,7 @@ export const QUERY_BODYSHOP = gql`
md_payment_types
md_hour_split
sub_status
jobsizelimit
employees {
id
first_name
@@ -160,6 +161,7 @@ export const UPDATE_SHOP = gql`
md_payment_types
md_hour_split
sub_status
jobsizelimit
employees {
id
first_name

13
client/src/graphql/documents.queries.js
View File

@@ -2,15 +2,18 @@ import { gql } from "@apollo/client";
export const GET_DOCUMENTS_BY_JOB = gql`
query GET_DOCUMENTS_BY_JOB($jobId: uuid!) {
documents(
where: { jobid: { _eq: $jobId } }
order_by: { updated_at: desc }
) {
documents_aggregate(where: { jobid: { _eq: $jobId } }) {
aggregate {
sum {
size
}
}
}
documents(order_by: { updated_at: desc }) {
id
name
key
type
extension
bill {
id
invoice_number

7
client/src/translations/en_us/common.json
View File

@@ -658,7 +658,12 @@
"confirmdelete": "Are you sure you want to delete these documents. This CANNOT be undone.",
"doctype": "Document Type",
"newjobid": "Assign to Job",
"upload": "Upload"
"storageexceeded": "You've exceeded your storage limit for this job. Please remove documents, or increase your storage plan.",
"storageexceeded_title": "Storage Limit Exceeded",
"upload": "Upload",
"upload_limitexceeded": "Uploading all selected files will exceed the job storage limit for your shop. ",
"upload_limitexceeded_title": "Unable to upload file(s)",
"usage": "of job storage used. ({{used}} / {{total}})"
},
"successes": {
"delete": "Document deleted successfully.",

7
client/src/translations/es/common.json
View File

@@ -658,7 +658,12 @@
"confirmdelete": "",
"doctype": "",
"newjobid": "",
"upload": "Subir"
"storageexceeded": "",
"storageexceeded_title": "",
"upload": "Subir",
"upload_limitexceeded": "",
"upload_limitexceeded_title": "",
"usage": ""
},
"successes": {
"delete": "Documento eliminado con éxito.",

7
client/src/translations/fr/common.json
View File

@@ -658,7 +658,12 @@
"confirmdelete": "",
"doctype": "",
"newjobid": "",
"upload": "Télécharger"
"storageexceeded": "",
"storageexceeded_title": "",
"upload": "Télécharger",
"upload_limitexceeded": "",
"upload_limitexceeded_title": "",
"usage": ""
},
"successes": {
"delete": "Le document a bien été supprimé.",

10
client/src/utils/formatbytes.js Normal file
View File

@@ -0,0 +1,10 @@
export default function formatBytes(a, b = 2) {
if (0 === a || !a) return "0 Bytes";
const c = 0 > b ? 0 : b,
d = Math.floor(Math.log(a) / Math.log(1024));
return (
parseFloat((a / Math.pow(1024, d)).toFixed(c)) +
" " +
["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"][d]
);
}

5
hasura/migrations/1617658602531_alter_table_public_documents_add_column_size/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."documents" DROP COLUMN "size";
type: run_sql

6
hasura/migrations/1617658602531_alter_table_public_documents_add_column_size/up.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."documents" ADD COLUMN "size" integer NOT NULL DEFAULT
0;
type: run_sql

45
hasura/migrations/1617658618070_update_permission_user_public_table_documents/down.yaml Normal file
View File

@@ -0,0 +1,45 @@
- args:
role: user
table:
name: documents
schema: public
type: drop_insert_permission
- args:
permission:
check:
_or:
- job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
- bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- billid
- bodyshopid
- created_at
- extension
- id
- jobid
- key
- name
- type
- updated_at
- uploaded_by
set: {}
role: user
table:
name: documents
schema: public
type: create_insert_permission

46
hasura/migrations/1617658618070_update_permission_user_public_table_documents/up.yaml Normal file
View File

@@ -0,0 +1,46 @@
- args:
role: user
table:
name: documents
schema: public
type: drop_insert_permission
- args:
permission:
check:
_or:
- job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
- bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- billid
- bodyshopid
- created_at
- extension
- id
- jobid
- key
- name
- size
- type
- updated_at
- uploaded_by
set: {}
role: user
table:
name: documents
schema: public
type: create_insert_permission

46
hasura/migrations/1617658628914_update_permission_user_public_table_documents/down.yaml Normal file
View File

@@ -0,0 +1,46 @@
- args:
role: user
table:
name: documents
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- billid
- bodyshopid
- created_at
- extension
- id
- jobid
- key
- name
- type
- updated_at
- uploaded_by
computed_fields: []
filter:
_or:
- job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
- bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: documents
schema: public
type: create_select_permission

47
hasura/migrations/1617658628914_update_permission_user_public_table_documents/up.yaml Normal file
View File

@@ -0,0 +1,47 @@
- args:
role: user
table:
name: documents
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- billid
- bodyshopid
- created_at
- extension
- id
- jobid
- key
- name
- size
- type
- updated_at
- uploaded_by
computed_fields: []
filter:
_or:
- job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
- bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: documents
schema: public
type: create_select_permission

47
hasura/migrations/1617659090899_update_permission_user_public_table_documents/down.yaml Normal file
View File

@@ -0,0 +1,47 @@
- args:
role: user
table:
name: documents
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- billid
- bodyshopid
- created_at
- extension
- id
- jobid
- key
- name
- size
- type
- updated_at
- uploaded_by
computed_fields: []
filter:
_or:
- job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
- bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: documents
schema: public
type: create_select_permission

47
hasura/migrations/1617659090899_update_permission_user_public_table_documents/up.yaml Normal file
View File

@@ -0,0 +1,47 @@
- args:
role: user
table:
name: documents
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- billid
- bodyshopid
- created_at
- extension
- id
- jobid
- key
- name
- size
- type
- updated_at
- uploaded_by
computed_fields: []
filter:
_or:
- job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
- bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: documents
schema: public
type: create_select_permission

5
hasura/migrations/1617659647022_alter_table_public_bodyshops_add_column_jobsizelimit/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "jobsizelimit";
type: run_sql

6
hasura/migrations/1617659647022_alter_table_public_bodyshops_add_column_jobsizelimit/up.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "jobsizelimit" integer NOT NULL
DEFAULT 26214400;
type: run_sql

79
hasura/migrations/1617659660451_update_permission_user_public_table_bodyshops/down.yaml Normal file
View File

@@ -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

80
hasura/migrations/1617659660451_update_permission_user_public_table_bodyshops/up.yaml Normal file
View File

@@ -0,0 +1,80 @@
- 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
- jobsizelimit
- 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

4
hasura/migrations/metadata.yaml
View File

@@ -750,6 +750,7 @@ tables:
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- jobsizelimit
- logo_img_path
- md_categories
- md_classes
@@ -1488,6 +1489,7 @@ tables:
- jobid
- key
- name
- size
- type
- updated_at
- uploaded_by
@@ -1503,6 +1505,7 @@ tables:
- jobid
- key
- name
- size
- type
- updated_at
- uploaded_by
@@ -1525,6 +1528,7 @@ tables:
_eq: X-Hasura-User-Id
- active:
_eq: true
allow_aggregations: true
update_permissions:
- role: user
permission: