Skip to content

Commit 682e410

Browse files
committedMar 29, 2021
Change date in order-poll to today, remove ship date from DateList to get around this bug marmelab/react-admin#5116, pin react version to 17.0.1
1 parent a411a1f commit 682e410

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ __pycache__
2929
/.idea
3030
/yarn.lock
3131
/api/apilogs.log
32+
/api/tasklogs.log

‎api/api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# call to update dashboard database
2626
@app.cli.command()
2727
def order_poll():
28-
date = '\'2021-03-04\'' # 'getdate()'
28+
date = 'cast(getdate() as date' # '\'2021-03-04\''
2929

3030
with db.get_dyna_db().connect() as con:
3131
rs = con.execute(

‎package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
"@testing-library/jest-dom": "^5.11.4",
1010
"@testing-library/react": "^11.1.0",
1111
"@testing-library/user-event": "^12.1.10",
12+
"babel-loader": "8.1.0",
1213
"prop-types": "^15.7.2",
1314
"ra-data-simple-rest": "^3.10.4",
14-
"react": "^17.0.1",
15+
"react": "17.0.1",
1516
"react-admin": "^3.13.5",
1617
"react-barcode-reader": "^0.0.2",
1718
"react-dom": "^17.0.1",
1819
"react-redux": "7.2.2",
19-
"react-scripts": "4.0.3",
2020
"react-router-dom": "^5.2.0",
21+
"react-scripts": "4.0.3",
2122
"web-vitals": "^1.0.1"
2223
},
2324
"resolutions": {
@@ -54,12 +55,12 @@
5455
"@babel/plugin-proposal-class-properties": "^7.13.0"
5556
},
5657
"babel": {
57-
"presets": [
58-
"@babel/preset-env",
59-
"@babel/preset-react"
60-
],
61-
"plugins": [
62-
"@babel/plugin-proposal-class-properties"
63-
]
64-
}
58+
"presets": [
59+
"@babel/preset-env",
60+
"@babel/preset-react"
61+
],
62+
"plugins": [
63+
"@babel/plugin-proposal-class-properties"
64+
]
65+
}
6566
}

‎src/orders.js

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export const OrderList = props => (
1010
<ArrayField source="lines"><SingleFieldList><ChipField source="item_id" /></SingleFieldList></ArrayField>
1111
<ReferenceField source="order_id" reference="orders"><TextField source="id" /></ReferenceField>
1212
<TextField source="status" />
13-
<DateField source="ship_date" />
1413
<TextField source="ship_via" />
1514
</Datagrid>
1615
</List>

0 commit comments

Comments
 (0)
Please sign in to comment.