Skip to content

Commit 75370ee

Browse files
author
aleksbobic
committed
Fix problems with icons, with env variables not being read and with some invalid properties
1 parent 6dba60e commit 75370ee

File tree

64 files changed

+17288
-23678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+17288
-23678
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ venv/
66
# dependencies
77
/app/node_modules
88
/app/.pnp
9+
/app2/node_modules
10+
/app2/.pnp
911
.pnp.js
1012

1113
# production

‎app/craco.config.js

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
const webpack = require('webpack');
2+
3+
require('dotenv').config({
4+
path:
5+
process.env.NODE_ENV === 'production'
6+
? '.env.production'
7+
: '.env.development'
8+
});
9+
10+
module.exports = {
11+
webpack: {
12+
plugins: {
13+
add: [
14+
new webpack.DefinePlugin({
15+
'process.env': JSON.stringify(process.env)
16+
})
17+
]
18+
}
19+
}
20+
};

‎app/package-lock.json

+16,628-23,291
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/package.json

+71-66
Original file line numberDiff line numberDiff line change
@@ -3,78 +3,80 @@
33
"version": "1.3.0",
44
"private": true,
55
"dependencies": {
6-
"@chakra-ui/react": "^1.8.8",
7-
"@emotion/react": "^11.9.3",
8-
"@emotion/styled": "^11.9.3",
9-
"@heroicons/react": "^2.0.13",
10-
"@tanstack/react-virtual": "^3.0.0-beta.23",
11-
"@testing-library/jest-dom": "^5.12.0",
12-
"@testing-library/react": "^11.2.6",
13-
"@testing-library/user-event": "^12.8.3",
14-
"@weknow/react-bubble-chart-d3": "^1.0.12",
15-
"@yaireo/tagify": "^4.7.2",
16-
"axios": "^0.21.1",
17-
"chart.js": "^3.9.1",
18-
"chartjs-plugin-datalabels": "^2.2.0",
19-
"classnames": "^2.3.1",
20-
"color-scheme": "^1.0.1",
21-
"css.gg": "^2.0.0",
22-
"d3": "^7.6.1",
23-
"d3-scale-chromatic": "^3.0.0",
24-
"dagre": "^0.8.5",
25-
"date-fns": "^2.29.3",
26-
"eslint-config-prettier": "^8.3.0",
27-
"eslint-plugin-prettier": "^3.4.0",
28-
"formik": "^2.2.9",
29-
"framer-motion": "^4.1.17",
30-
"html2canvas": "*",
31-
"http-status-codes": "^2.2.0",
32-
"husky": "^6.0.0",
33-
"lint-staged": "^11.0.0",
34-
"mobx": "^6.6.1",
35-
"mobx-react": "^7.5.2",
36-
"overlayscrollbars": "^2.0.1",
37-
"overlayscrollbars-react": "^0.5.0",
38-
"pptxgenjs": "^3.11.0",
39-
"prettier": "^2.3.0",
40-
"query-string": "^7.1.0",
41-
"react": "^17.0.2",
42-
"react-beforeunload": "^2.5.3",
43-
"react-chartjs-2": "^4.3.1",
44-
"react-csv": "^2.2.2",
45-
"react-dom": "^17.0.2",
46-
"react-dotdotdot": "^1.3.1",
47-
"react-dropzone": "^12.0.4",
48-
"react-flow-renderer": "^10.3.17",
49-
"react-force-graph-3d": "^1.21.13",
50-
"react-helmet-async": "^1.3.0",
51-
"react-joyride": "^2.5.4",
52-
"react-markdown": "^8.0.3",
53-
"react-resize-detector": "^7.1.2",
54-
"react-router-dom": "^5.2.0",
55-
"react-scripts": "4.0.3",
56-
"react-syntax-highlighter": "^15.5.0",
57-
"react-table": "^7.7.0",
58-
"react-virtualized-auto-sizer": "^1.0.7",
59-
"react-window": "^1.8.7",
60-
"remark-gfm": "^3.0.1",
61-
"reveal.js": "^4.4.0",
62-
"sass": "^1.0.0",
63-
"styled-components": "^5.3.0",
64-
"three-spritetext": "^1.6.2",
65-
"unique-names-generator": "^4.7.1",
66-
"uuid": "^8.3.2",
67-
"web-vitals": "^1.1.2"
6+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
7+
"@chakra-ui/react": "1.8.8",
8+
"@emotion/react": "11.9.3",
9+
"@emotion/styled": "11.9.3",
10+
"@heroicons/react": "^2.1.5",
11+
"@tanstack/react-virtual": "3.0.0-beta.23",
12+
"@testing-library/jest-dom": "5.12.0",
13+
"@testing-library/react": "11.2.6",
14+
"@testing-library/user-event": "12.8.3",
15+
"@weknow/react-bubble-chart-d3": "1.0.12",
16+
"@yaireo/tagify": "4.7.2",
17+
"axios": "0.21.1",
18+
"chart.js": "3.9.1",
19+
"chartjs-plugin-datalabels": "2.2.0",
20+
"classnames": "2.3.1",
21+
"color-scheme": "1.0.1",
22+
"d3": "7.6.1",
23+
"d3-scale-chromatic": "3.0.0",
24+
"dagre": "0.8.5",
25+
"date-fns": "2.29.3",
26+
"dotenv": "^16.4.5",
27+
"eslint-config-prettier": "8.3.0",
28+
"eslint-plugin-prettier": "3.4.0",
29+
"formik": "2.2.9",
30+
"framer-motion": "4.1.17",
31+
"html2canvas": "1.4.1",
32+
"http-status-codes": "2.2.0",
33+
"husky": "6.0.0",
34+
"lint-staged": "11.0.0",
35+
"mobx": "6.6.1",
36+
"mobx-react": "7.5.2",
37+
"overlayscrollbars": "2.0.1",
38+
"overlayscrollbars-react": "0.5.0",
39+
"pptxgenjs": "3.11.0",
40+
"prettier": "2.3.0",
41+
"query-string": "7.1.0",
42+
"react": "17.0.2",
43+
"react-beforeunload": "2.5.3",
44+
"react-chartjs-2": "4.3.1",
45+
"react-csv": "2.2.2",
46+
"react-dom": "17.0.2",
47+
"react-dotdotdot": "1.3.1",
48+
"react-dropzone": "12.0.4",
49+
"react-error-overlay": "^6.0.9",
50+
"react-flow-renderer": "10.3.17",
51+
"react-force-graph-3d": "1.21.13",
52+
"react-helmet-async": "1.3.0",
53+
"react-joyride": "2.5.4",
54+
"react-markdown": "8.0.3",
55+
"react-resize-detector": "7.1.2",
56+
"react-router-dom": "5.2.0",
57+
"react-scripts": "5.0.1",
58+
"react-syntax-highlighter": "15.5.0",
59+
"react-table": "7.7.0",
60+
"react-virtualized-auto-sizer": "1.0.7",
61+
"react-window": "1.8.7",
62+
"remark-gfm": "3.0.1",
63+
"reveal.js": "4.4.0",
64+
"sass": "1.0.0",
65+
"styled-components": "5.3.0",
66+
"three-spritetext": "1.6.2",
67+
"unique-names-generator": "4.7.1",
68+
"uuid": "8.3.2",
69+
"web-vitals": "1.1.2"
6870
},
6971
"lint-staged": {
7072
"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
7173
"prettier --write"
7274
]
7375
},
7476
"scripts": {
75-
"start": "react-scripts start",
76-
"build": "NODE_ENV=production GENERATE_SOURCEMAP=false react-scripts build",
77-
"test": "react-scripts test",
77+
"start": "craco start",
78+
"build": "NODE_ENV=production GENERATE_SOURCEMAP=false craco build",
79+
"test": "craco test",
7880
"eject": "react-scripts eject"
7981
},
8082
"eslintConfig": {
@@ -120,5 +122,8 @@
120122
"hooks": {
121123
"pre-commit": "lint-staged"
122124
}
125+
},
126+
"devDependencies": {
127+
"@craco/craco": "^7.1.0"
123128
}
124-
}
129+
}

