Merge pull request #12 from oslabs-beta/RachTeoFrontendTS

AppStateSlice TS Converted no errors
open-source-labs · May 1, 2023 · e0c5734 · e0c5734
2 parents 1aa2988 + f9c7936
commit e0c5734
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/app/src/helperFunctions/manageSeparators.ts b/app/src/helperFunctions/manageSeparators.ts
@@ -14,7 +14,7 @@ const separator = {
 const manageSeparators: ManageSeparators = {
   nextTopSeparatorId: 1000,
   // this function checks for two separators in a row or missing separators and adds/removes as needed
-  handleSeparators: (arr: ChildElement[], str?) => {
+  handleSeparators: (arr, str) => {
     if (
       (str === 'delete' || str === 'change position') &&
       arr.length === 1 &&
@@ -73,7 +73,7 @@ const manageSeparators: ManageSeparators = {
   },
 
   // this function replaces separators onto which an element is dropped with the element itself
-  mergeSeparator: (arr: ChildElement[], index: number) => {
+  mergeSeparator: (arr, index) => {
     return arr.map((child) => {
       // Added additional nested types for lists
       if (

diff --git a/app/src/interfaces/Interfaces.ts b/app/src/interfaces/Interfaces.ts
@@ -23,11 +23,11 @@ export interface ChildElement {
   name: string;
   childId: number;
   style: object;
-  attributes: object;
+  attributes: Attributes;
   events: object;
   children?: ChildElement[];
   stateProps: StateProp[]; // state: [ { id, key, value, type }, ...]
-  stateUsed?: object;
+  stateUsed?: StateUsed;
   passedInProps: StateProp[];
 }
 
@@ -46,7 +46,7 @@ export interface Component {
   useStateCodes: string[];
   useContext?: object;
   passedInProps: StateProp[];
-  stateUsed?: object;
+  stateUsed?: StateUsed;
 }
 export interface StateProp {
   id: string;
@@ -107,7 +107,21 @@ export interface AddRoutes {
 }
 
 export interface ManageSeparators {
-  mergeSeparator: (arg1:any, arg2:any) => any;  // update specificity
-  handleSeparators: (arg1: any, arg2?: any) => any; // update specificity
+  mergeSeparator: (arg1:ChildElement[], arg2?:number) => any;  // update specificity
+  handleSeparators: (arg1: ChildElement[], arg2?: string) => number;
   nextTopSeparatorId: number
 }
+
+export interface StateUsed {
+  compTextProviderId: number;
+  compTextPropsId: number;
+  compText: string;
+  compLinkProviderId: number;
+  compLinkPropsId: number;
+  compLink: string;
+}
+
+export interface Attributes {
+  compText?: string;
+  compLink?: string;
+}
diff --git a/app/src/redux/reducers/slice/appStateSlice.ts b/app/src/redux/reducers/slice/appStateSlice.ts
@@ -1308,7 +1308,7 @@ export const {
   deletePassedInProps,
   deleteState,
   toggleLoggedIn,
-  configToggle,
+  //configToggle,
   snapShotAction,
   allCooperativeState
 } = appStateSlice.actions;

diff --git a/app/src/redux/reducers/slice/contextReducer.ts b/app/src/redux/reducers/slice/contextReducer.ts
@@ -7,7 +7,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 interface Context {
   name: string;
   values: Array<{ key: string; value: string }>;
-  components: Array<string>;
+  components: string[];
 }
 
 interface AddContextPayload {