Skip to content

Commit a8ea7c0

Browse files
committed
rename directory in preparation for adding plugin directory
1 parent 27ed739 commit a8ea7c0

File tree

12 files changed

+30
-18
lines changed

12 files changed

+30
-18
lines changed

src/commons/application/ApplicationTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Chapter, Language, type SourceError, type Value, Variant } from 'js-sla
22

33
import type { AchievementState } from '../../features/achievement/AchievementTypes';
44
import type { DashboardState } from '../../features/dashboard/DashboardTypes';
5-
import type { LanguageDirectoryState } from '../../features/languageDirectory/LanguageDirectoryTypes';
5+
import type { LanguageDirectoryState } from '../../features/directory/LanguageDirectoryTypes';
66
import type { LeaderboardState } from '../../features/leaderboard/LeaderboardTypes';
77
import type { PlaygroundState } from '../../features/playground/PlaygroundTypes';
88
import { PlaybackStatus, RecordingStatus } from '../../features/sourceRecorder/SourceRecorderTypes';

src/commons/application/reducers/RootReducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { combineReducers, type Reducer } from '@reduxjs/toolkit';
33
import { FeatureFlagsReducer as featureFlags } from '../../..//commons/featureFlags';
44
import { AchievementReducer as achievement } from '../../../features/achievement/AchievementReducer';
55
import { DashboardReducer as dashboard } from '../../../features/dashboard/DashboardReducer';
6-
import { LanguageDirectoryReducer as languageDirectory } from '../../../features/languageDirectory/LanguageDirectoryReducer';
6+
import { LanguageDirectoryReducer as languageDirectory } from '../../../features/directory/LanguageDirectoryReducer';
77
import { LeaderboardReducer as leaderboard } from '../../../features/leaderboard/LeaderboardReducer';
88
import { PlaygroundReducer as playground } from '../../../features/playground/PlaygroundReducer';
99
import { StoriesReducer as stories } from '../../../features/stories/StoriesReducer';

src/commons/controlBar/ControlBarChapterSelect.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { Chapter, Variant } from 'js-slang/dist/types';
55
import React, { useEffect } from 'react';
66
import { useDispatch } from 'react-redux';
77

8-
import { flagLanguageDirectoryEnable } from '../../features/languageDirectory/flagLanguageDirectory';
9-
import LanguageDirectoryActions from '../../features/languageDirectory/LanguageDirectoryActions';
10-
import type { IEvaluatorDefinition } from '../../features/languageDirectory/LanguageDirectoryTypes';
8+
import { flagDirectoryLanguageEnable } from '../../features/directory/flagDirectoryLanguageEnable';
9+
import LanguageDirectoryActions from '../../features/directory/LanguageDirectoryActions';
10+
import type { IEvaluatorDefinition } from '../../features/directory/LanguageDirectoryTypes';
1111
import { SALanguage } from '../application/ApplicationTypes';
1212
import { useFeature } from '../featureFlags/useFeature';
1313
import { useTypedSelector } from '../utils/Hooks';
@@ -34,7 +34,7 @@ export const ControlBarChapterSelect: React.FC<ControlBarChapterSelectProps> = (
3434
disabled = false
3535
}) => {
3636
const dispatch = useDispatch();
37-
const directoryEnabled = useFeature(flagLanguageDirectoryEnable);
37+
const directoryEnabled = useFeature(flagDirectoryLanguageEnable);
3838
const selectedLanguageId = useTypedSelector(s => s.languageDirectory.selectedLanguageId);
3939
const selectedEvaluatorId = useTypedSelector(s => s.languageDirectory.selectedEvaluatorId);
4040
const dirLanguages = useTypedSelector(s => s.languageDirectory.languages);
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { flagConductorEnable } from '../../features/conductor/flagConductorEnable';
22
import { flagConductorEvaluatorUrl } from '../../features/conductor/flagConductorEvaluatorUrl';
3-
import { flagLanguageDirectoryEnable } from '../../features/languageDirectory/flagLanguageDirectory';
3+
import { flagDirectoryLanguageEnable } from '../../features/directory/flagDirectoryLanguageEnable';
4+
import { flagDirectoryLanguageUrl } from '../../features/directory/flagDirectoryLanguageUrl';
45
import { FeatureFlag } from './FeatureFlag';
56

67
export const publicFlags: FeatureFlag<any>[] = [
78
flagConductorEnable,
89
flagConductorEvaluatorUrl,
9-
flagLanguageDirectoryEnable
10+
flagDirectoryLanguageEnable,
11+
flagDirectoryLanguageUrl
1012
];

src/commons/navigationBar/subcomponents/NavigationBarLangSelectButton.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { useDispatch } from 'react-redux';
44
import { useFeature } from 'src/commons/featureFlags/useFeature';
55
import SimpleDropdown from 'src/commons/SimpleDropdown';
66
import { useTypedSelector } from 'src/commons/utils/Hooks';
7-
import { flagLanguageDirectoryEnable } from 'src/features/languageDirectory/flagLanguageDirectory';
8-
import LanguageDirectoryActions from 'src/features/languageDirectory/LanguageDirectoryActions';
7+
import { flagDirectoryLanguageEnable } from 'src/features/directory/flagDirectoryLanguageEnable';
8+
import LanguageDirectoryActions from 'src/features/directory/LanguageDirectoryActions';
99

1010
//TODO <remove legacy>: Remove when conductors.languageDirectory is default behaviour
1111
import LegacyNavigationBarLangSelectButton from './LegacyNavigationBarLangSelectButton';
@@ -28,7 +28,7 @@ const NavigationBarLangSelectButton = () => {
2828
}
2929
}, [languagesLoaded, dispatch]);
3030

