Merge pull request #77 from Tolfix/QtKaii-deepsource_config

Create .deepsource.toml
Tolfix · Oct 11, 2022 · 297e142 · 297e142
2 parents 0e861be + a8807d5
commit 297e142
Show file tree

Hide file tree

Showing 51 changed files with 1,277 additions and 92 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -0,0 +1,12 @@
+version = 1
+
+[[analyzers]]
+name = "shell"
+enabled = true
+
+[[analyzers]]
+name = "javascript"
+enabled = true
+
+  [analyzers.meta]
+  plugins = ["react"]
diff --git a/.github/workflows/docker-admin.yml b/.github/workflows/docker-admin.yml
@@ -3,18 +3,15 @@ name: Docker Image - Admin
 on:
   push:
     paths:
-      - 'apps/admin/src/**'
-      - 'apps/admin/public/**'
-      - 'apps/admin/package.json'
-      - 'Dockerfile_ADMIN'
+      - "apps/admin/src/**"
+      - "apps/admin/public/**"
+      - "apps/admin/package.json"
+      - "apps/admin/Dockerfile"
     branches:
       - master
 
-
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -26,6 +23,6 @@ jobs:
         run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
       - name: Build the Docker image
-        run: docker build . --file Dockerfile_ADMIN --tag tolfixorg/cpg-admin:latest
+        run: docker build . --file ./apps/admin/Dockerfile --tag tolfixorg/cpg-admin:latest
       - name: Docker push
-        run: docker push tolfixorg/cpg-admin:latest
+        run: docker push tolfixorg/cpg-admin:latest
diff --git a/README.md b/README.md
@@ -4,20 +4,40 @@
   <strong>C</strong>entral <strong>P</strong>ayment <strong>G</strong>ateway
 </div>
 
-
 # ⭐ | CPG
+
 CPG is being used to create items, generate invoices, handle orders, view transactions, and ensure payments make it to the client to develop your business. It offers many approaches for developers to personalize CPG
 
+# Making domain package
+
+1. Copy `dummy` folder and paste in `packages` folder
+2. Rename with the format: `cpg-{package_name}`
+3. In `package.json` replace name with: `@cpg/{package_name}`
+4. Install dependencies in root with `npm i` (To sync with node_modules too)
+5. Makes changes and once done run with `npm run build -w=cpg/{package_name}`
+
+### Installing domain package to apps
+
+1. Go to app and to `package.json`
+2. Decide if it goes to dev or not
+3. Add a new line with the following: `"@cpg/{package_name}": "*"` (Star is needed)
+4. Go to root and run: `npm i`.
+
+This should install the dependency
+
 # 📢 | Contribute
