thi-sjsu-project/theia
0
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

make elements a local variable in LPDs

Browse Source
This commit is contained in:
bedlam343 2024-05-16 15:57:29 -07:00
parent 3758425463
commit a548ea3571
7 changed files with 446 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pages/Prototype.tsx
View File

@ -75,23 +75,23 @@ const Prototype = () => {
dispatch(addMessage(currentMessage));
//console.log('hjere!', messages)
reactToMessage({dispatch, currentMessage, stressLevel});
reactToMessage({ dispatch, currentMessage, stressLevel });
}, [messages]);
useEffect(() => {
if(stressLevel != 0){ //don't run at start
console.log('stress level', stressLevel)
let allWidgetsInNewStressLPD: Widget[] = selector({stressLevel: stressLevel})
console.log('allwiidgets',allWidgetsInNewStressLPD)
let allWidgetsInNewStressLPDIds: string[] = allWidgetsInNewStressLPD.map(a => a.id); //get all widget ids from new stress level LPD and initial LPD
// useEffect(() => {
// if(stressLevel != 0){ //don't run at start
// console.log('stress level', stressLevel)
// let allWidgetsInNewStressLPD: Widget[] = selector({stressLevel: stressLevel})
// console.log('allwiidgets',allWidgetsInNewStressLPD)
// let allWidgetsInNewStressLPDIds: string[] = allWidgetsInNewStressLPD.map(a => a.id); //get all widget ids from new stress level LPD and initial LPD
stressChangeHandler({dispatch:dispatch, allWidgetIds:Object.keys(widgets), allMessages: messages, allWidgetsInNewStressLPDIds: allWidgetsInNewStressLPDIds, stressLevel:stressLevel})
}
}, [currentStressLevel]);
// stressChangeHandler({dispatch:dispatch, allWidgetIds:Object.keys(widgets), allMessages: messages, allWidgetsInNewStressLPDIds: allWidgetsInNewStressLPDIds, stressLevel:stressLevel})
// }
// }, [currentStressLevel]);
useEffect(() => {
dispatch(setStressLevel(Math.floor(stressLevel * 3)));
}, [stressLevel]);
// useEffect(() => {
// dispatch(setStressLevel(Math.floor(stressLevel * 3)));
// }, [stressLevel]);
return <Home />;
};

240
src/prototype/lpd/stress/highLPD.ts
View File