‎app/src/app/App.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import CommentModal from 'components/feature/commentmodal/CommentModal.component
1818
import CustomScroll from 'components/feature/customscroll/CustomScroll.component';
1919
import { ErrorModal } from 'components/feature/errorModal/ErrorModal.component';
2020
import { isEnvFalse, isEnvTrue } from 'general.utils';
21-
import 'overlayscrollbars/styles/overlayscrollbars.css';
21+
import 'overlayscrollbars/overlayscrollbars.css';
2222
import PresentPage from 'pages/present/Present.page';
2323
import { useCallback, useContext, useEffect, useRef } from 'react';
2424
import { RootStoreContext } from 'stores/RootStore';

‎app/src/components/feature/advancedsearch/connectornode/ConnectorNode.component.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
Tooltip,
88
VStack
99
} from '@chakra-ui/react';
10-
import { Close } from 'css.gg';
10+
import { XMarkIcon } from '@heroicons/react/24/outline';
1111
import React from 'react';
1212
import { Handle } from 'react-flow-renderer';
1313

@@ -53,7 +53,7 @@ const connectorNode = ({ id, data, isConnectable }) => {
5353
<Tooltip label="Remove node">
5454
<IconButton
5555
size="xs"
56-
icon={<Close />}
56+
icon={<XMarkIcon />}
5757
onClick={() => data.deleteNode(id)}
5858
/>
5959
</Tooltip>

‎app/src/components/feature/advancedsearch/countsNode/Counts.component.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Tooltip,
99
VStack
1010
} from '@chakra-ui/react';
11-
import { Close } from 'css.gg';
11+
import { XMarkIcon } from '@heroicons/react/24/outline';
1212
import { Handle } from 'react-flow-renderer';
1313

