Skip to content

Commit 8443af9

Browse files
chore: storageControllers.userMetadata and programCollection is undefined
1 parent f629895 commit 8443af9

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

i18n/en.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ msgstr ""
55
"Content-Type: text/plain; charset=utf-8\n"
66
"Content-Transfer-Encoding: 8bit\n"
77
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
8-
"POT-Creation-Date: 2025-09-11T09:23:38.047Z\n"
9-
"PO-Revision-Date: 2025-09-11T09:23:38.047Z\n"
8+
"POT-Creation-Date: 2025-09-16T09:15:20.332Z\n"
9+
"PO-Revision-Date: 2025-09-16T09:15:20.332Z\n"
1010

1111
msgid "Choose one or more dates..."
1212
msgstr "Choose one or more dates..."

src/core_modules/capture-core/components/LockedSelector/LockedSelector.epics.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import i18n from '@dhis2/d2-i18n';
22
import { ofType } from 'redux-observable';
33
import { filter, map, concatMap } from 'rxjs/operators';
44
import { of } from 'rxjs';
5+
import { programCollection } from 'capture-core/metaDataMemoryStores'; // Works
56
import {
67
lockedSelectorActionTypes,
78
invalidSelectionsFromUrl,
@@ -12,7 +13,7 @@ import {
1213
startLoading,
1314
completeUrlUpdate,
1415
} from './LockedSelector.actions';
15-
import { programCollection } from '../../metaDataMemoryStores';
16+
// import { programCollection } from '../../metaDataMemoryStores'; // Fails
1617
import { getLocationPathname, pageFetchesOrgUnitUsingTheOldWay } from '../../utils/url';
1718
import { getLocationQuery } from '../../utils/routing';
1819
import { getCoreOrgUnit } from '../../metadataRetrieval/coreOrgUnit';

src/core_modules/capture-core/components/MetadataAutoSelectInitializer/hooks/useMetadataAutoSelect.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import { useCallback, useEffect, useState } from 'react';
22
import { useHistory } from 'react-router-dom';
3+
import { getUserMetadataStorageController, USER_METADATA_STORES } from 'capture-core/storageControllers'; // Works
34
import { useIndexedDBQuery } from '../../../utils/reactQueryHelpers';
4-
import { getUserMetadataStorageController, USER_METADATA_STORES } from '../../../storageControllers';
5+
// import { getUserMetadataStorageController, USER_METADATA_STORES } from '../../../storageControllers'; // Fails
56
import { useNavigate, buildUrlQueryString, useLocationQuery } from '../../../utils/routing';
67
import { useOrgUnitAutoSelect } from '../../../dataQueries';
78

89
const getAllPrograms = () => {
10+
// Importing from 'capture-core/storageControllers' the getUserMetadataStorageController() is defined and has the correct value set
11+
// Importing '../../../storageControllers'; the getUserMetadataStorageController() is undefined
912
const userStorageController = getUserMetadataStorageController();
1013
return userStorageController.getAll(USER_METADATA_STORES.PROGRAMS, {
1114
predicate: ({ access }) => access.data.read,

src/core_modules/capture-core/storageControllers/storageControllers.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { ServerVersion } from './types';
88

99

1010
const adapterTypes: any = [availableAdapters.INDEXED_DB];
11+
// storageControllers declaration
1112
const storageControllers: { [key: string]: StorageController } = {};
1213

1314
export const initStorageControllers = async ({
@@ -22,6 +23,7 @@ export const initStorageControllers = async ({
2223
const userDataStorageName = `${storageControllers.main.name}-${currentUserId}-data`;
2324
await upkeepUserCaches(storageControllers.main, userMetadataStorageName, userDataStorageName);
2425

26+
// storageControllers.userMetadata value is asynchronously assigned
2527
storageControllers.userMetadata = await initUserMetadataController({
2628
storageName: userMetadataStorageName,
2729
version: storageControllers.main.version,

0 commit comments

Comments
 (0)