Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-admin-import-csv",
"version": "4.0.0",
"version": "5.0.0",
"description": "CSV import button for react-admin",
"repository": "https://github.com/benwinding/react-admin-import-csv",
"homepage": "https://github.com/benwinding/react-admin-import-csv",
Expand All @@ -13,7 +13,7 @@
"esm",
"src"
],
"main": "lib/index",
"main": "lib/index.js",
"module": "esm/index.js",
"scripts": {
"build": "yarn run build-cjs && yarn run build-esm",
Expand All @@ -28,31 +28,31 @@
"clean": "rimraf dist"
},
"peerDependencies": {
"react-admin": "4.x"
"react-admin": "5.x"
},
"dependencies": {
"papaparse": "5.x",
"ramda": "0.28.0"
},
"devDependencies": {
"@types/jest": "28.1.6",
"@types/node": "17.0.25",
"@types/jest": "29.x",
"@types/node": "25.0.x",
"@types/papaparse": "5.x",
"@types/ramda": "0.28.15",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react": "^19.x",
"@types/react-dom": "^19.x",
"jest-coverage-badges": "^1.1.2",
"ra-data-fakerest": "^4.0.1",
"ra-data-fakerest": "^5.13.*",
"ra-language-chinese": "^2.0.10",
"ra-language-russian": "^3.13.5",
"ra-language-spanish": "1.x",
"react": "^17.0.0",
"react-admin": "4.0.x",
"react-dom": "^17.0.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-admin": "5.13.x",
"react-scripts": "5.0.1",
"source-map-loader": "^3.0.1",
"ts-jest": "26.x",
"jest": "26.6.0",
"typescript": "4.x"
"source-map-loader": "^5.0.0",
"ts-jest": "29.x",
"jest": "29.x",
"typescript": "5.x"
}
}
12 changes: 6 additions & 6 deletions src/import-controller.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Translate, DataProvider, Identifier } from "ra-core";
import { TranslateFunction , DataProvider, Identifier } from "ra-core";
import { processCsvFile } from "./csv-extractor";
import { SimpleLogger } from "./SimpleLogger";
import { ValidateRowFunction } from "./config.interface";
Expand All @@ -11,7 +11,7 @@ function makeLogger(logging: boolean) {

export async function GetIdsColliding(
logging: boolean,
translate: Translate,
translate: TranslateFunction,
dataProvider: DataProvider,
csvValues: any[],
resourceName: string,
Expand All @@ -37,7 +37,7 @@ export async function GetIdsColliding(

export async function GetIdsCollidingGetSingle(
logging: boolean,
translate: Translate,
translate: TranslateFunction,
dataProvider: DataProvider,
csvIds: Identifier[],
resourceName: string,
Expand Down Expand Up @@ -69,7 +69,7 @@ export async function IsIdColliding(

export async function GetIdsCollidingGetMany(
logging: boolean,
translate: Translate,
translate: TranslateFunction,
dataProvider: DataProvider,
csvIds: Identifier[],
resourceName: string,
Expand All @@ -89,7 +89,7 @@ export async function GetIdsCollidingGetMany(

export async function CheckCSVValidation(
logging: boolean,
translate: Translate,
translate: TranslateFunction,
csvValues: any[],
validateRow?: ValidateRowFunction
): Promise<void> {
Expand All @@ -107,7 +107,7 @@ export async function CheckCSVValidation(

export async function GetCSVItems(
logging: boolean,
translate: Translate,
translate: TranslateFunction,
file: File,
parseConfig: any,
): Promise<any[]> {
Expand Down
3 changes: 2 additions & 1 deletion src/main-csv-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
GetCSVItems,
GetIdsColliding,
} from "./import-controller";
import { useTranslate } from "ra-core";
import { create, update } from "./uploader";
import { translateWrapper } from "./translateWrapper";
import { ImportCsvDialogStrategy } from "./components/import-csv-dialog-strategy";
Expand All @@ -16,7 +17,7 @@ import { ImportButton } from "./components/import-button";

export const MainCsvImport = (props: any) => {
const refresh = useRefresh();
const translate = translateWrapper();
const translate = useTranslate();
const dataProvider = useDataProvider();
const resource = useResourceContext();

Expand Down
Loading