Skip to content

fix: wait_until がループ中に最新テレメトリを取得できず timeout する不具合を修正 #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TomokiMochizuki wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: wait_until がループ中に最新テレメトリを取得できず timeout する不具合を修正 #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions aspnetapp/WINGS/ClientApp/src/components/command/plan_display/PlanTabPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { CommandPlanLine, RequestStatus, CmdFileVariable, Telemetry, TlmCmdConfi
import RequestTableRow from './RequestTableRow';
import { selectedPlanRowAction, execRequestSuccessAction, execRequestErrorAction, execRequestsStartAction, execRequestsEndAction, editCmdFileVariableAction } from '../../../redux/plans/actions';
import { getActivePlanId, getAllIndexes, getInExecution, getPlanContents, getSelectedRow, getCommandFileVariables } from '../../../redux/plans/selectors';
import { useDispatch, useSelector } from 'react-redux';
import { useDispatch, useSelector, useStore } from 'react-redux';
import { openPlan, postCommand, postCommandFileLineLog } from '../../../redux/plans/operations';
import { RootState } from '../../../redux/store/RootState';
import { getLatestTelemetries } from '../../../redux/telemetries/selectors';
Expand Down Expand Up @@ -47,6 +47,9 @@ const PlanTabPanel = (props: PlanTabPanelProps) => {
const { value, index, name, content, cmdType } = props;
const dispatch = useDispatch<AppDispatch>();
const selector = useSelector((state: RootState) => state);
// wait_until などの非同期ループ内では render 時に束縛した selector が古くなるため、
// 最新テレメトリはループの各周回で store.getState() から取得する。
const store = useStore<RootState>();

const [lastSelectedRow, setLastSelectedRow] = React.useState(-1);

Expand Down Expand Up @@ -254,7 +257,7 @@ const PlanTabPanel = (props: PlanTabPanelProps) => {
outcome.isSuccess = true;
} else if (variableName.indexOf('.') > -1) {
let tlms: Telemetry[] = [];
const latestTelemetries = getLatestTelemetries(selector);
const latestTelemetries = getLatestTelemetries(store.getState());
const variableNameSplitList = variableName.split('.');
let tlmCmdConfigIndex = 0;
try {
Expand Down