Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@tristandostaler
tristandostaler authored Jun 3, 2024
1 parent 1be4afa commit b0fcbc9
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 108 deletions.
2 changes: 1 addition & 1 deletion src/constants/stateVersion.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const stateVersion: number = 14;
const stateVersion: number = 15;

export default stateVersion;
22 changes: 5 additions & 17 deletions src/hooks/AppWriteAPI/useUpdateLocalStateFromDrive.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import React from 'react';
import useStore from '@store/cloud-auth-store';
import useLocalStore from '@store/store';
import useGetFile from './useGetFile';
import { migrateV12, migrateV13, migrateV8 } from '@store/migrate';
import { LocalStorageInterfaceV12ToV13, LocalStorageInterfaceV8ToV12, LocalStorageInterfaceV8ToV9 } from '@type/chat';
import { migrateState, migrateV8 } from './migrate';

Check failure on line 6 in src/hooks/AppWriteAPI/useUpdateLocalStateFromDrive.ts

View workflow job for this annotation

GitHub Actions / build 

Cannot find module './migrate' or its corresponding type declarations.
import { LocalStorageInterfaceV8ToV9 } from '@type/chat';
import stateVersion from '@constants/stateVersion';

const useUpdateLocalStateFromDrive = (isLoginProcess: boolean, setCurrentlySaving: Function, isCurrentlySaving: Function) => {
const getFile = useGetFile(isLoginProcess);
Expand Down Expand Up @@ -33,21 +34,8 @@ const useUpdateLocalStateFromDrive = (isLoginProcess: boolean, setCurrentlySavin
if (!state.version) {
migrateV8(state as LocalStorageInterfaceV8ToV9);
}
else {
switch (state.version) {
case 8:
case 9:
case 10:
migrateV8(state as LocalStorageInterfaceV8ToV9);
migrateV12(state as LocalStorageInterfaceV8ToV12);
break;
case 11:
migrateV12(state as LocalStorageInterfaceV8ToV12);
break;
case 12:
migrateV13(state as LocalStorageInterfaceV12ToV13);
break;
}
else if(state.version < stateVersion){
migrateState(state, state.version);
}

var hsm = getHideSideMenu();
Expand Down
21 changes: 4 additions & 17 deletions src/hooks/GoogleAPI/useUpdateLocalStateFromDrive.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import React from 'react';
import useStore from '@store/cloud-auth-store';
import useLocalStore from '@store/store';
import useGetFile from './useGetFile';
import { migrateV12, migrateV13, migrateV8 } from '@store/migrate';
import { LocalStorageInterfaceV12ToV13, LocalStorageInterfaceV8ToV12, LocalStorageInterfaceV8ToV9 } from '@type/chat';
import { migrateState, migrateV8 } from './migrate';

Check failure on line 6 in src/hooks/GoogleAPI/useUpdateLocalStateFromDrive.ts

View workflow job for this annotation

GitHub Actions / build 

Cannot find module './migrate' or its corresponding type declarations.
import { LocalStorageInterfaceV8ToV9 } from '@type/chat';

const useUpdateLocalStateFromDrive = (isLoginProcess: boolean, setCurrentlySaving: Function, isCurrentlySaving: Function) => {
const getFile = useGetFile(isLoginProcess);
Expand Down Expand Up @@ -33,21 +33,8 @@ const useUpdateLocalStateFromDrive = (isLoginProcess: boolean, setCurrentlySavin
if (!state.version) {
migrateV8(state as LocalStorageInterfaceV8ToV9);
}
else {
switch (state.version) {
case 8:
case 9:
case 10:
migrateV8(state as LocalStorageInterfaceV8ToV9);
migrateV12(state as LocalStorageInterfaceV8ToV12);
break;
case 11:
migrateV12(state as LocalStorageInterfaceV8ToV12);
break;
case 12:
migrateV13(state as LocalStorageInterfaceV12ToV13);
break;
}
else if(state.version < stateVersion){

Check failure on line 36 in src/hooks/GoogleAPI/useUpdateLocalStateFromDrive.ts

View workflow job for this annotation

GitHub Actions / build 

Cannot find name 'stateVersion'.
migrateState(state, state.version);
}

var hsm = getHideSideMenu();
Expand Down
50 changes: 49 additions & 1 deletion src/store/migrate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,52 @@ export const migrateV14 = (persistedState: LocalStorageInterfaceV13ToV14) => {
persistedState.publicPrompts.forEach((prompt) => {
prompt.source = prompt.source.replaceAll("~ Model: gpt-4-turbo-preview ~", "~ Model: gpt-4-turbo ~")
});
};
};

export const migrateState = (persistedState, version) => {

Check failure on line 158 in src/store/migrate.ts

View workflow job for this annotation

GitHub Actions / build 

Parameter 'persistedState' implicitly has an 'any' type.

Check failure on line 158 in src/store/migrate.ts

View workflow job for this annotation

GitHub Actions / build 

Parameter 'version' implicitly has an 'any' type.
switch (version) {
case 0:
migrateV0(persistedState as LocalStorageInterfaceV0ToV1);
break;
case 1:
migrateV1(persistedState as LocalStorageInterfaceV1ToV2);
break;
case 2:
migrateV2(persistedState as LocalStorageInterfaceV2ToV3);
break;
case 3:
migrateV3(persistedState as LocalStorageInterfaceV3ToV4);
break;
case 4:
migrateV4(persistedState as LocalStorageInterfaceV4ToV5);
break;
case 5:
migrateV5(persistedState as LocalStorageInterfaceV5ToV6);
break;
case 6:
migrateV6(persistedState as LocalStorageInterfaceV6ToV7);
break;
case 7:
migrateV7(persistedState as LocalStorageInterfaceV7oV8);
break;
case 8:
case 9:
case 10:
migrateV8(persistedState as LocalStorageInterfaceV8ToV9);
migrateV12(persistedState as LocalStorageInterfaceV8ToV12);
break;
case 11:
migrateV12(persistedState as LocalStorageInterfaceV8ToV12);
break;
case 12:
migrateV13(persistedState as LocalStorageInterfaceV12ToV13);
break;
case 13:
migrateV14(persistedState as LocalStorageInterfaceV13ToV14);
break;
case 14:
migrateV14(persistedState as LocalStorageInterfaceV13ToV14);
break;
}
return persistedState as StoreState;

Check failure on line 203 in src/store/migrate.ts

View workflow job for this annotation

GitHub Actions / build 

Cannot find name 'StoreState'.
}
74 changes: 2 additions & 72 deletions src/store/store.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,7 @@ import { AuthSlice, createAuthSlice } from './auth-slice';
import { ConfigSlice, createConfigSlice } from './config-slice';
import { PromptSlice, createPromptSlice } from './prompt-slice';
import { ToastSlice, createToastSlice } from './toast-slice';
import {
LocalStorageInterfaceV0ToV1,
LocalStorageInterfaceV1ToV2,
LocalStorageInterfaceV2ToV3,
LocalStorageInterfaceV3ToV4,
LocalStorageInterfaceV4ToV5,
LocalStorageInterfaceV5ToV6,
LocalStorageInterfaceV6ToV7,
LocalStorageInterfaceV7oV8,
LocalStorageInterfaceV8ToV9,
LocalStorageInterfaceV8ToV12,
LocalStorageInterfaceV12ToV13,
LocalStorageInterfaceV13ToV14,
} from '@type/chat';
import {
migrateV0,
migrateV1,
migrateV2,
migrateV3,
migrateV4,
migrateV5,
migrateV6,
migrateV7,
migrateV8,
migrateV12,
migrateV13,
migrateV14,
} from './migrate';
import { migrateState } from './migrate';
import stateVersion from '@constants/stateVersion';
import { createPublicPromptSlice, PublicPromptSlice } from './public-prompt-sync-slice';

Expand Down Expand Up @@ -84,50 +57,7 @@ const useStore = create<StoreState>()(
enterToSubmit: state.enterToSubmit,
}),
version: stateVersion,
migrate: (persistedState, version) => {
switch (version) {
case 0:
migrateV0(persistedState as LocalStorageInterfaceV0ToV1);
break;
case 1:
migrateV1(persistedState as LocalStorageInterfaceV1ToV2);
break;
case 2:
migrateV2(persistedState as LocalStorageInterfaceV2ToV3);
break;
case 3:
migrateV3(persistedState as LocalStorageInterfaceV3ToV4);
break;
case 4:
migrateV4(persistedState as LocalStorageInterfaceV4ToV5);
break;
case 5:
migrateV5(persistedState as LocalStorageInterfaceV5ToV6);
break;
case 6:
migrateV6(persistedState as LocalStorageInterfaceV6ToV7);
break;
case 7:
migrateV7(persistedState as LocalStorageInterfaceV7oV8);
break;
case 8:
case 9:
case 10:
migrateV8(persistedState as LocalStorageInterfaceV8ToV9);
migrateV12(persistedState as LocalStorageInterfaceV8ToV12);
break;
case 11:
migrateV12(persistedState as LocalStorageInterfaceV8ToV12);
break;
case 12:
migrateV13(persistedState as LocalStorageInterfaceV12ToV13);
break;
case 13:
migrateV14(persistedState as LocalStorageInterfaceV13ToV14);
break;
}
return persistedState as StoreState;
},
migrate: migrateState,
}
)
);
Expand Down

0 comments on commit b0fcbc9

Please sign in to comment.