@carbonorm/carbonreact 3.4.4 → 3.4.5

package/src/api/rest/Locations.test.tsx

@@ -1,137 +0,0 @@
-import {xdescribe, expect, test} from '@jest/globals';
-import {CarbonReact} from "@carbonorm/carbonreact";
-import {checkAllRequestsComplete} from "@carbonorm/carbonnode";
-import {act, waitFor} from '@testing-library/react';
-import {C6, iRestfulObjectArrayTypes, iLocations, locations } from "api/rest/C6";
-import Locations from "./Locations";
-
-const randomString = Math.random().toString(36).substring(7);
-const randomInt = Math.floor(Math.random() * 1000000);
-const fillString = 'string' + randomString + randomInt;
-
-/**
-CREATE TABLE `carbon_locations` (
-  `entity_id` binary(16) NOT NULL,
-  `latitude` varchar(225) DEFAULT NULL,
-  `longitude` varchar(225) DEFAULT NULL,
-  `street` varchar(225) DEFAULT NULL,
-  `city` varchar(40) DEFAULT NULL,
-  `state` varchar(10) DEFAULT NULL,
-  `elevation` varchar(40) DEFAULT NULL,
-  `zip` int DEFAULT NULL,
-  PRIMARY KEY (`entity_id`),
-  UNIQUE KEY `entity_location_entity_id_uindex` (`entity_id`),
-  CONSTRAINT `entity_location_entity_entity_pk_fk` FOREIGN KEY (`entity_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-const Test_Data: iLocations = {
-
-}
-
-export default Test_Data;
-
-xdescribe('REST Locations api', () => {
-
-    let testData = Test_Data;
-
-    test('GET POST PUT DELETE', async () => {
-
-        await act(async () => {
-
-            let selectAllResponse = await Locations.Get({})
-
-            if ('function' === typeof selectAllResponse) {
-                throw Error('selectAllResponse is a promise, this typically means this specific get request has already run during test setup.');
-            }
-
-            // We don't care if it is filled or not, just that the request can be made.
-            expect(selectAllResponse?.data?.rest).not.toBeUndefined();
-
-            const postResponse = await Locations.Post(testData);
-
-            console.log('postResponse', postResponse?.data)
-
-            expect(postResponse?.data?.created).not.toBeUndefined();
-
-            const primaryKey = locations.PRIMARY_SHORT[0];
-
-            const postID = postResponse?.data?.created
-
-            const singleRowSelect = await Locations.Get({
-                [C6.WHERE]: {
-                    [locations[primaryKey.toUpperCase()]]: postID,
-                }
-            })
-
-            if ('function' === typeof singleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', singleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(singleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof singleRowSelect?.data?.rest).toEqual('object');
-
-            // todo - make this work correctly with multiple primary keys
-            const selectedPostId = singleRowSelect?.data?.rest[0][primaryKey]
-
-            expect(selectedPostId).toEqual(postID);
-
-            const multipleRowSelect = await Locations.Get({
-                [C6.WHERE]: {
-                    [locations[primaryKey.toUpperCase()]]: [C6.IN, [0, postID]],
-                }
-            })
-
-            if ('function' === typeof multipleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', multipleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(multipleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof multipleRowSelect?.data?.rest).toEqual('object');
-
-            testData[primaryKey] = postID
-
-            testData.entity_id = fillString.substring(0, 16);
-            testData.latitude = fillString.substring(0, 225);
-            testData.longitude = fillString.substring(0, 225);
-            testData.street = fillString.substring(0, 225);
-            testData.city = fillString.substring(0, 40);
-            testData.state = fillString.substring(0, 10);
-            testData.elevation = fillString.substring(0, 40);
-            testData.zip = randomInt;
-
-            // wait for the global state to be updated
-            expect(CarbonReact.getState<iRestfulObjectArrayTypes>().locations).not.toBeUndefined();
-
-            const updateResponse = await Locations.Put(testData)
-
-            expect(updateResponse?.data?.updated).not.toBeUndefined();
-
-            const deleteResponse = await Locations.Delete({
-                [primaryKey]: postID
-            })
-
-            console.log('deleteResponse', deleteResponse?.data)
-
-            expect(deleteResponse?.data?.deleted).not.toBeUndefined();
-
-            await waitFor(async () => {
-                expect(checkAllRequestsComplete()).toEqual(true);
-            }, {timeout: 10000, interval: 1000});
-
-        })
-
-    }, 100000);
-
-})
-

package/src/api/rest/Locations.tsx

@@ -1,149 +0,0 @@
-import {
-    iPostC6RestResponse,
-    restRequest,
-    GET,
-    POST,
-    PUT,
-    DELETE,
-    iDeleteC6RestResponse,
-    iGetC6RestResponse,
-    iPutC6RestResponse,
-    removeInvalidKeys
-} from "@carbonorm/carbonnode";
-import {AxiosResponse} from "axios";
-import {iAPI, Modify} from "restRequest";
-import {deleteRestfulObjectArrays, updateRestfulObjectArrays} from "@carbonorm/carbonreact";
-import {C6, iLocations, locations, RestTableNames} from "./C6";
-
-/**
-CREATE TABLE `carbon_locations` (
-  `entity_id` binary(16) NOT NULL,
-  `latitude` varchar(225) DEFAULT NULL,
-  `longitude` varchar(225) DEFAULT NULL,
-  `street` varchar(225) DEFAULT NULL,
-  `city` varchar(40) DEFAULT NULL,
-  `state` varchar(10) DEFAULT NULL,
-  `elevation` varchar(40) DEFAULT NULL,
-  `zip` int DEFAULT NULL,
-  PRIMARY KEY (`entity_id`),
-  UNIQUE KEY `entity_location_entity_id_uindex` (`entity_id`),
-  CONSTRAINT `entity_location_entity_entity_pk_fk` FOREIGN KEY (`entity_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-type GetCustomAndRequiredFields = {}
-
-type GetRequestTableOverrides = {}
-
-// required parameters, optional parameters, parameter type overrides, response, and table names
-export const Get = restRequest<GetCustomAndRequiredFields, iLocations, GetRequestTableOverrides, iGetC6RestResponse<iLocations>, RestTableNames>({
-    C6: C6,
-    tableName: locations.TABLE_NAME,
-    requestMethod: GET,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully received locations!'
-        request.error ??= 'An unknown issue occurred creating the locations!'
-        return request
-    },
-    responseCallback: (response, _request) => {
-        updateRestfulObjectArrays<iLocations>(response?.data?.rest, "locations", C6.locations.PRIMARY_SHORT as (keyof iLocations)[])
-    }
-});
-
-type PutCustomAndRequiredFields = {}
-
-type PutRequestTableOverrides = {}
-
-export function putStateLocations(response : AxiosResponse<iPutC6RestResponse<iLocations>>, request : iAPI<Modify<iLocations, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
-    updateRestfulObjectArrays<iLocations>([
-        removeInvalidKeys<iLocations>({
-            ...request,
-            ...response?.data?.rest,
-        }, C6.TABLES)
-    ], "locations", locations.PRIMARY_SHORT as (keyof iLocations)[])
-}
-
-export const Put = restRequest<PutCustomAndRequiredFields, iLocations, PutRequestTableOverrides, iPutC6RestResponse<iLocations>, RestTableNames>({
-    C6: C6,
-    tableName: locations.TABLE_NAME,
-    requestMethod: PUT,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully updated locations data!'
-        request.error ??= 'An unknown issue occurred updating the locations data!'
-        return request
-    },
-    responseCallback: putStateLocations
-});
-
-type PostCustomAndRequiredFields = {}
-
-type PostRequestTableOverrides = {}
-
-export function postStateLocations(response : AxiosResponse<iPostC6RestResponse<iLocations>>, request : iAPI<Modify<iLocations, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
-    if ('number' === typeof id || 'string' === typeof id) {
-        if (1 !== locations.PRIMARY_SHORT.length) {
-            console.error("C6 received unexpected result's given the primary key length");
-        } else {
-            request[locations.PRIMARY_SHORT[0]] = id
-        }
-    }
-    updateRestfulObjectArrays<iLocations>(
-        undefined !== request.dataInsertMultipleRows
-            ? request.dataInsertMultipleRows.map((request, index) => {
-                return removeInvalidKeys<iLocations>({
-                    ...request,
-                    ...(index === 0 ? response?.data?.rest : {}),
-                }, C6.TABLES)
-            })
-            : [
-                removeInvalidKeys<iLocations>({
-                    ...request,
-                    ...response?.data?.rest,
-                    }, C6.TABLES)
-            ],
-        "locations",
-        locations.PRIMARY_SHORT as (keyof iLocations)[]
-    )
-}
-
-export const Post = restRequest<PostCustomAndRequiredFields, iLocations, PostRequestTableOverrides, iPostC6RestResponse<iLocations>, RestTableNames>({
-    C6: C6,
-    tableName: locations.TABLE_NAME,
-    requestMethod: POST,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully created the locations data!'
-        request.error ??= 'An unknown issue occurred creating the locations data!'
-        return request
-    },
-    responseCallback: postStateLocations
-});
-
-type DeleteCustomAndRequiredFields = {}
-
-type DeleteRequestTableOverrides = {}
-
-export function deleteStateLocations(_response : AxiosResponse<iDeleteC6RestResponse<iLocations>>, request : iAPI<Modify<iLocations, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
-    deleteRestfulObjectArrays<iLocations>([
-        request
-    ], "locations", locations.PRIMARY_SHORT as (keyof iLocations)[])
-}
-
-export const Delete = restRequest<DeleteCustomAndRequiredFields, iLocations, DeleteRequestTableOverrides, iDeleteC6RestResponse<iLocations>, RestTableNames>({
-    C6: C6,
-    tableName: locations.TABLE_NAME,
-    requestMethod: DELETE,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully removed the locations data!'
-        request.error ??= 'An unknown issue occurred removing the locations data!'
-        return request
-    },
-    responseCallback: deleteStateLocations
-});
-
-export default {
-    // Export all GET, POST, PUT, DELETE functions for each table
-    Get,
-    Post,
-    Put,
-    Delete,
-}

package/src/api/rest/Photos.test.tsx

@@ -1,139 +0,0 @@
-import {xdescribe, expect, test} from '@jest/globals';
-import {CarbonReact} from "@carbonorm/carbonreact";
-import {checkAllRequestsComplete} from "@carbonorm/carbonnode";
-import {act, waitFor} from '@testing-library/react';
-import {C6, iRestfulObjectArrayTypes, iPhotos, photos } from "api/rest/C6";
-import Photos from "./Photos";
-
-const randomString = Math.random().toString(36).substring(7);
-const randomInt = Math.floor(Math.random() * 1000000);
-const fillString = 'string' + randomString + randomInt;
-
-/**
-CREATE TABLE `carbon_photos` (
-  `parent_id` binary(16) NOT NULL,
-  `photo_id` binary(16) NOT NULL,
-  `user_id` binary(16) NOT NULL,
-  `photo_src` longblob NOT NULL,
-  `photo_description` text,
-  `photo_upload_date` datetime DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`photo_id`),
-  UNIQUE KEY `entity_photos_photo_id_uindex` (`photo_id`),
-  KEY `photos_entity_user_pk_fk` (`user_id`),
-  KEY `carbon_photos_carbon_carbons_entity_pk_fk2` (`parent_id`),
-  CONSTRAINT `carbon_photos_carbon_carbons_entity_pk_fk` FOREIGN KEY (`photo_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `carbon_photos_carbon_carbons_entity_pk_fk2` FOREIGN KEY (`parent_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `carbon_photos_carbon_carbons_entity_pk_fk3` FOREIGN KEY (`user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-const Test_Data: iPhotos = {
-
-    photo_description: fillString.substring(0, ),
-
-}
-
-export default Test_Data;
-
-xdescribe('REST Photos api', () => {
-
-    let testData = Test_Data;
-
-    test('GET POST PUT DELETE', async () => {
-
-        await act(async () => {
-
-            let selectAllResponse = await Photos.Get({})
-
-            if ('function' === typeof selectAllResponse) {
-                throw Error('selectAllResponse is a promise, this typically means this specific get request has already run during test setup.');
-            }
-
-            // We don't care if it is filled or not, just that the request can be made.
-            expect(selectAllResponse?.data?.rest).not.toBeUndefined();
-
-            const postResponse = await Photos.Post(testData);
-
-            console.log('postResponse', postResponse?.data)
-
-            expect(postResponse?.data?.created).not.toBeUndefined();
-
-            const primaryKey = photos.PRIMARY_SHORT[0];
-
-            const postID = postResponse?.data?.created
-
-            const singleRowSelect = await Photos.Get({
-                [C6.WHERE]: {
-                    [photos[primaryKey.toUpperCase()]]: postID,
-                }
-            })
-
-            if ('function' === typeof singleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', singleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(singleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof singleRowSelect?.data?.rest).toEqual('object');
-
-            // todo - make this work correctly with multiple primary keys
-            const selectedPostId = singleRowSelect?.data?.rest[0][primaryKey]
-
-            expect(selectedPostId).toEqual(postID);
-
-            const multipleRowSelect = await Photos.Get({
-                [C6.WHERE]: {
-                    [photos[primaryKey.toUpperCase()]]: [C6.IN, [0, postID]],
-                }
-            })
-
-            if ('function' === typeof multipleRowSelect) {
-                throw Error('singleRowSelect is a promise, this is unexpected.');
-            }
-
-            console.log('singleRowSelect', multipleRowSelect?.data)
-
-            // Ensure the expected response datastructure is returned
-            expect(multipleRowSelect?.data?.rest).not.toBeUndefined();
-
-            // Make sure the previously created post is now returned
-            expect(typeof multipleRowSelect?.data?.rest).toEqual('object');
-
-            testData[primaryKey] = postID
-
-            testData.parent_id = fillString.substring(0, 16);
-            testData.photo_id = fillString.substring(0, 16);
-            testData.user_id = fillString.substring(0, 16);
-            testData.photo_src = fillString.substring(0, );
-            testData.photo_description = fillString.substring(0, );
-            testData.photo_upload_date = fillString.substring(0, );
-
-            // wait for the global state to be updated
-            expect(CarbonReact.getState<iRestfulObjectArrayTypes>().photos).not.toBeUndefined();
-
-            const updateResponse = await Photos.Put(testData)
-
-            expect(updateResponse?.data?.updated).not.toBeUndefined();
-
-            const deleteResponse = await Photos.Delete({
-                [primaryKey]: postID
-            })
-
-            console.log('deleteResponse', deleteResponse?.data)
-
-            expect(deleteResponse?.data?.deleted).not.toBeUndefined();
-
-            await waitFor(async () => {
-                expect(checkAllRequestsComplete()).toEqual(true);
-            }, {timeout: 10000, interval: 1000});
-
-        })
-
-    }, 100000);
-
-})
-

package/src/api/rest/Photos.tsx

@@ -1,151 +0,0 @@
-import {
-    iPostC6RestResponse,
-    restRequest,
-    GET,
-    POST,
-    PUT,
-    DELETE,
-    iDeleteC6RestResponse,
-    iGetC6RestResponse,
-    iPutC6RestResponse,
-    removeInvalidKeys
-} from "@carbonorm/carbonnode";
-import {AxiosResponse} from "axios";
-import {iAPI, Modify} from "restRequest";
-import {deleteRestfulObjectArrays, updateRestfulObjectArrays} from "@carbonorm/carbonreact";
-import {C6, iPhotos, photos, RestTableNames} from "./C6";
-
-/**
-CREATE TABLE `carbon_photos` (
-  `parent_id` binary(16) NOT NULL,
-  `photo_id` binary(16) NOT NULL,
-  `user_id` binary(16) NOT NULL,
-  `photo_src` longblob NOT NULL,
-  `photo_description` text,
-  `photo_upload_date` datetime DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`photo_id`),
-  UNIQUE KEY `entity_photos_photo_id_uindex` (`photo_id`),
-  KEY `photos_entity_user_pk_fk` (`user_id`),
-  KEY `carbon_photos_carbon_carbons_entity_pk_fk2` (`parent_id`),
-  CONSTRAINT `carbon_photos_carbon_carbons_entity_pk_fk` FOREIGN KEY (`photo_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `carbon_photos_carbon_carbons_entity_pk_fk2` FOREIGN KEY (`parent_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `carbon_photos_carbon_carbons_entity_pk_fk3` FOREIGN KEY (`user_id`) REFERENCES `carbon_carbons` (`entity_pk`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-**/
-
-type GetCustomAndRequiredFields = {}
-
-type GetRequestTableOverrides = {}
-
-// required parameters, optional parameters, parameter type overrides, response, and table names
-export const Get = restRequest<GetCustomAndRequiredFields, iPhotos, GetRequestTableOverrides, iGetC6RestResponse<iPhotos>, RestTableNames>({
-    C6: C6,
-    tableName: photos.TABLE_NAME,
-    requestMethod: GET,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully received photos!'
-        request.error ??= 'An unknown issue occurred creating the photos!'
-        return request
-    },
-    responseCallback: (response, _request) => {
-        updateRestfulObjectArrays<iPhotos>(response?.data?.rest, "photos", C6.photos.PRIMARY_SHORT as (keyof iPhotos)[])
-    }
-});
-
-type PutCustomAndRequiredFields = {}
-
-type PutRequestTableOverrides = {}
-
-export function putStatePhotos(response : AxiosResponse<iPutC6RestResponse<iPhotos>>, request : iAPI<Modify<iPhotos, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
-    updateRestfulObjectArrays<iPhotos>([
-        removeInvalidKeys<iPhotos>({
-            ...request,
-            ...response?.data?.rest,
-        }, C6.TABLES)
-    ], "photos", photos.PRIMARY_SHORT as (keyof iPhotos)[])
-}
-
-export const Put = restRequest<PutCustomAndRequiredFields, iPhotos, PutRequestTableOverrides, iPutC6RestResponse<iPhotos>, RestTableNames>({
-    C6: C6,
-    tableName: photos.TABLE_NAME,
-    requestMethod: PUT,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully updated photos data!'
-        request.error ??= 'An unknown issue occurred updating the photos data!'
-        return request
-    },
-    responseCallback: putStatePhotos
-});
-
-type PostCustomAndRequiredFields = {}
-
-type PostRequestTableOverrides = {}
-
-export function postStatePhotos(response : AxiosResponse<iPostC6RestResponse<iPhotos>>, request : iAPI<Modify<iPhotos, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
-    if ('number' === typeof id || 'string' === typeof id) {
-        if (1 !== photos.PRIMARY_SHORT.length) {
-            console.error("C6 received unexpected result's given the primary key length");
-        } else {
-            request[photos.PRIMARY_SHORT[0]] = id
-        }
-    }
-    updateRestfulObjectArrays<iPhotos>(
-        undefined !== request.dataInsertMultipleRows
-            ? request.dataInsertMultipleRows.map((request, index) => {
-                return removeInvalidKeys<iPhotos>({
-                    ...request,
-                    ...(index === 0 ? response?.data?.rest : {}),
-                }, C6.TABLES)
-            })
-            : [
-                removeInvalidKeys<iPhotos>({
-                    ...request,
-                    ...response?.data?.rest,
-                    }, C6.TABLES)
-            ],
-        "photos",
-        photos.PRIMARY_SHORT as (keyof iPhotos)[]
-    )
-}
-
-export const Post = restRequest<PostCustomAndRequiredFields, iPhotos, PostRequestTableOverrides, iPostC6RestResponse<iPhotos>, RestTableNames>({
-    C6: C6,
-    tableName: photos.TABLE_NAME,
-    requestMethod: POST,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully created the photos data!'
-        request.error ??= 'An unknown issue occurred creating the photos data!'
-        return request
-    },
-    responseCallback: postStatePhotos
-});
-
-type DeleteCustomAndRequiredFields = {}
-
-type DeleteRequestTableOverrides = {}
-
-export function deleteStatePhotos(_response : AxiosResponse<iDeleteC6RestResponse<iPhotos>>, request : iAPI<Modify<iPhotos, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
-    deleteRestfulObjectArrays<iPhotos>([
-        request
-    ], "photos", photos.PRIMARY_SHORT as (keyof iPhotos)[])
-}
-
-export const Delete = restRequest<DeleteCustomAndRequiredFields, iPhotos, DeleteRequestTableOverrides, iDeleteC6RestResponse<iPhotos>, RestTableNames>({
-    C6: C6,
-    tableName: photos.TABLE_NAME,
-    requestMethod: DELETE,
-    queryCallback: (request) => {
-        request.success ??= 'Successfully removed the photos data!'
-        request.error ??= 'An unknown issue occurred removing the photos data!'
-        return request
-    },
-    responseCallback: deleteStatePhotos
-});
-
-export default {
-    // Export all GET, POST, PUT, DELETE functions for each table
-    Get,
-    Post,
-    Put,
-    Delete,
-}