31-
const directoryEnabled = useFeature(flagLanguageDirectoryEnable);
31+
const directoryEnabled = useFeature(flagDirectoryLanguageEnable);
3232
if (!directoryEnabled) {
3333
return <LegacyNavigationBarLangSelectButton />;
3434
}

src/commons/sagas/LanguageDirectorySaga.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { call, put, select } from 'redux-saga/effects';
22
import type { OverallState } from 'src/commons/application/ApplicationTypes';
33
import { flagConductorEnable } from 'src/features/conductor/flagConductorEnable';
44
import { flagConductorEvaluatorUrl } from 'src/features/conductor/flagConductorEvaluatorUrl';
5-
import { staticLanguageDirectoryProvider } from 'src/features/languageDirectory/LanguageDirectoryTypes';
5+
import { staticLanguageDirectoryProvider } from 'src/features/directory/LanguageDirectoryTypes';
66

7-
import LanguageDirectoryActions from '../../features/languageDirectory/LanguageDirectoryActions';
7+
import LanguageDirectoryActions from '../../features/directory/LanguageDirectoryActions';
88
import { combineSagaHandlers } from '../redux/utils';
99
import { actions } from '../utils/ActionsHelper';
1010

src/commons/utils/ActionsHelper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import WorkspaceActions from '../../commons/workspace/WorkspaceActions';
88
import AcademyActions from '../../features/academy/AcademyActions';
99
import AchievementActions from '../../features/achievement/AchievementActions';
1010
import DashboardActions from '../../features/dashboard/DashboardActions';
11+
import LanguageDirectoryActions from '../../features/directory/LanguageDirectoryActions';
1112
import GitHubActions from '../../features/github/GitHubActions';
1213
import GroundControlActions from '../../features/groundControl/GroundControlActions';
13-
import LanguageDirectoryActions from '../../features/languageDirectory/LanguageDirectoryActions';
1414
import LeaderboardActions from '../../features/leaderboard/LeaderboardActions';
1515
import PersistenceActions from '../../features/persistence/PersistenceActions';
1616
import PlaygroundActions from '../../features/playground/PlaygroundActions';

src/features/languageDirectory/LanguageDirectoryTypes.ts renamed to src/features/directory/LanguageDirectoryTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
ILanguageDefinition,
55
languageMap,
66
languages
7-
} from '@sourceacademy/language-directory';
7+
} from 'language-directory';
88

99
export type LanguageDirectoryState = {
1010
readonly selectedLanguageId: string | null;

0 commit comments

Comments
 (0)