fix(elements): 🐛 validate databaseId before retrieving database

JamesNZL · Jul 17, 2022 · 85618aa · 85618aa
1 parent 060dbe0
commit 85618aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/options/PropertySelects.ts b/src/options/PropertySelects.ts
@@ -3,6 +3,7 @@ import { NotionClient } from '../apis/notion';
 import { Storage } from '../apis/storage';
 
 import { SavedFields } from '.';
+import { InputFieldValidator } from './validator';
 import { CONFIGURATION, SupportedTypes } from './configuration';
 
 import { Select } from '../elements';
@@ -61,13 +62,13 @@ export class PropertySelect extends Select {
 export class SelectPropertyValueSelect extends PropertySelect {
 	private propertySelect: PropertySelect;
 
-	protected constructor(id: string, type: PropertySelect['type'], fieldKey: PropertySelect['fieldKey'], getDatabaseId: () => SupportedTypes, propertySelect: PropertySelect) {
+	protected constructor(id: string, type: PropertySelect['type'], fieldKey: PropertySelect['fieldKey'], getDatabaseId: () => Promise<SupportedTypes | typeof InputFieldValidator.INVALID_INPUT>, propertySelect: PropertySelect) {
 		super(id, type, fieldKey);
 
 		this.propertySelect = propertySelect;
 
 		this.propertySelect.addEventListener('input', async () => {
-			const databaseId = getDatabaseId();
+			const databaseId = await getDatabaseId();
 			if (typeof databaseId !== 'string') return;
 
 			const accessToken = (await Storage.getNotionAuthorisation()).accessToken ?? await CONFIGURATION.FIELDS['notion.accessToken'].input.validate(true);
@@ -80,7 +81,7 @@ export class SelectPropertyValueSelect extends PropertySelect {
 		});
 	}
 
-	public static override getInstance<T extends string>(id: T, type?: PropertySelect['type'], fieldKey?: PropertySelect['fieldKey'], getDatabaseId?: () => SupportedTypes, propertySelect?: PropertySelect): PropertySelect {
+	public static override getInstance<T extends string>(id: T, type?: PropertySelect['type'], fieldKey?: PropertySelect['fieldKey'], getDatabaseId?: () => Promise<SupportedTypes | typeof InputFieldValidator.INVALID_INPUT>, propertySelect?: PropertySelect): PropertySelect {
 		if (!type) throw new Error('Argument type must be defined for class SelectPropertyValueSelect!');
 		if (!fieldKey) throw new Error('Argument fieldKey must be defined for class SelectPropertyValueSelect!');
 		if (!getDatabaseId) throw new Error('Argument getDatabaseId must be defined for class SelectPropertyValueSelect!');

diff --git a/src/options/options.ts b/src/options/options.ts
@@ -133,7 +133,7 @@ const DatabaseSelect = <const>{
 	},
 	propertyValueSelects: {
 		get categoryCanvas() {
-			return SelectPropertyValueSelect.getInstance<OptionsSelectId>('notion-category-canvas', 'select', 'notion.propertyValues.categoryCanvas', DatabaseSelect.element.getValue.bind(DatabaseSelect.element), DatabaseSelect.propertySelects.category);
+			return SelectPropertyValueSelect.getInstance<OptionsSelectId>('notion-category-canvas', 'select', 'notion.propertyValues.categoryCanvas', DatabaseSelect.element.validate.bind(DatabaseSelect.element), DatabaseSelect.propertySelects.category);
 		},
 	},