Create and utilise new component for note history and trashed item tt…

…l, which allows entering the value accurately on the mobile app
mrjo118 · Sep 16, 2024 · e55db5a · e55db5a
1 parent 8d3ac63
commit e55db5a
Show file tree

Hide file tree

Showing 36 changed files with 66 additions and 7 deletions.
diff --git a/packages/app-cli/app/command-settingschema.ts b/packages/app-cli/app/command-settingschema.ts
@@ -12,6 +12,7 @@ function settingTypeToSchemaType(type: SettingItemType): string {
 		[SettingItemType.Array]: 'array',
 		[SettingItemType.Object]: 'object',
 		[SettingItemType.Button]: '',
+		[SettingItemType.BigInt]: 'integer',
 	};
 
 	const r = map[type];

diff --git a/packages/app-cli/app/help-utils.js b/packages/app-cli/app/help-utils.js
@@ -61,7 +61,7 @@ function renderCommandHelp(cmd, width = null) {
 			if ('value' in md) {
 				if (md.type === Setting.TYPE_STRING) {
 					defaultString = md.value ? `"${md.value}"` : null;
-				} else if (md.type === Setting.TYPE_INT) {
+				} else if (md.type === Setting.TYPE_INT || md.type === Setting.TYPE_BIGINT) {
 					defaultString = (md.value ? md.value : 0).toString();
 				} else if (md.type === Setting.TYPE_BOOL) {
 					defaultString = md.value === true ? 'true' : 'false';

diff --git a/packages/app-cli/tests/support/plugins/clipboard/api/types.ts b/packages/app-cli/tests/support/plugins/clipboard/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/codemirror5-and-codemirror6/api/types.ts b/packages/app-cli/tests/support/plugins/codemirror5-and-codemirror6/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/codemirror6/api/types.ts b/packages/app-cli/tests/support/plugins/codemirror6/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.ts b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/content_script/api/types.ts b/packages/app-cli/tests/support/plugins/content_script/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/dialog/api/types.ts b/packages/app-cli/tests/support/plugins/dialog/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/editor_context_menu/api/types.ts b/packages/app-cli/tests/support/plugins/editor_context_menu/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/events/api/types.ts b/packages/app-cli/tests/support/plugins/events/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/external_assets/api/types.js b/packages/app-cli/tests/support/plugins/external_assets/api/types.js
diff --git a/packages/app-cli/tests/support/plugins/external_assets/api/types.ts b/packages/app-cli/tests/support/plugins/external_assets/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/imaging/api/types.ts b/packages/app-cli/tests/support/plugins/imaging/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/jpl_test/api/types.ts b/packages/app-cli/tests/support/plugins/jpl_test/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/json_export/api/types.ts b/packages/app-cli/tests/support/plugins/json_export/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/load_css/api/types.ts b/packages/app-cli/tests/support/plugins/load_css/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/menu/api/types.ts b/packages/app-cli/tests/support/plugins/menu/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/multi_selection/api/types.ts b/packages/app-cli/tests/support/plugins/multi_selection/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/nativeModule/api/types.ts b/packages/app-cli/tests/support/plugins/nativeModule/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/note_list_renderer/api/types.ts b/packages/app-cli/tests/support/plugins/note_list_renderer/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/post_messages/api/types.ts b/packages/app-cli/tests/support/plugins/post_messages/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/register_command/api/types.ts b/packages/app-cli/tests/support/plugins/register_command/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/selected_text/api/types.ts b/packages/app-cli/tests/support/plugins/selected_text/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/settings/api/types.ts b/packages/app-cli/tests/support/plugins/settings/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/toc/api/types.ts b/packages/app-cli/tests/support/plugins/toc/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/user_data/api/types.ts b/packages/app-cli/tests/support/plugins/user_data/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/withExternalModules/api/types.ts b/packages/app-cli/tests/support/plugins/withExternalModules/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-cli/tests/support/plugins/worker/api/types.ts b/packages/app-cli/tests/support/plugins/worker/api/types.ts
@@ -382,6 +382,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/app-desktop/gui/ConfigScreen/controls/SettingComponent.tsx b/packages/app-desktop/gui/ConfigScreen/controls/SettingComponent.tsx
@@ -327,7 +327,7 @@ const SettingComponent: React.FC<Props> = props => {
 				</div>
 			);
 		}
-	} else if (md.type === Setting.TYPE_INT) {
+	} else if (md.type === Setting.TYPE_INT || md.type === Setting.TYPE_BIGINT) {
 		const value = props.value as number;
 
 		const onNumChange: React.ChangeEventHandler<HTMLInputElement> = (event) => {

diff --git a/packages/app-mobile/components/screens/ConfigScreen/SettingComponent.tsx b/packages/app-mobile/components/screens/ConfigScreen/SettingComponent.tsx
@@ -114,6 +114,33 @@ const SettingComponent: React.FunctionComponent<Props> = props => {
 				</View>
 			</View>
 		);
+	} else if (md.type === Setting.TYPE_BIGINT) {
+		const value = props.value?.toString();
+		const label = `${md.label()} (${md.unitLabel(md.value)})`;
+
+		return (
+			<View key={props.settingId} style={{ flexDirection: 'column', borderBottomWidth: 1, borderBottomColor: theme.dividerColor }}>
+				<View key={props.settingId} style={containerStyle}>
+					<Text key="label" style={styleSheet.settingText}>
+						{label}
+					</Text>
+					<TextInput
+						keyboardType="numeric"
+						autoCorrect={false}
+						autoComplete="off"
+						selectionColor={theme.textSelectionColor}
+						keyboardAppearance={theme.keyboardAppearance}
+						autoCapitalize="none"
+						key="control"
+						style={styleSheet.settingControl}
+						value={value}
+						onChangeText={newValue => void props.updateSettingValue(props.settingId, newValue.replace(/[^0-9]/g, ''))}
+						secureTextEntry={!!md.secure}
+					/>
+				</View>
+				{descriptionComp}
+			</View>
+		);
 	} else if (md.type === Setting.TYPE_STRING) {
 		if (['sync.2.path', 'plugins.devPluginPaths'].includes(md.key) && (shim.fsDriver().isUsingAndroidSAF() || shim.mobilePlatform() === 'web')) {
 			return (

diff --git a/packages/generator-joplin/generators/app/templates/api/types.ts b/packages/generator-joplin/generators/app/templates/api/types.ts
@@ -395,6 +395,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/lib/models/Setting.ts b/packages/lib/models/Setting.ts
@@ -151,6 +151,7 @@ class Setting extends BaseModel {
 	public static TYPE_ARRAY = SettingItemType.Array;
 	public static TYPE_OBJECT = SettingItemType.Object;
 	public static TYPE_BUTTON = SettingItemType.Button;
+	public static TYPE_BIGINT = SettingItemType.BigInt;
 
 	public static THEME_LIGHT = 1;
 	public static THEME_DARK = 2;
@@ -782,7 +783,7 @@ class Setting extends BaseModel {
 	public static valueToString(key: string, value: any) {
 		const md = this.settingMetadata(key);
 		value = this.formatValue(key, value);
-		if (md.type === SettingItemType.Int) return value.toFixed(0);
+		if (md.type === SettingItemType.Int || md.type === SettingItemType.BigInt) return value.toFixed(0);
 		if (md.type === SettingItemType.Bool) return value ? '1' : '0';
 		if (md.type === SettingItemType.Array) return value ? JSON.stringify(value) : '[]';
 		if (md.type === SettingItemType.Object) return value ? JSON.stringify(value) : '{}';
@@ -801,7 +802,7 @@ class Setting extends BaseModel {
 	public static formatValue(key: string | SettingItemType, value: any) {
 		const type = typeof key === 'string' ? this.settingMetadata(key).type : key;
 
-		if (type === SettingItemType.Int) return !value ? 0 : Math.floor(Number(value));
+		if (type === SettingItemType.Int || type === SettingItemType.BigInt) return !value ? 0 : Math.floor(Number(value));
 
 		if (type === SettingItemType.Bool) {
 			if (typeof value === 'string') {
@@ -1086,7 +1087,7 @@ class Setting extends BaseModel {
 	}
 
 	public static typeToString(typeId: SettingItemType) {
-		if (typeId === SettingItemType.Int) return 'int';
+		if (typeId === SettingItemType.Int || typeId === SettingItemType.BigInt) return 'int';
 		if (typeId === SettingItemType.String) return 'string';
 		if (typeId === SettingItemType.Bool) return 'bool';
 		if (typeId === SettingItemType.Array) return 'array';

diff --git a/packages/lib/models/settings/builtInMetadata.ts b/packages/lib/models/settings/builtInMetadata.ts
@@ -1407,7 +1407,7 @@ const builtInMetadata = (Setting: typeof SettingType) => {
 		'revisionService.ttlDays': {
 			section: 'revisionService',
 			value: 90,
-			type: SettingItemType.Int,
+			type: SettingItemType.BigInt,
 			public: true,
 			minimum: 1,
 			maximum: 365 * 2,
@@ -1626,7 +1626,7 @@ const builtInMetadata = (Setting: typeof SettingType) => {
 
 		'trash.ttlDays': {
 			value: 90,
-			type: SettingItemType.Int,
+			type: SettingItemType.BigInt,
 			public: true,
 			minimum: 1,
 			maximum: 300,

diff --git a/packages/lib/models/settings/types.ts b/packages/lib/models/settings/types.ts
@@ -7,6 +7,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/lib/services/plugins/api/types.ts b/packages/lib/services/plugins/api/types.ts
@@ -395,6 +395,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 export enum SettingItemSubType {

diff --git a/packages/plugins/ToggleSidebars/api/types.ts b/packages/plugins/ToggleSidebars/api/types.ts
@@ -323,6 +323,7 @@ export enum SettingItemType {
 	Array = 4,
 	Object = 5,
 	Button = 6,
+	BigInt = 7,
 }
 
 // Redefine a simplified interface to mask internal details