Skip to content

Commit bef90bb

Browse files
committed
fix lint issues
1 parent 0ce4f9c commit bef90bb

File tree

9 files changed

+16
-13
lines changed

9 files changed

+16
-13
lines changed

src/commons/application/ApplicationTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { PlaybackStatus, RecordingStatus } from '../../features/sourceRecorder/S
77
import { StoriesEnvState, StoriesState } from '../../features/stories/StoriesTypes';
88
import { freshSortState } from '../../pages/academy/grading/subcomponents/GradingSubmissionsTable';
99
import { WORKSPACE_BASE_PATHS } from '../../pages/fileSystem/createInBrowserFileSystem';
10+
import { defaultFeatureFlags, FeatureFlagsState } from '../featureFlags';
1011
import { FileSystemState } from '../fileSystem/FileSystemTypes';
1112
import { SideContentManagerState, SideContentState } from '../sideContent/SideContentTypes';
1213
import Constants from '../utils/Constants';
@@ -20,7 +21,6 @@ import {
2021
import { RouterState } from './types/CommonsTypes';
2122
import { ExternalLibraryName } from './types/ExternalTypes';
2223
import { SessionState } from './types/SessionTypes';
23-
import { defaultFeatureFlags, FeatureFlagsState } from '../featureFlags';
2424

2525
export type OverallState = {
2626
readonly router: RouterState;

src/commons/application/reducers/RootReducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { combineReducers, Reducer } from '@reduxjs/toolkit';
2+
import { FeatureFlagsReducer as featureFlags } from 'src/commons/featureFlags';
23
import { SourceActionType } from 'src/commons/utils/ActionsHelper';
34

45
import { AchievementReducer as achievement } from '../../../features/achievement/AchievementReducer';
56
import { DashboardReducer as dashboard } from '../../../features/dashboard/DashboardReducer';
67
import { PlaygroundReducer as playground } from '../../../features/playground/PlaygroundReducer';
78
import { StoriesReducer as stories } from '../../../features/stories/StoriesReducer';
8-
import { FeatureFlagsReducer as featureFlags } from 'src/commons/featureFlags';
99
import { FileSystemReducer as fileSystem } from '../../fileSystem/FileSystemReducer';
1010
import { SideContentReducer as sideContent } from '../../sideContent/SideContentReducer';
1111
import { WorkspaceReducer as workspaces } from '../../workspace/WorkspaceReducer';

src/commons/featureFlags/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createSlice } from "@reduxjs/toolkit";
2+
23
import { FeatureFlag } from "./FeatureFlag";
34

45
export type FeatureFlagsState = {
@@ -17,7 +18,7 @@ const featureFlagsSlice = createSlice({
1718
state.modifiedFlags[action.payload.featureFlag[0]] = action.payload.value;
1819
},
1920
resetFlag<T>(state: FeatureFlagsState, action: { payload: { featureFlag: FeatureFlag<T> } }) {
20-
state.modifiedFlags[action.payload.featureFlag[0]];
21+
delete state.modifiedFlags[action.payload.featureFlag[0]];
2122
}
2223
}
2324
});

src/commons/featureFlags/publicFlags.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { featureConductor } from "src/features/conductor/featureConductor";
2+
23
import { FeatureFlag } from "./FeatureFlag";
34

45
export const publicFlags: FeatureFlag<any>[] = [

src/commons/featureFlags/selectFeature.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { SagaIterator } from "redux-saga";
12
import { select } from "redux-saga/effects";
3+
24
import { FeatureFlag } from "./FeatureFlag";
3-
import { SagaIterator } from "redux-saga";
45

56
export function* selectFeature<T>(featureFlag: FeatureFlag<T>): SagaIterator<T> {
67
const [flag, defaultValue] = featureFlag;
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { useSelector } from "react-redux";
2-
import { OverallState } from "../application/ApplicationTypes";
1+
import { useTypedSelector } from "../utils/Hooks";
32
import { FeatureFlag } from "./FeatureFlag";
43

54
export function useFeature<T>(featureFlag: FeatureFlag<T>) {
65
const [flag, defaultValue] = featureFlag;
7-
const flagValue = useSelector<OverallState, T | undefined>(state => state.featureFlags.modifiedFlags[flag]);
6+
const flagValue = useTypedSelector(state => state.featureFlags.modifiedFlags[flag]);
87
return flagValue ?? defaultValue;
98
}

src/commons/mocks/StoreMocks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import {
1414
defaultWorkspaceManager,
1515
OverallState
1616
} from '../application/ApplicationTypes';
17+
import { defaultFeatureFlags } from '../featureFlags';
1718
import { SourceActionType } from '../utils/ActionsHelper';
1819
import { DeepPartial } from '../utils/TypeHelper';
19-
import { defaultFeatureFlags } from '../featureFlags';
2020

2121
export function mockInitialStore(
2222
overrides?: DeepPartial<OverallState>

src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@ import { manualToggleDebugger } from 'js-slang/dist/stdlib/inspector';
77
import { Chapter, ErrorSeverity, ErrorType, SourceError, Variant } from 'js-slang/dist/types';
88
import { eventChannel, SagaIterator } from 'redux-saga';
99
import { call, cancel, cancelled, delay, fork, put, race, select, take } from 'redux-saga/effects';
10+
import { IConduit } from 'sa-conductor/dist/conduit';
1011
import * as Sourceror from 'sourceror';
1112
import InterpreterActions from 'src/commons/application/actions/InterpreterActions';
13+
import { selectFeature } from 'src/commons/featureFlags/selectFeature';
1214
import { makeCCompilerConfig, specialCReturnObject } from 'src/commons/utils/CToWasmHelper';
1315
import { javaRun } from 'src/commons/utils/JavaHelper';
16+
import { BrowserHostPlugin } from 'src/features/conductor/BrowserHostPlugin';
17+
import { createConductor } from 'src/features/conductor/createConductor';
18+
import { featureConductor } from 'src/features/conductor/featureConductor';
1419
import StoriesActions from 'src/features/stories/StoriesActions';
1520

1621
import { EventType } from '../../../../features/achievement/AchievementTypes';
@@ -29,11 +34,6 @@ import {
2934
} from '../../../workspace/WorkspaceTypes';
3035
import { dumpDisplayBuffer } from './dumpDisplayBuffer';
3136
import { updateInspector } from './updateInspector';
32-
import { createConductor } from 'src/features/conductor/createConductor';
33-
import { IConduit } from 'sa-conductor/dist/conduit';
34-
import { BrowserHostPlugin } from 'src/features/conductor/BrowserHostPlugin';
35-
import { featureConductor } from 'src/features/conductor/featureConductor';
36-
import { selectFeature } from 'src/commons/featureFlags/selectFeature';
3737

3838
export function* evalCodeSaga(
3939
files: Record<string, string>,

src/features/conductor/createConductor.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Conduit, IConduit } from "sa-conductor/dist/conduit";
2+
23
import { BrowserHostPlugin } from "./BrowserHostPlugin";
34

45
export function createConductor(evaluatorPath: string, onRequestFile: (fileName: string) => Promise<string | undefined>): { hostPlugin: BrowserHostPlugin, conduit: IConduit } {

0 commit comments

Comments
 (0)