github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some type errors in app #2 (#9637)

Browse Source 
Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
Pascal Jufer
2021-12-01 23:36:56 +01:00
committed by GitHub
parent c16592806d
commit d4ec4a9672
6 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/utils/add-related-primary-key-to-fields.ts
View File

@@ -28,9 +28,9 @@ export function addRelatedPrimaryKeyToFields(currentCollection: string, fields:
const field = fieldsStore.getField(currentCollection, fieldName);
const primaryKeyField = fieldsStore.getPrimaryKeyFieldForCollection(field?.collection ?? '');
const includeField = fieldParts.slice(0, -1).concat(primaryKeyField.field).join('.');
const includeField = primaryKeyField && fieldParts.slice(0, -1).concat(primaryKeyField.field).join('.');
if (!sanitizedFields.includes(includeField)) {
if (includeField && !sanitizedFields.includes(includeField)) {
sanitizedFields.push(includeField);
}
}

5
app/src/utils/get-setting.ts
View File

@@ -1,7 +1,8 @@
import { useSettingsStore } from '@/stores';
import { Settings } from '@directus/shared/types';
export default function getSetting(setting: string): any {
export default function getSetting(setting: keyof Settings): any {
const settingsStore = useSettingsStore();
if (settingsStore.settings && setting in settingsStore.settings) return settingsStore.settings[setting];
if (settingsStore.settings) return settingsStore.settings[setting];
return null;
}