1414
const countsNode = ({ id, data, isConnectable }) => {
@@ -45,7 +45,7 @@ const countsNode = ({ id, data, isConnectable }) => {
4545
<Tooltip label="Remove node">
4646
<IconButton
4747
size="xs"
48-
icon={<Close />}
48+
icon={<XMarkIcon />}
4949
onClick={() => data.deleteNode(id)}
5050
/>
5151
</Tooltip>

‎app/src/components/feature/advancedsearch/datasetNode/Dataset.component.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
Tooltip,
77
VStack
88
} from '@chakra-ui/react';
9-
import { Close } from 'css.gg';
9+
import { XMarkIcon } from '@heroicons/react/24/outline';
1010
import { Handle } from 'react-flow-renderer';
1111

1212
const datasetNode = ({ id, data, isConnectable }) => {
@@ -27,7 +27,7 @@ const datasetNode = ({ id, data, isConnectable }) => {
2727
<Tooltip label="Remove node">
2828
<IconButton
2929
size="xs"
30-
icon={<Close />}
30+
icon={<XMarkIcon />}
3131
onClick={() => data.deleteNode(id)}
3232
/>
3333
</Tooltip>

‎app/src/components/feature/advancedsearch/filternode/FilterNode.component.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
Tooltip,
1010
VStack
1111
} from '@chakra-ui/react';
12-
import { Close } from 'css.gg';
12+
import { XMarkIcon } from '@heroicons/react/24/outline';
1313
import { Handle } from 'react-flow-renderer';
1414

1515
const filterNode = ({ id, data, isConnectable }) => {
@@ -81,7 +81,7 @@ const filterNode = ({ id, data, isConnectable }) => {
8181
<Tooltip label="Remove node">
8282
<IconButton
8383
size="xs"
84-
icon={<Close />}
84+
icon={<XMarkIcon />}
8585
onClick={() => data.deleteNode(id)}
8686
/>
8787
</Tooltip>

‎app/src/components/feature/advancedsearch/keywordextractionnode/KeywordExtractionNode.component.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Tooltip,
99
VStack
1010
} from '@chakra-ui/react';
11-
import { Close } from 'css.gg';
11+
import { XMarkIcon } from '@heroicons/react/24/outline';
1212
import { Handle } from 'react-flow-renderer';
1313

1414
const keywordExtractionNode = ({ id, data, isConnectable }) => {
@@ -45,7 +45,7 @@ const keywordExtractionNode = ({ id, data, isConnectable }) => {
4545
<Tooltip label="Remove node">
4646
<IconButton
4747
size="xs"
48-
icon={<Close />}
48+
icon={<XMarkIcon />}
4949
onClick={() => data.deleteNode(id)}
5050
/>
5151
</Tooltip>

‎app/src/components/feature/advancedsearch/resultsNode/ResultsNode.component.jsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import {
77
Tooltip,
88
VStack
99
} from '@chakra-ui/react';
10-
import { Close, PlayButton } from 'css.gg';
10+
import { PlayIcon, XMarkIcon } from '@heroicons/react/24/outline';
11+
1112
import React from 'react';
1213
import { Handle } from 'react-flow-renderer';
1314

@@ -37,7 +38,7 @@ const resultsNode = ({ id, data, isConnectable }) => {
3738
<Tooltip label="Remove node">
3839
<IconButton
3940
size="xs"
40-
icon={<Close />}
41+
icon={<XMarkIcon />}
4142
onClick={() => data.deleteNode(id)}
4243
/>
4344
</Tooltip>
@@ -46,7 +47,7 @@ const resultsNode = ({ id, data, isConnectable }) => {
4647
<Button
4748
variant="solid"
4849
size="sm"
49-
rightIcon={<PlayButton />}
50+
rightIcon={<PlayIcon />}
5051
onClick={() => data.runWorkflow(id)}
5152
>
5253
Run workflow

‎app/src/components/feature/advancedsearch/searchnode/SearchNode.component.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
Tooltip,
1313
VStack
1414
} from '@chakra-ui/react';
15+
import { XMarkIcon } from '@heroicons/react/24/outline';
1516
import AutoCompleteInputComponent from 'components/feature/autocompleteinput/AutoCompleteInput.component';
16-
import { Close } from 'css.gg';
1717
import { Handle } from 'react-flow-renderer';
1818

1919
const searchNode = ({ id, data, isConnectable }) => {
@@ -239,7 +239,7 @@ const searchNode = ({ id, data, isConnectable }) => {
239239
<Tooltip label="Remove node">
240240
<IconButton
241241
size="xs"
242-
icon={<Close />}
242+
icon={<XMarkIcon />}
243243
onClick={() => data.deleteNode(id)}
244244
/>
245245
</Tooltip>

‎app/src/components/feature/autocompleteinput/AutoCompleteInput.component.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from '@chakra-ui/react';
99
import classNames from 'classnames';
1010
import { observer } from 'mobx-react';
11-
import 'overlayscrollbars/styles/overlayscrollbars.css';
11+
import 'overlayscrollbars/overlayscrollbars.css';
1212
import PropTypes from 'prop-types';
1313
import { useState } from 'react';
1414
import CustomScroll from '../customscroll/CustomScroll.component';

0 commit comments

Comments
 (0)