+
 Want to contribute? Great!
 You can contribute to the repository by `forking`, then make a pull request when you're done!
 Remember to read our [CONTRIBUTING](https://github.com/Tolfix/cpg/blob/master/CONTRIBUTING.md) guidelines to ensure your `PR` gets accepted.
 Or you can ask on our [`discord server`](https://discord.tolfix.com).
 
 # 🔮 | Discord
+
 [![Discord](https://discord.com/api/guilds/833438897484595230/widget.png?style=banner4)](https://discord.tolfix.com)
 
 # ⚙ | Tolfix
+
 **Tolfix** is a `company` focused on `IT`, `Development` and `Networking`,
 we strive to help others with their `IT` issues and love contributing to other peoples projects!
 If you'd like to find out more, you can visit us at [`https://tolfix.com/`](https://tolfix.com/).
diff --git a/Dockerfile_ADMIN → apps/admin/Dockerfile b/Dockerfile_ADMIN → apps/admin/Dockerfile
@@ -1,8 +1,8 @@
-# Installer
-FROM node:16-alpine as INSTALLER
+# BUILDER
+FROM node:16-alpine as BUILDER
 
 # Caching
-# RUN apk add --no-cache libc6-compat
+RUN apk add --no-cache libc6-compat
 
 WORKDIR /app
 
@@ -13,17 +13,12 @@ RUN apk update && \
 RUN npm install -g @types/node \
     && npm install -g [email protected] 
 
-COPY . .
-
-RUN npm install --force
-##########################
+RUN npm i -g turbo
 
-# BUILDER
-FROM node:16-alpine as BUILDER
+COPY . .
 
-RUN npm i -g turbo
-COPY --from=INSTALLER . .
-WORKDIR /app
+RUN npm install -w=admin --force
+RUN npm run build -w=packages
 
 ##########################
 

diff --git a/apps/admin/src/components/Dashboard.tsx b/apps/admin/src/components/Dashboard.tsx
@@ -9,7 +9,6 @@ export default () =>
 {
     // Fetch the data from the server
     const [transactions, setTransactions] = React.useState<ITransactions<"income">[]>([]);
-    console.log(transactions);
     const setAuth = () =>
     {
         return {

diff --git a/apps/admin/src/components/configurable_options/Create.tsx b/apps/admin/src/components/configurable_options/Create.tsx
@@ -17,13 +17,14 @@ export const Create_configurable_options = (props: any) =>
             <FormTab label="General">
                 <TextInput label="Name" isRequired={true} source="name" />
                 {/* @ts-ignore */}
-                <ReferenceArrayInput filterToQuery={searchText => ({
-                    "name": searchText,
-                })} perPage={100} source="products_ids" reference="products">
+                <ReferenceArrayInput perPage={100} source="products_ids" reference="products">
                     <AutocompleteArrayInput
                         source="products"
                         label="Products"
                         isRequired={true}
+                        filterToQuery={searchText => ({
+                            "name": searchText,
+                        })}
                         optionText={(r: any) => `${r.name} - (${r.id})`}
                     />
                 </ReferenceArrayInput>

diff --git a/apps/admin/src/components/configurable_options/Edit.tsx b/apps/admin/src/components/configurable_options/Edit.tsx
@@ -17,12 +17,13 @@ export const Edit_configurable_options = (props: any) =>
             <FormTab label="General">
                 <TextInput label="Name" isRequired={true} source="name" />
                 {/* @ts-ignore */}
-                <ReferenceArrayInput filterToQuery={searchText => ({
-                    "name": searchText,
-                })} perPage={100} source="products_ids" reference="products">
+                <ReferenceArrayInput perPage={100} source="products_ids" reference="products">
                     <AutocompleteArrayInput
                         source="products"
                         label="Products"
+                        filterToQuery={searchText => ({
+                            "name": searchText,
+                        })}
                         isRequired={true}
                         optionText={(r: any) => `${r.name} - (${r.id})`}
                     />

diff --git a/apps/admin/src/components/customers/Edit.tsx b/apps/admin/src/components/customers/Edit.tsx
@@ -46,13 +46,14 @@ export const EditCustomer = (props: any) =>
                             {
                                 return { id: e, name: e };
                             })} fullWidth />
-                            <ReferenceInput filterToQuery={(searchText: any) => ({
-                                "id": searchText,
-                                customer_uid: id,
-                            })} perPage={100} allowEmpty label="Invoice id" source="invoice_id" reference="invoices">
+                            <ReferenceInput perPage={100} allowEmpty label="Invoice id" source="invoice_id" reference="invoices">
                                 <AutocompleteInput
                                     isRequired={false}
                                     optionText="id"
+                                    filterToQuery={(searchText: any) => ({
+                                        "id": searchText,
+                                        customer_uid: id,
+                                    })}
                                     fullWidth
                                 />
                             </ReferenceInput>

diff --git a/apps/admin/src/components/invoices/Create.tsx b/apps/admin/src/components/invoices/Create.tsx
@@ -72,12 +72,13 @@ export const CreateInvoices = (props: any) =>
                         <NumberInput isRequired={true} label="Amount" source="amount" />
                         <NumberInput label="Quantity" defaultValue={1} source="quantity" />
                         {/* @ts-ignore */}
-                        <ReferenceInput filterToQuery={searchText => ({
-                            "name": searchText,
-                        })} perPage={100} source="product_id" reference="products">
+                        <ReferenceInput perPage={100} source="product_id" reference="products">
                             <AutocompleteInput
                                 source="product"
                                 label="Product"
+                                filterToQuery={searchText => ({
+                                    "name": searchText,
+                                })}
                                 isRequired={true}
                                 fullWidth
                                 optionText={(r: any) => `${r.name} - (${r.id})`}
@@ -86,10 +87,10 @@ export const CreateInvoices = (props: any) =>
                     </SimpleFormIterator>
                 </ArrayInput>
 
-                <ReferenceArrayInput filterToQuery={(searchText: string) => ({
-                    "id": searchText,
-                })} perPage={100} source="transactions" reference="transactions">
-                    <AutocompleteArrayInput fullWidth optionText={(record) => record?.id?.toString() ?? ""} />
+                <ReferenceArrayInput perPage={100} source="transactions" reference="transactions">
+                    <AutocompleteArrayInput filterToQuery={(searchText: string) => ({
+                        "id": searchText,
+                    })} fullWidth optionText={(record) => record?.id?.toString() ?? ""} />
                 </ReferenceArrayInput>
 
             </FormTab>

diff --git a/apps/admin/src/components/invoices/Edit.tsx b/apps/admin/src/components/invoices/Edit.tsx
@@ -100,12 +100,13 @@ export const EditInvoices = (props: any) =>
                             <RichTextInput source="notes" />
                             <NumberInput isRequired={true} label="Amount" source="amount" />
                             <NumberInput label="Quantity" defaultValue={1} source="quantity" />
-                            <ReferenceInput filterToQuery={(searchText: any) => ({
-                                "name": searchText,
-                            })} perPage={100} source="product_id" reference="products">
+                            <ReferenceInput perPage={100} source="product_id" reference="products">
                                 <AutocompleteInput
                                     source="product"
                                     label="Product"
+                                    filterToQuery={(searchText: any) => ({
+                                        "name": searchText,
+                                    })}
                                     isRequired={true}
                                     optionText={(r: any) => `${r.name} - (${r.id})`}
                                     fullWidth
@@ -114,13 +115,14 @@ export const EditInvoices = (props: any) =>
                         </SimpleFormIterator>
                     </ArrayInput>
 
-                    <ReferenceArrayInput filterToQuery={(searchText: any) => ({
-                        "id": searchText,
-                    })} perPage={100} source="transactions" reference="transactions">
+                    <ReferenceArrayInput perPage={100} source="transactions" reference="transactions">
                         <AutocompleteArrayInput
                             source="transactions"
                             optionValue="id"
                             label="Transactions"
+                            filterToQuery={(searchText: any) => ({
+                                "id": searchText,
+                            })}
                             fullWidth
                             optionText={(record: any) => record?.id?.toString() ?? ""}
                         />

diff --git a/apps/admin/src/components/products/Create.tsx b/apps/admin/src/components/products/Create.tsx
@@ -4,10 +4,11 @@ import
     BooleanInput,
     Create, FormTab,
     NumberInput,
-    ReferenceArrayInput, AutocompleteInput,
+    AutocompleteInput,
     SimpleFormIterator,
     TabbedForm,
     TextInput,
+    ReferenceInput,
 } from "react-admin";
 //@ts-ignore
 import { RichTextInput } from 'ra-input-rich-text';
@@ -18,18 +19,18 @@ export const CreateProducts = (props: any) =>
     <Create {...props}>
         <TabbedForm>
             <FormTab label="General">
-                {/* @ts-ignore */}
-                <ReferenceArrayInput filterToQuery={searchText => ({
-                    "name": searchText,
-                })} perPage={100} source="category_uid" reference="categories">
+                <ReferenceInput perPage={100} source="category_uid" reference="categories">
                     <AutocompleteInput
                         source="categories"
                         label="Categories"
                         isRequired={true}
+                        filterToQuery={searchText => ({
+                            "name": searchText,
+                        })}
                         fullWidth
                         optionText={(r: any) => `${r.name} - (${r.id})`}
                     />
-                </ReferenceArrayInput>
+                </ReferenceInput>
                 <TextInput fullWidth isRequired={true} label="Name" source="name" />
                 <RichTextInput isRequired={true} label="Description" source="description" />
                 <BooleanInput label="Hidden" defaultValue={false} source="hidden" />

diff --git a/apps/admin/src/components/products/Edit.tsx b/apps/admin/src/components/products/Edit.tsx
@@ -18,12 +18,13 @@ export const EditProducts = (props: any) =>
     <Edit mutationMode="pessimistic" {...props}>
         <TabbedForm>
             <FormTab label="General">
-                <ReferenceInput filterToQuery={(searchText: string) => ({
-                    "name": searchText,
-                })} perPage={100} source="category_uid" reference="categories">
+                <ReferenceInput perPage={100} source="category_uid" reference="categories">
                     <AutocompleteInput
                         source="categories"
                         label="Category"
+                        filterToQuery={(searchText: string) => ({
+                            "name": searchText,
+                        })}
                         isRequired={true}
                         fullWidth
                         optionText={(r: any) => `${r.name} - (${r.id})`}

diff --git a/apps/admin/src/components/promotion_codes/Create.tsx b/apps/admin/src/components/promotion_codes/Create.tsx
@@ -26,7 +26,7 @@ export default function CreatePromotionCode(props: any)
                             source="products"
                             label="Products"
                             fullWidth
-                            optionText="name"
+                            optionText={(r: any) => `${r.name} - (${r.id})`}
                         />
                     </ReferenceArrayInput>
                 </FormTab>

diff --git a/apps/admin/src/components/promotion_codes/Edit.tsx b/apps/admin/src/components/promotion_codes/Edit.tsx
@@ -19,14 +19,15 @@ export default function EditPromotionCode(props: any)
                     <TextInput label="Valid to" source="valid_to" defaultValue={'permanent'} />
                     <NumberInput label="Max uses" source="uses" defaultValue={'unlimited'} />
                     <BooleanInput label="Percentage" source="percentage" />
-                    <ReferenceArrayInput filterToQuery={(searchText: string) => ({
-                        "name": searchText,
-                    })} perPage={100} source="products_ids" reference="products">
+                    <ReferenceArrayInput perPage={100} source="products_ids" reference="products">
                         <AutocompleteArrayInput
                             source="products"
                             label="Products"
+                            filterToQuery={(searchText: string) => ({
+                                "name": searchText,
+                            })}
                             fullWidth
-                            optionText="name"
+                            optionText={(r: any) => `${r.name} - (${r.id})`}
                         />
                     </ReferenceArrayInput>
                 </FormTab>

diff --git a/apps/admin/src/components/quotes/Edit.tsx b/apps/admin/src/components/quotes/Edit.tsx
@@ -43,12 +43,13 @@ export default function EditQuote(props: any)
                             optionText={RenderFullName}
                         />
                     </ReferenceInput>
-                    <ReferenceArrayInput filterToQuery={(searchText: string) => ({
-                        "name": searchText,
-                    })} perPage={100} source="promotion_codes" reference="promotion_codes">
+                    <ReferenceArrayInput perPage={100} source="promotion_codes" reference="promotion_codes">
                         <AutocompleteArrayInput
                             source="promotion_codes"
                             label="Promotion codes"
+                            filterToQuery={(searchText: string) => ({
+                                "name": searchText,
+                            })}
                             fullWidth
                             optionText="name"
                         />

diff --git a/apps/admin/src/components/transactions/Create.tsx b/apps/admin/src/components/transactions/Create.tsx
@@ -27,12 +27,13 @@ export const CreateTransactions = (props: any) =>
                                 />
                             </ReferenceInput>
                             <div>
-                                <ReferenceInput filterToQuery={(searchText: string) => ({
-                                    "id": searchText,
-                                })} perPage={100} source="invoice_uid"
+                                <ReferenceInput perPage={100} source="invoice_uid"
                                     reference="invoices" allowEmpty>
                                     <AutocompleteInput
                                         fullWidth
+                                        filterToQuery={(searchText: string) => ({
+                                            "id": searchText,
+                                        })}
                                         isRequired={formData.statement === "income"}
                                         optionText={(record) => record?.id?.toString() ?? ""} />
                                 </ReferenceInput>

diff --git a/apps/admin/src/components/transactions/Edit.tsx b/apps/admin/src/components/transactions/Edit.tsx
@@ -26,12 +26,13 @@ export const EditTrans = (props: any) =>
                                 />
                             </ReferenceInput>
                             <div>
-                                <ReferenceInput filterToQuery={(searchText: string) => ({
-                                    "id": searchText,
-                                })} perPage={100} source="invoice_uid" reference="invoices">
+                                <ReferenceInput perPage={100} source="invoice_uid" reference="invoices">
                                     <AutocompleteInput
                                         isRequired={formData.statement === "income"}
                                         fullWidth
+                                        filterToQuery={(searchText: string) => ({
+                                            "id": searchText,
+                                        })}
                                         optionText={(record) => record?.id?.toString() ?? ""}
                                     />
                                 </ReferenceInput>