@ -6,7 +6,7 @@ import type {
import { v4 as uuid } from 'uuid';
import lpdHelper from 'src/utils/lpdHelper';
import DANGER_ICON from 'src/assets/icons/danger.svg';
import { elements } from './lowLPD';
import type { Element } from 'src/types/element';
import type { Widget } from 'src/types/widget';
import type { WidgetCluster } from 'src/types/support-types';
@ -14,9 +14,17 @@ import type { WidgetCluster } from 'src/types/support-types';
const requestApprovalToAttackMessageHigh = (
message: RequestApprovalToAttack,
) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateRequestApprovalElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 30, 30, message.priority, 'list'),
lpdHelper.generateBaseElement(
uuid(),
'visual',
30,
30,
message.priority,
'list',
),
message,
lpdHelper.generateIconElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 80, 80),
@ -34,32 +42,30 @@ const requestApprovalToAttackMessageHigh = (
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaFuelLowMessageHigh = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTableElement(
lpdHelper.generateBaseElement(
@ -80,34 +86,32 @@ const acaFuelLowMessageHigh = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const missileToOwnshipDetectedMessageHigh = (
message: MissileToOwnshipDetected,
) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateMissileIncomingElement(
lpdHelper.generateBaseElement(
@ -127,32 +131,30 @@ const missileToOwnshipDetectedMessageHigh = (
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaDefectMessageHigh = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTableElement(
lpdHelper.generateBaseElement(
@ -173,32 +175,30 @@ const acaDefectMessageHigh = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'vehicle',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'vehicle',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaHeadingToBaseMessageHigh = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTextElement(
lpdHelper.generateBaseElement(
@ -214,36 +214,31 @@ const acaHeadingToBaseMessageHigh = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
],
),
]
),
]),
],
};
};
const generateCluster = (
widgets: Widget[],
): WidgetCluster => ({
const generateCluster = (widgets: Widget[]): WidgetCluster => ({
widgets: widgets,
})
});
// Map each message type to its corresponding LPD function
const highLPDMessageFunctions: any = {
@ -255,31 +250,38 @@ const highLPDMessageFunctions: any = {
};
const highLPD = (message: Message) => {
if(message.priority != -1) //if the message is a real message, return the clusters
if (message.priority != -1)
//if the message is a real message, return the clusters
return highLPDMessageFunctions[message.kind](message);
//if we get this far, we can return all widgets in this LPD
const tempMessage = <RequestApprovalToAttack>({ //make a dummy widget to put into LPD function
const tempMessage = <RequestApprovalToAttack>{
//make a dummy widget to put into LPD function
priority: 2,
});
};
const messageKinds = [ //all message kinds, so we can get all widgets
const messageKinds = [
//all message kinds, so we can get all widgets
'RequestApprovalToAttack',
'AcaFuelLow',
'AcaDefect',
'AcaHeadingToBase',
'MissileToOwnshipDetected'
'MissileToOwnshipDetected',
];
//get all widgets as list of widgets instead of list of clusters
let allPossibleWidgets: any = [];
messageKinds.forEach((kind) => { //for each message kind
highLPDMessageFunctions[kind](tempMessage).possibleClusters.forEach((cluster: WidgetCluster) => { //for each cluster in kind
cluster.widgets.forEach((widget: Widget) => { //for eahc widget in widget cluster
allPossibleWidgets.push(widget); //add the widget
});
});
messageKinds.forEach((kind) => {
//for each message kind
highLPDMessageFunctions[kind](tempMessage).possibleClusters.forEach(
(cluster: WidgetCluster) => {
//for each cluster in kind
cluster.widgets.forEach((widget: Widget) => {
//for eahc widget in widget cluster
allPossibleWidgets.push(widget); //add the widget
});
},
);
});
return allPossibleWidgets;
};

268
src/prototype/lpd/stress/lowLPD.ts
View File

@ -1,4 +1,8 @@
import type { Message, MissileToOwnshipDetected, RequestApprovalToAttack } from 'src/types/schema-types';
import type {
Message,
MissileToOwnshipDetected,
RequestApprovalToAttack,
} from 'src/types/schema-types';
import lpdHelper from 'src/utils/lpdHelper';
import { v4 as uuid } from 'uuid';
import type { Element } from 'src/types/element';
@ -6,10 +10,11 @@ import DANGER_ICON from 'src/assets/icons/danger.svg';
import type { Widget } from 'src/types/widget';
import type { WidgetCluster } from 'src/types/support-types';
export const elements: Element[] = [];
// Functions to create widgets, elements, and sections for each message type
const requestApprovalToAttackMessageLow = (message: RequestApprovalToAttack) => {
const requestApprovalToAttackMessageLow = (
message: RequestApprovalToAttack,
) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateRequestApprovalElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 30, 30, message.priority),
@ -30,35 +35,39 @@ const requestApprovalToAttackMessageLow = (message: RequestApprovalToAttack) =>
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaFuelLowMessageLow = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTableElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 200, message.priority),
lpdHelper.generateBaseElement(
uuid(),
'visual',
50,
200,
message.priority,
),
2,
2,
[
@ -69,32 +78,32 @@ const acaFuelLowMessageLow = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const missileToOwnshipDetectedMessageLow = (message: MissileToOwnshipDetected) => {
const missileToOwnshipDetectedMessageLow = (
message: MissileToOwnshipDetected,
) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateMissileIncomingElement(
lpdHelper.generateBaseElement(
@ -113,35 +122,39 @@ const missileToOwnshipDetectedMessageLow = (message: MissileToOwnshipDetected) =
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaDefectMessageLow = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTableElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 50, 200, message.priority),
lpdHelper.generateBaseElement(
uuid(),
'visual',
50,
200,
message.priority,
),
2,
2,
[
@ -152,70 +165,69 @@ const acaDefectMessageLow = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaHeadingToBaseMessageLow = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTextElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 30, 200, message.priority),
lpdHelper.generateBaseElement(
uuid(),
'visual',
30,
200,
message.priority,
),
'Aircraft heading to base',
),
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
)
]
};
};
const generateCluster = (
widgets: Widget[],
): WidgetCluster => ({
const generateCluster = (widgets: Widget[]): WidgetCluster => ({
widgets: widgets,
})
});
// Map each message type to its corresponding LPD function
const lowLPDMessageFunctions: any = {
@ -227,31 +239,37 @@ const lowLPDMessageFunctions: any = {
};
const lowLPD = (message: Message) => {
if(message.priority != -1) //if the message is a real message, return the clusters
if (message.priority != -1)
//if the message is a real message, return the clusters
return lowLPDMessageFunctions[message.kind](message);
//if we get this far, we can return all widgets in this LPD
const tempMessage = <RequestApprovalToAttack>({ //make a dummy widget to put into LPD function
const tempMessage = <RequestApprovalToAttack>{
//make a dummy widget to put into LPD function
priority: 2,
});
const messageKinds = [ //all message kinds, so we can get all widgets
};
const messageKinds = [
//all message kinds, so we can get all widgets
'RequestApprovalToAttack',
'AcaFuelLow',
'AcaDefect',
'AcaHeadingToBase',
'MissileToOwnshipDetected'
'MissileToOwnshipDetected',
];
//get all widgets as list of widgets instead of list of clusters
let allPossibleWidgets: any = [];
messageKinds.forEach((kind) => { //for each message kind
lowLPDMessageFunctions[kind](tempMessage).possibleClusters.forEach((cluster: WidgetCluster) => { //for each cluster in kind
cluster.widgets.forEach((widget: Widget) => { //for eahc widget in widget cluster
allPossibleWidgets.push(widget); //add the widget
});
});
messageKinds.forEach((kind) => {
//for each message kind
lowLPDMessageFunctions[kind](tempMessage).possibleClusters.forEach(
(cluster: WidgetCluster) => {
//for each cluster in kind
cluster.widgets.forEach((widget: Widget) => {
//for eahc widget in widget cluster
allPossibleWidgets.push(widget); //add the widget
});
},
);
});
return allPossibleWidgets;
};

225
src/prototype/lpd/stress/mediumLPD.ts
View File

@ -6,14 +6,15 @@ import type {
import lpdHelper from 'src/utils/lpdHelper';
import { v4 as uuid } from 'uuid';
import DANGER_ICON from 'src/assets/icons/danger.svg';
import { elements } from './lowLPD';
import { type Widget } from 'src/types/widget';
import type { WidgetCluster } from 'src/types/support-types';
import type { Element } from 'src/types/element';
// Functions to create widgets, elements, and sections for each message type
const requestApprovalToAttackMessageMedium = (
message: RequestApprovalToAttack,
) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateRequestApprovalElement(
lpdHelper.generateBaseElement(uuid(), 'visual', 30, 30, message.priority),
@ -34,32 +35,30 @@ const requestApprovalToAttackMessageMedium = (
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaFuelLowMessageMedium = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTableElement(
lpdHelper.generateBaseElement(
@ -79,34 +78,32 @@ const acaFuelLowMessageMedium = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
false,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const missileToOwnshipDetectedMessageMedium = (
message: MissileToOwnshipDetected,
) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateMissileIncomingElement(
lpdHelper.generateBaseElement(
@ -125,32 +122,30 @@ const missileToOwnshipDetectedMessageMedium = (
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
100,
100,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaDefectMessageMedium = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTableElement(
lpdHelper.generateBaseElement(
@ -170,32 +165,30 @@ const acaDefectMessageMedium = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const acaHeadingToBaseMessageMedium = (message: Message) => {
const elements: Element[] = [];
elements.push(
lpdHelper.generateTextElement(
lpdHelper.generateBaseElement(
@ -210,37 +203,31 @@ const acaHeadingToBaseMessageMedium = (message: Message) => {
);
return {
sections: [],
possibleClusters:
[
generateCluster(
[
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
possibleClusters: [
generateCluster([
lpdHelper.generateListWidget(
lpdHelper.generateBaseWidget(
'list',
'tinder',
500,
500,
300,
800,
'/pearce-screen',
false,
true,
1,
[...elements],
),
),
),
]),
],
),
]
};
};
const generateCluster = (
widgets: Widget[],
): WidgetCluster => ({
const generateCluster = (widgets: Widget[]): WidgetCluster => ({
widgets: widgets,
})
});
// Map each message type to its corresponding LPD function
const mediumLPDMessageFunctions: any = {
@ -252,14 +239,17 @@ const mediumLPDMessageFunctions: any = {
};
const mediumLPD = (message: Message) => {
if (message.priority != -1) //if the message is a real message, return the clusters
if (message.priority != -1)
//if the message is a real message, return the clusters
return mediumLPDMessageFunctions[message.kind](message);
//if we get this far, we can return all widgets in this LPD
const tempMessage = <RequestApprovalToAttack>{ //make a dummy widget to put into LPD function
const tempMessage = <RequestApprovalToAttack>{
//make a dummy widget to put into LPD function
priority: 2,
};
const messageKinds = [ //all message kinds, so we can get all widgets
const messageKinds = [
//all message kinds, so we can get all widgets
'RequestApprovalToAttack',
'AcaFuelLow',
'AcaDefect',
@ -269,12 +259,17 @@ const mediumLPD = (message: Message) => {
//get all widgets as list of widgets instead of list of clusters
let allPossibleWidgets: any = [];
messageKinds.forEach((kind) => { //for each message kind
mediumLPDMessageFunctions[kind](tempMessage).possibleClusters.forEach((cluster: WidgetCluster) => { //for each cluster in kind
cluster.widgets.forEach((widget: Widget) => {//for eahc widget in widget cluster
allPossibleWidgets.push(widget); //add the widget
});
});
messageKinds.forEach((kind) => {
//for each message kind
mediumLPDMessageFunctions[kind](tempMessage).possibleClusters.forEach(
(cluster: WidgetCluster) => {
//for each cluster in kind
cluster.widgets.forEach((widget: Widget) => {
//for eahc widget in widget cluster
allPossibleWidgets.push(widget); //add the widget
});
},
);
});
return allPossibleWidgets;
};

54
src/prototype/reactToMessage.ts
View File

@ -12,10 +12,10 @@ import restrainer from './restrainer';
import type { Widget } from 'src/types/widget';
type ReactToMessageProps = {
// define expected input here and it's type (number, string, etc.)
dispatch: AppDispatch;
currentMessage: Message;
stressLevel: number;
// define expected input here and it's type (number, string, etc.)
dispatch: AppDispatch;
currentMessage: Message;
stressLevel: number;
};
/**
@ -24,23 +24,23 @@ type ReactToMessageProps = {
* @returns ???
*/
const reactToMessage = ({
dispatch,
currentMessage,
stressLevel,
dispatch,
currentMessage,
stressLevel,
}: ReactToMessageProps) => {
const sections = store.getState().minimap.sections;
const widgets = store.getState().minimap.widgets;
const { possibleClusters:possibleWidgetClusters } = selector({
const { possibleClusters: possibleWidgetClusters } = selector({
message: currentMessage,
stressLevel,
});
let resolved = false;
while(!resolved){ //repeat ntil choosing a cluster has resolved
while (!resolved) {
//repeat ntil choosing a cluster has resolved
//console.log('running through assimilator...');
const { widgetClusterToDeploy, index} = assimilator({
const { widgetClusterToDeploy, index } = assimilator({
// find if there is room for us to put the widget down (returns null if there is not room)
possibleWidgetClusters: possibleWidgetClusters,
sections,
@ -48,8 +48,7 @@ const reactToMessage = ({
message: currentMessage,
});
if(index == -1)
resolved = true;
if (index == -1) resolved = true;
//check restrainer with all new widgets
//if cluster is bad then go back to assim
@ -58,18 +57,22 @@ const reactToMessage = ({
//get all widgets that are new widgets in candidate cluster
const newWidgets: Widget[] = [];
widgetClusterToDeploy.widgets.forEach((widget, widgetIndex) => {
if(widgetClusterToDeploy.actions![widgetIndex] === 'newWidget'){ //if this widget is a new widget, add it to list
newWidgets.push(widget)
if (widgetClusterToDeploy.actions![widgetIndex] === 'newWidget') {
//if this widget is a new widget, add it to list
newWidgets.push(widget);
}
});
if(index != -1 && restrainer({widgetsToDeploy: newWidgets})){ //if the assim chose a cluster and the restrainer is okoay with the new widgets
if (index != -1 && restrainer({ widgetsToDeploy: newWidgets })) {
//if the assim chose a cluster and the restrainer is okoay with the new widgets
resolved = true;
widgetClusterToDeploy.widgets.forEach((widget, widgetIndex) => {
const widgetToDeploy = widget;
const sectionID = widgetClusterToDeploy.sectionIds![widgetIndex]
const action = widgetClusterToDeploy.actions![widgetIndex]
const sectionID = widgetClusterToDeploy.sectionIds![widgetIndex];
const action = widgetClusterToDeploy.actions![widgetIndex];
console.log('widgetToDeploy:', widgetToDeploy);
if (action !== 'newWidget') {
//we should do something other than
@ -84,7 +87,7 @@ const reactToMessage = ({
dispatch(
addElementToWidget(
widgetToDeploy.id,
widgetToDeploy.elements[0], //<- This should not be able to happen, why are we choosing one element if multiple need to be placed -Tom
widgetToDeploy.elements, //<- This should not be able to happen, why are we choosing one element if multiple need to be placed -Tom
),
);
break;
@ -93,16 +96,15 @@ const reactToMessage = ({
break;
}
} else if (widgetToDeploy) {
// restrainer deems that the widget CAN be deployed
// restrainer deems that the widget CAN be deployed
// dispatch action to add new widget
dispatch(addWidget(widgetToDeploy));
dispatch(addWidgetToSection(sectionID));
// dispatch action to add new widget
dispatch(addWidget(widgetToDeploy));
dispatch(addWidgetToSection(sectionID));
}
});
} else { //the restrainer said no, so delete the chosen cluster and try again
} else {
//the restrainer said no, so delete the chosen cluster and try again
possibleWidgetClusters.splice(index, 1);
}
}

12
src/prototype/selector.ts
View File

@ -23,18 +23,22 @@ const selector = ({ message, stressLevel }: SelectorProps = {}) => {
if (!message && !stressLevel) {
// If no message and no stress provided, return the initial LPD
return initialLPD;
} else if(stressLevel && !message) { //return all widgets in current stressLevel
} else if (stressLevel && !message) {
//return all widgets in current stressLevel
return;
let allWidgets: Widget[] = [];
//get all of the widgets in the inital LPD
for (const [key, widget] of Object.entries(initialLPD.widgets)) {
allWidgets.push(widget);
allWidgets.push(widget);
}
stressLevel = Math.floor(stressLevel! * 3); //get stress level as int
const tempMessage = <Message>({ //dummy message to put into LPD function
const tempMessage = <Message>{
//dummy message to put into LPD function
priority: -1,
})
};
//return the intial LPD widgets with the widgets returned from the LPD function(all widgets in this stress level)
return allWidgets.concat(stressLevelLPDFunctions[stressLevel](tempMessage));

25
src/redux/slices/minimapSlice.ts
View File

@ -109,18 +109,29 @@ export const minimapSlice = createSlice({
},
addElementToWidget: {
prepare(widgetId: string, element: Element) {
return { payload: { widgetId, element } };
prepare(widgetId: string, elements: Element[]) {
return { payload: { widgetId, elements } };
},
reducer(
state,
action: PayloadAction<{ widgetId: string; element: Element }>,
action: PayloadAction<{ widgetId: string; elements: Element[] }>,
) {
console.log('adding elements to widget', action.payload.element);
state.widgets[action.payload.widgetId].elements.push(
action.payload.element,
);
console.log('adding elements to widget', action.payload.elements);
const { widgetId, elements } = action.payload;
const widget = state.widgets[widgetId];
if (!widget) {
console.error(
`Widget with id ${widgetId} not found (addElementToWidget)`,
);
return;
}
state.widgets[widgetId] = {
...widget,
elements: [...widget.elements, ...elements],
};
},
},