Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin panel fixes #16

Merged
merged 5 commits into from
May 13, 2022
Merged

Admin panel fixes #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61354a6
feat: :sparkles: Added new packages
Tolfx May 13, 2022
1f38142
feat: :sparkles: Added date for browser support
Tolfx May 13, 2022
b4f1fe8
feat: :construction: Working on time
Tolfx May 13, 2022
e0ab0e2
feat: :sparkles: Added `RenderFullName` method
Tolfx May 13, 2022
95d88fe
chore: :lipstick: Massive cleanup on admin
Tolfx May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions apps/admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@
"@types/query-string": "^6.3.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"date-and-time": "^2.3.1",
"dotenv": "^10.0.0",
"eslint": "^8.14.0",
"eslint-config-custom": "*",
"exchange-rates-api": "^1.1.0",
"interfaces": "*",
"lib": "*",
"prop-types": "^15.7.2",
"query-string": "^7.0.1",
"ra-data-json-server": "^3.19.0",
Expand All @@ -23,13 +29,8 @@
"react-dom": "^17.0.2",
"react-dropzone": "^11.4.2",
"react-scripts": "4.0.3",
"typescript": "^4.1.2",
"exchange-rates-api": "^1.1.0",
"eslint": "^8.14.0",
"eslint-config-custom": "*",
"interfaces": "*",
"lib": "*",
"tsconfig": "*",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1"
},
"scripts": {
Expand Down
26 changes: 15 additions & 11 deletions apps/admin/src/components/configurable_options/Create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
import
{
ArrayInput,
Create, FormTab,
NumberInput,
ReferenceArrayInput, SelectArrayInput,
SimpleFormIterator,
TabbedForm,
TextInput,
} from "react-admin";
{
ArrayInput,
AutocompleteArrayInput,
Create, FormTab,
NumberInput,
ReferenceArrayInput,
SimpleFormIterator,
TabbedForm,
TextInput,
} from "react-admin";

export const Create_configurable_options = (props: any) =>
(
<Create {...props}>
<TabbedForm>
<FormTab label="General">
<TextInput label="Name" required={true} source="name" />
<ReferenceArrayInput source="products_ids" reference="products">
<SelectArrayInput
{/* @ts-ignore */}
<ReferenceArrayInput filterToQuery={searchText => ({
"name": searchText,
})} perPage={100} source="products_ids" reference="products">
<AutocompleteArrayInput
source="products"
label="Products"
required={true}
Expand Down
26 changes: 15 additions & 11 deletions apps/admin/src/components/configurable_options/Edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
import
{
ArrayInput,
Edit, FormTab,
NumberInput,
ReferenceArrayInput, SelectArrayInput,
SimpleFormIterator,
TabbedForm,
TextInput,
} from "react-admin";
{
ArrayInput,
AutocompleteArrayInput,
Edit, FormTab,
NumberInput,
ReferenceArrayInput,
SimpleFormIterator,
TabbedForm,
TextInput,
} from "react-admin";

export const Edit_configurable_options = (props: any) =>
(
<Edit {...props}>
<TabbedForm>
<FormTab label="General">
<TextInput label="Name" required={true} source="name" />
<ReferenceArrayInput source="products_ids" reference="products">
<SelectArrayInput
{/* @ts-ignore */}
<ReferenceArrayInput filterToQuery={searchText => ({
"name": searchText,
})} perPage={100} source="products_ids" reference="products">
<AutocompleteArrayInput
source="products"
label="Products"
required={true}
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/src/components/customers/Edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { currencyCodes } from "lib/Currencies";
import { Edit, FormTab, PasswordInput, SelectInput, TabbedForm, TextInput } from "react-admin";
import { Edit, FormTab, PasswordInput, AutocompleteInput, TabbedForm, TextInput } from "react-admin";

export const EditCustomer = (props: any) =>
(
Expand All @@ -21,7 +21,7 @@ export const EditCustomer = (props: any) =>
<TextInput label="City" required={true} source="billing.city" />
<TextInput label="State" required={true} source="billing.state" />
<TextInput label="Postcode" required={true} source="billing.postcode" />
<SelectInput required={true} source="currency" choices={currencyCodes.map(e =>
<AutocompleteInput required={true} source="currency" choices={currencyCodes.map(e =>
{
return { id: e, name: e };
})} />
Expand Down
34 changes: 21 additions & 13 deletions apps/admin/src/components/invoices/Create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,45 @@
import
{
ArrayInput,
AutocompleteArrayInput,
BooleanInput,
Create, DateInput, FormTab,
NumberInput,
ReferenceArrayInput, SelectArrayInput, SelectInput,
ReferenceArrayInput, AutocompleteInput,
SimpleFormIterator,
TabbedForm,
} from "react-admin";
//@ts-ignore
import MarkdownInput from 'ra-input-markdown';
import { currencyCodes } from "lib/Currencies";
import RenderFullName from "../../lib/RenderFullName";

export const CreateInvoices = (props: any) =>
(
<Create {...props}>
<TabbedForm>
<FormTab label="General">
<ReferenceArrayInput source="customer_uid" reference="customers">
<SelectInput
{/* @ts-ignore */}
<ReferenceArrayInput filterToQuery={searchText => ({
"personal.first_name": searchText,
})} perPage={100} source="customer_uid" reference="customers">
<AutocompleteInput
source="customers"
label="Customer"
required={true}
allowEmpty={false}
optionText={
(record: { personal: { first_name: any; last_name: any; } }) =>
`${record.personal.first_name} ${record.personal.last_name}`}
optionText={RenderFullName}
/>
</ReferenceArrayInput>
<SelectInput required={true} source="status" choices={[
<AutocompleteInput required={true} source="status" choices={[
{ id: "draft", name: "draft" },
{ id: "refunded", name: "refunded" },
{ id: "collections", name: "collections" },
{ id: "payment_pending", name: "payment_pending" },
{ id: "active", name: "active" },
{ id: "pending", name: "pending" },
]} />
<SelectInput required={true} source="payment_method" choices={[
<AutocompleteInput required={true} source="payment_method" choices={[
{ id: "none", name: "none" },
{ id: "manual", name: "manual" },
{ id: "bank", name: "bank" },
Expand All @@ -45,7 +48,7 @@ export const CreateInvoices = (props: any) =>
{ id: "swish", name: "swish" },
]} />
<NumberInput required={true} label="Amount" source="amount" />
<SelectInput required={true} source="currency" choices={currencyCodes.map(e =>
<AutocompleteInput required={true} source="currency" choices={currencyCodes.map(e =>
{
return { id: e, name: e };
})} />
Expand All @@ -66,8 +69,11 @@ export const CreateInvoices = (props: any) =>
<MarkdownInput source="notes" />
<NumberInput required={true} label="Amount" source="amount" />
<NumberInput label="Quantity" defaultValue={1} source="quantity" />
<ReferenceArrayInput source="product_id" reference="products">
<SelectInput
{/* @ts-ignore */}
<ReferenceArrayInput filterToQuery={searchText => ({
"name": searchText,
})} perPage={100} source="product_id" reference="products">
<AutocompleteInput
source="product"
label="Product"
required={true}
Expand All @@ -78,8 +84,10 @@ export const CreateInvoices = (props: any) =>
</SimpleFormIterator>
</ArrayInput>

<ReferenceArrayInput source="transactions" reference="transactions">
<SelectArrayInput optionText={(record) => record.id.toString()} />
<ReferenceArrayInput filterToQuery={(searchText: string) => ({
"id": searchText,
})} perPage={100} source="transactions" reference="transactions">
<AutocompleteArrayInput optionText={(record) => record?.id?.toString() ?? ""} />
</ReferenceArrayInput>

</FormTab>
Expand Down
36 changes: 22 additions & 14 deletions apps/admin/src/components/invoices/Edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
import
{
ArrayInput,
AutocompleteArrayInput,
BooleanInput,
DateInput, Edit, FormTab,
NumberInput,
ReferenceArrayInput, ReferenceInput, SelectArrayInput, SelectInput,
ReferenceArrayInput, ReferenceInput, AutocompleteInput,
SimpleFormIterator,
TabbedForm,
} from "react-admin";
//@ts-ignore
import MarkdownInput from 'ra-input-markdown';
import { currencyCodes } from "lib/Currencies";
import RenderFullName from "../../lib/RenderFullName";
export const EditInvoices = (props: any) =>
(
<Edit {...props}>
<TabbedForm>

<FormTab label="General">

<ReferenceInput source="customer_uid" reference="customers">
<SelectInput
{/* @ts-ignore */}
<ReferenceInput filterToQuery={searchText => ({
"personal.first_name": searchText,
})} perPage={100} source="customer_uid" reference="customers">
<AutocompleteInput
source="customers"
label="Customer"
required={true}
allowEmpty={false}
optionText={
(record: { personal: { first_name: any; last_name: any; } }) =>
`${record.personal.first_name} ${record.personal.last_name}`}
optionText={RenderFullName}
/>
</ReferenceInput>

<SelectInput required={true} source="status" choices={[
<AutocompleteInput required={true} source="status" choices={[
{ id: "draft", name: "draft" },
{ id: "refunded", name: "refunded" },
{ id: "collections", name: "collections" },
Expand All @@ -41,7 +44,7 @@ export const EditInvoices = (props: any) =>
{ id: "cancelled", name: "cancelled" },
]} />

<SelectInput required={true} source="payment_method" choices={[
<AutocompleteInput required={true} source="payment_method" choices={[
{ id: "none", name: "none" },
{ id: "manual", name: "manual" },
{ id: "bank", name: "bank" },
Expand All @@ -51,7 +54,7 @@ export const EditInvoices = (props: any) =>
]} />

<NumberInput required={true} label="Amount" source="amount" />
<SelectInput required={true} source="currency" choices={currencyCodes.map(e =>
<AutocompleteInput required={true} source="currency" choices={currencyCodes.map(e =>
{
return { id: e, name: e };
})} />
Expand All @@ -76,8 +79,10 @@ export const EditInvoices = (props: any) =>
<MarkdownInput source="notes" />
<NumberInput required={true} label="Amount" source="amount" />
<NumberInput label="Quantity" defaultValue={1} source="quantity" />
<ReferenceInput source="product_id" reference="products">
<SelectInput
<ReferenceInput filterToQuery={searchText => ({
"name": searchText,
})} perPage={100} source="product_id" reference="products">
<AutocompleteInput
source="product"
label="Product"
required={true}
Expand All @@ -88,11 +93,14 @@ export const EditInvoices = (props: any) =>
</SimpleFormIterator>
</ArrayInput>

<ReferenceArrayInput source="transactions" reference="transactions">
<SelectArrayInput
{/* @ts-ignore */}
<ReferenceArrayInput filterToQuery={searchText => ({
"id": searchText,
})} perPage={100} source="transactions" reference="transactions">
<AutocompleteArrayInput
source="transactions"
label="Transactions"
optionText={(record) => record.id.toString()}
optionText={(record) => record?.id?.toString() ?? ""}
/>
</ReferenceArrayInput>

Expand Down
12 changes: 5 additions & 7 deletions apps/admin/src/components/invoices/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import
Filter,
SearchInput,
ReferenceInput,
SelectInput,
ArrayField
AutocompleteInput,
ArrayField,
} from 'react-admin';
import RenderFullName from "../../lib/RenderFullName";

const PostPagination = (props: JSX.IntrinsicAttributes) => <Pagination rowsPerPageOptions={[10, 25, 50, 100]} {...props} />;

Expand All @@ -22,9 +23,7 @@ const TagFilter = (props: any) =>
<SearchInput name='Search id' source="id" alwaysOn={true} />
{/* Search for specific customer */}
<ReferenceInput label="Customer" source="customer_uid" reference="customers" alwaysOn={true}>
<SelectInput optionText={
(record: { personal: { first_name: any; last_name: any; } }) =>
`${record.personal.first_name} ${record.personal.last_name}`} />
<AutocompleteInput optionText={RenderFullName} />
</ReferenceInput>
</Filter>
)
Expand All @@ -38,8 +37,7 @@ export const InvoicesList = (props: any) => (
<ReferenceField label="Customer" source="customer_uid" reference="customers">
<FunctionField
// @ts-ignore
render={(record) =>
`${record.personal.first_name} ${record.personal.last_name}`}
render={RenderFullName}
source="personal.first_name"
/>
</ReferenceField>
Expand Down
Loading