react-sqlite-hook
Advanced tools
Comparing version 1.0.0-beta.3 to 1.0.0-beta.4
@@ -0,1 +1,14 @@ | ||
## 1.0.0-beta.4 (2021-01-14) REFACTOR | ||
## Chore | ||
- @capacitor/core@2.4.6 | ||
- @capacitor-community/sqlite@2.9.0 | ||
### Bug Fixes | ||
- Fix issue#60 remove Android permissions | ||
- Fix readme & changelog | ||
- fix APIHook.md | ||
## 1.0.0-beta.3 (2021-01-05) REFACTOR | ||
@@ -71,3 +84,9 @@ | ||
## 0.0.8 (2021-01-13) | ||
### Bug Fixes | ||
- Fix readme | ||
## 0.0.7 (2020-11-14) | ||
@@ -74,0 +93,0 @@ |
{ | ||
"name": "react-sqlite-hook", | ||
"version": "1.0.0-beta.2", | ||
"version": "1.0.0-beta.3", | ||
"description": "React Hook for @Capacitor-community/sqlite plugin", | ||
@@ -47,8 +47,8 @@ "repository": { | ||
"react": "^17.0.1", | ||
"@capacitor/core": "^2.4.5", | ||
"@capacitor-community/sqlite": "refactor" | ||
"@capacitor/core": "^2.4.6", | ||
"@capacitor-community/sqlite": "^2.9.0" | ||
}, | ||
"devDependencies": { | ||
"@capacitor-community/sqlite": "^2.9.0-beta.3", | ||
"@capacitor/core": "^2.4.5", | ||
"@capacitor-community/sqlite": "^2.9.0", | ||
"@capacitor/core": "^2.4.6", | ||
"@capacitor/docgen": "0.0.10", | ||
@@ -61,3 +61,3 @@ "@testing-library/react-hooks": "^3.4.2", | ||
"jest-environment-jsdom-fourteen": "^0.1.0", | ||
"np": "^7.0.0", | ||
"np": "^7.2.0", | ||
"react": "^17.0.1", | ||
@@ -64,0 +64,0 @@ "react-app-polyfill": "^2.0.0", |
@@ -85,8 +85,2 @@ import { AvailableResult } from './util/models'; | ||
/** | ||
* Request Permissions | ||
* @returns Promise<Result> | ||
* @since 1.0.0 refactor | ||
*/ | ||
requestPermissions(): Promise<Result>; | ||
/** | ||
* Copy databases from assets to application database folder | ||
@@ -93,0 +87,0 @@ * @returns Promise<Result> |
@@ -21,39 +21,2 @@ import { useCallback, useMemo } from 'react'; | ||
}; | ||
/** | ||
* Request Permissions | ||
*/ | ||
const requestPermissions = useCallback(async () => { | ||
return new Promise(async (resolve) => { | ||
console.log("$$$$ platform " + platform); | ||
if (platform === "android") { | ||
const androidPermissions = async () => { | ||
console.log("$$$$ going to ask for permissions " + platform); | ||
try { | ||
await sqlitePlugin.requestPermissions(); | ||
return { result: true }; | ||
} | ||
catch (e) { | ||
console.log("Error requesting permissions " + e); | ||
return { result: false, | ||
message: "Error requesting permissions " + e }; | ||
} | ||
}; | ||
let permissionsListener = null; | ||
permissionsListener = sqlitePlugin.addListener('androidPermissionsRequest', async (e) => { | ||
if (e.permissionGranted === 0) { | ||
permissionsListener.remove(); | ||
resolve({ result: false, message: "Error Permissions not granted" }); | ||
} | ||
else { | ||
permissionsListener.remove(); | ||
resolve({ result: true }); | ||
} | ||
}); | ||
await androidPermissions(); | ||
} | ||
else { | ||
resolve({ result: false, message: "Error Permissions not required for this platform" }); | ||
} | ||
}); | ||
}, [platform, sqlitePlugin]); | ||
const echo = useCallback(async (value) => { | ||
@@ -225,3 +188,3 @@ if (value) { | ||
if (!availableFeaturesN.useSQLite) { | ||
return Object.assign({ echo: featureNotAvailableError, getPlatform: featureNotAvailableError, createConnection: featureNotAvailableError, closeConnection: featureNotAvailableError, retrieveConnection: featureNotAvailableError, retrieveAllConnections: featureNotAvailableError, closeAllConnections: featureNotAvailableError, addUpgradeStatement: featureNotAvailableError, importFromJson: featureNotAvailableError, isJsonValid: featureNotAvailableError, requestPermissions: featureNotAvailableError, copyFromAssets: featureNotAvailableError }, notAvailable); | ||
return Object.assign({ echo: featureNotAvailableError, getPlatform: featureNotAvailableError, createConnection: featureNotAvailableError, closeConnection: featureNotAvailableError, retrieveConnection: featureNotAvailableError, retrieveAllConnections: featureNotAvailableError, closeAllConnections: featureNotAvailableError, addUpgradeStatement: featureNotAvailableError, importFromJson: featureNotAvailableError, isJsonValid: featureNotAvailableError, copyFromAssets: featureNotAvailableError }, notAvailable); | ||
} | ||
@@ -232,5 +195,5 @@ else { | ||
addUpgradeStatement, importFromJson, isJsonValid, copyFromAssets, | ||
requestPermissions, isAvailable: true }; | ||
isAvailable: true }; | ||
} | ||
}; | ||
//# sourceMappingURL=useSQLite.js.map |
@@ -22,3 +22,2 @@ <p align="center"><br><img src="https://user-images.githubusercontent.com/236501/85893648-1c92e880-b7a8-11ea-926d-95355b8175c7.png" width="128" height="128" /></p> | ||
* [`isJsonValid(...)`](#isjsonvalid) | ||
* [`requestPermissions()`](#requestpermissions) | ||
* [`copyFromAssets()`](#copyfromassets) | ||
@@ -218,17 +217,2 @@ * [Interfaces](#interfaces) | ||
### requestPermissions() | ||
```typescript | ||
requestPermissions() => Promise<Result> | ||
``` | ||
Request Permissions | ||
**Returns:** <code>Promise<<a href="#result">Result</a>></code> | ||
**Since:** 1.0.0 refactor | ||
-------------------- | ||
### copyFromAssets() | ||
@@ -235,0 +219,0 @@ |
{ | ||
"name": "react-sqlite-hook", | ||
"version": "1.0.0-beta.3", | ||
"version": "1.0.0-beta.4", | ||
"description": "React Hook for @Capacitor-community/sqlite plugin", | ||
@@ -47,8 +47,8 @@ "repository": { | ||
"react": "^17.0.1", | ||
"@capacitor/core": "^2.4.5", | ||
"@capacitor-community/sqlite": "refactor" | ||
"@capacitor/core": "^2.4.6", | ||
"@capacitor-community/sqlite": "^2.9.0" | ||
}, | ||
"devDependencies": { | ||
"@capacitor-community/sqlite": "^2.9.0-beta.3", | ||
"@capacitor/core": "^2.4.5", | ||
"@capacitor-community/sqlite": "^2.9.0", | ||
"@capacitor/core": "^2.4.6", | ||
"@capacitor/docgen": "0.0.10", | ||
@@ -61,3 +61,3 @@ "@testing-library/react-hooks": "^3.4.2", | ||
"jest-environment-jsdom-fourteen": "^0.1.0", | ||
"np": "^7.0.0", | ||
"np": "^7.2.0", | ||
"react": "^17.0.1", | ||
@@ -64,0 +64,0 @@ "react-app-polyfill": "^2.0.0", |
@@ -10,3 +10,2 @@ | ||
var platform: string = 'ios'; | ||
var listeners: string[] = []; | ||
return { | ||
@@ -30,11 +29,3 @@ Plugins: { | ||
addListener: (eventName: string) => { | ||
listeners.push(eventName); | ||
return {permissionGranted: 1}; | ||
}, | ||
removeAllListeners: () => { | ||
listeners = []; | ||
} | ||
} | ||
@@ -144,3 +135,3 @@ }, | ||
import { renderHook, act } from '@testing-library/react-hooks' | ||
import { useSQLite/*, SQLiteProps*/ } from './useSQLite'; | ||
import { useSQLite } from './useSQLite'; | ||
import { SQLiteDBConnection } from '@capacitor-community/sqlite'; | ||
@@ -170,7 +161,3 @@ import '@capacitor-community/sqlite'; | ||
/* const permissionsRequest: SQLiteProps = {onPermissionsRequest: (permissionGranted: number) => { | ||
console.log(`Permission Granted : ${permissionGranted}` ); | ||
}} | ||
*/ | ||
const r = renderHook(() => useSQLite(/*permissionsRequest*/)); | ||
const r = renderHook(() => useSQLite()); | ||
@@ -177,0 +164,0 @@ await act(async () => { |
@@ -96,9 +96,2 @@ import { useCallback, useMemo } from 'react'; | ||
/** | ||
* Request Permissions | ||
* @returns Promise<Result> | ||
* @since 1.0.0 refactor | ||
*/ | ||
requestPermissions(): Promise<Result>; | ||
/** | ||
* Copy databases from assets to application database folder | ||
@@ -147,39 +140,2 @@ * @returns Promise<Result> | ||
/** | ||
* Request Permissions | ||
*/ | ||
const requestPermissions = useCallback(async ():Promise<any> => { | ||
return new Promise(async (resolve) => { | ||
console.log("$$$$ platform " + platform) | ||
if(platform === "android") { | ||
const androidPermissions = async () => { | ||
console.log("$$$$ going to ask for permissions " + platform) | ||
try { | ||
await sqlitePlugin.requestPermissions(); | ||
return { result: true }; | ||
} catch (e) { | ||
console.log("Error requesting permissions " + e); | ||
return { result: false, | ||
message: "Error requesting permissions " + e}; | ||
} | ||
} | ||
let permissionsListener: any = null; | ||
permissionsListener = sqlitePlugin.addListener( | ||
'androidPermissionsRequest',async (e: any) => { | ||
if(e.permissionGranted === 0) { | ||
permissionsListener.remove(); | ||
resolve({result: false, message: | ||
"Error Permissions not granted"}); | ||
} else { | ||
permissionsListener.remove(); | ||
resolve({result: true}); | ||
} | ||
}); | ||
await androidPermissions(); | ||
} else { | ||
resolve({result: false, message: | ||
"Error Permissions not required for this platform"}); | ||
} | ||
}); | ||
}, [platform, sqlitePlugin]); | ||
@@ -375,3 +331,2 @@ const echo = useCallback(async (value: string): Promise<any> => { | ||
isJsonValid: featureNotAvailableError, | ||
requestPermissions: featureNotAvailableError, | ||
copyFromAssets: featureNotAvailableError, | ||
@@ -384,5 +339,5 @@ ...notAvailable | ||
addUpgradeStatement, importFromJson, isJsonValid, copyFromAssets, | ||
requestPermissions, isAvailable: true}; | ||
isAvailable: true}; | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
60861
1060