retold-facto 0.1.1 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "retold-facto",
-	"version": "0.1.1",
+	"version": "0.2.0",
 	"description": "Data warehouse and knowledge graph storage for the Retold ecosystem.",
 	"main": "source/Retold-Facto.js",
 	"bin": {
@@ -96,30 +96,31 @@
 		"chai": "^6.2.2",
 		"pict-docuserve": "^0.1.5",
 		"puppeteer": "^24.40.0",
-		"quackage": "^1.1.2",
+		"quackage": "^1.1.3",
 		"stricture": "^4.0.2",
 		"supertest": "^7.2.2"
 	},
 	"dependencies": {
 		"@codemirror/lang-markdown": "^6.5.0",
 		"@codemirror/state": "^6.6.0",
-		"meadow-connection-sqlite": "^1.0.18",
+		"meadow-connection-sqlite": "^1.0.19",
 		"@codemirror/view": "^6.41.0",
-		"bibliograph": "^0.1.5",
+		"bibliograph": "^0.1.6",
 		"codemirror": "^6.0.2",
 		"fable": "^3.1.71",
 		"fable-serviceproviderbase": "^3.0.19",
 		"fast-xml-parser": "^5.5.10",
 		"meadow": "^2.0.37",
-		"meadow-connection-manager": "^1.0.2",
-		"meadow-connection-mysql": "^1.0.17",
+		"meadow-connection-manager": "^1.1.0",
+		"meadow-connection-mysql": "^1.0.18",
 		"meadow-endpoints": "^4.0.17",
-		"meadow-integration": "^1.0.35",
-		"orator": "^6.0.4",
+		"meadow-integration": "^1.0.38",
+		"orator": "^6.1.0",
 		"orator-serviceserver-restify": "^2.0.10",
-		"orator-static-server": "^2.0.4",
-		"pict": "^1.0.364",
+		"orator-static-server": "^2.1.3",
+		"pict": "^1.0.365",
 		"pict-router": "^1.0.9",
+		"pict-section-connection-form": "^0.0.1",
 		"pict-section-flow": "^0.0.17",
 		"pict-section-histogram": "^1.0.0",
 		"pict-section-markdowneditor": "^1.0.10",

package/source/services/Retold-Facto-StoreConnectionManager.js

@@ -406,6 +406,25 @@ class RetoldFactoStoreConnectionManager extends libFableServiceProviderBase
 				return fNext();
 			});
 
+		// GET /facto/connection/schemas -- aggregated form schemas, drives
+		// the schema-driven Connections form (pict-section-connection-form).
+		// MCM 1.1.0+ exposes getAllProviderFormSchemas(); older versions are
+		// handled defensively so the UI surfaces a friendly empty state.
+		pOratorServiceServer.doGet(`${tmpRoutePrefix}/connection/schemas`,
+			(pRequest, pResponse, fNext) =>
+			{
+				let tmpMCM = this.fable.MeadowConnectionManager;
+				let tmpSchemas = (tmpMCM && typeof(tmpMCM.getAllProviderFormSchemas) === 'function')
+					? tmpMCM.getAllProviderFormSchemas()
+					: [];
+				if (tmpSchemas.length === 0)
+				{
+					this.fable.log.warn('Facto: meadow-connection-manager getAllProviderFormSchemas() returned no schemas; UI will show "no providers detected".');
+				}
+				pResponse.send({ Schemas: tmpSchemas });
+				return fNext();
+			});
+
 		this.fable.log.info(`StoreConnectionManager routes connected at ${tmpRoutePrefix}/connection*`);
 	}
 

package/source/services/web-app/pict-app-full/Pict-Application-Facto-Full.js

@@ -1,6 +1,7 @@
 const libPictApplication = require('pict-application');
 const libPictRouter = require('pict-router');
 const libPictSectionModal = require('pict-section-modal');
+const libPictSectionConnectionForm = require('pict-section-connection-form');
 
 const THEME_LIST =
 [
@@ -88,6 +89,20 @@ class FactoFullApplication extends libPictApplication
 		this.pict.addView('Facto-Full-SourceEditor', libViewSourceEditor.default_configuration, libViewSourceEditor);
 		this.pict.addView('Facto-Full-Scanner', libViewScanner.default_configuration, libViewScanner);
 		this.pict.addView('Facto-Full-Connections', libViewConnections.default_configuration, libViewConnections);
+
+		// Shared schema-driven connection form.  Renders the type
+		// select + per-provider field block into the slot owned by
+		// the Facto-Full-Connections view.  Schemas come from
+		// /facto/connection/schemas (Retold-Facto-StoreConnectionManager).
+		this.pict.addView('PictSection-ConnectionForm',
+			Object.assign({}, libPictSectionConnectionForm.default_configuration,
+				{
+					ContainerSelector:         '#Facto-Conn-Form-FieldsSlot',
+					DefaultDestinationAddress: '#Facto-Conn-Form-FieldsSlot',
+					SchemasAddress:            'AppData.Facto.ConnectionFormSchemas',
+					ActiveAddress:             'AppData.Facto.ConnectionFormActiveProvider',
+					FieldIDPrefix:             'facto-conn'
+				}), libPictSectionConnectionForm);
 		this.pict.addView('Facto-Full-ProjectionDetail', libViewProjectionDetail.default_configuration, libViewProjectionDetail);
 		this.pict.addView('Facto-Full-Throughput', libViewThroughput.default_configuration, libViewThroughput);
 		this.pict.addView('Facto-Full-SchemaResearch', libViewSchemaResearch.default_configuration, libViewSchemaResearch);

package/source/services/web-app/pict-app-full/views/PictView-Facto-Full-Connections.js

@@ -70,49 +70,18 @@ const _ViewConfiguration =
 
 		<div id="Facto-Conn-Form" class="facto-conn-form">
 			<div class="facto-conn-form-grid">
-				<div>
+				<div style="grid-column: span 2;">
 					<label>Connection Name</label>
 					<input type="text" id="Facto-Conn-Name" placeholder="e.g. Production MySQL">
 				</div>
-				<div>
-					<label>Type</label>
-					<select id="Facto-Conn-Type" onchange="{~P~}.views['Facto-Full-Connections'].updateConnectionFormFields()">
-						<option value="MySQL">MySQL</option>
-						<option value="PostgreSQL">PostgreSQL</option>
-						<option value="MSSQL">MSSQL</option>
-						<option value="SQLite">SQLite</option>
-						<option value="Solr">Solr</option>
-						<option value="RocksDB">RocksDB</option>
-					</select>
-				</div>
-				<div id="Facto-Conn-FilePath-Wrap" style="display:none;">
-					<label>File Path</label>
-					<input type="text" id="Facto-Conn-FilePath" placeholder="/path/to/database.sqlite">
-				</div>
-				<div id="Facto-Conn-Host-Wrap">
-					<label>Host</label>
-					<input type="text" id="Facto-Conn-Host" placeholder="localhost">
-				</div>
-				<div id="Facto-Conn-Port-Wrap">
-					<label>Port</label>
-					<input type="number" id="Facto-Conn-Port" placeholder="3306">
-				</div>
-				<div id="Facto-Conn-User-Wrap">
-					<label>User</label>
-					<input type="text" id="Facto-Conn-User" placeholder="root">
-				</div>
-				<div id="Facto-Conn-Password-Wrap">
-					<label>Password</label>
-					<input type="password" id="Facto-Conn-Password" placeholder="password">
-				</div>
-				<div id="Facto-Conn-Database-Wrap">
-					<label>Database</label>
-					<input type="text" id="Facto-Conn-Database" placeholder="my_database">
-				</div>
-				<div class="facto-conn-form-actions">
-					<button class="facto-btn facto-btn-primary facto-btn-small" onclick="{~P~}.views['Facto-Full-Connections'].addConnection()">Save Connection</button>
-					<button class="facto-btn facto-btn-secondary facto-btn-small" onclick="{~P~}.views['Facto-Full-Connections'].toggleConnectionForm()">Cancel</button>
-				</div>
+			</div>
+
+			<!-- pict-section-connection-form renders the type select + per-provider field block here -->
+			<div id="Facto-Conn-Form-FieldsSlot" style="margin-top:0.6em"></div>
+
+			<div class="facto-conn-form-actions" style="margin-top:0.6em">
+				<button class="facto-btn facto-btn-primary facto-btn-small" onclick="{~P~}.views['Facto-Full-Connections'].addConnection()">Save Connection</button>
+				<button class="facto-btn facto-btn-secondary facto-btn-small" onclick="{~P~}.views['Facto-Full-Connections'].toggleConnectionForm()">Cancel</button>
 			</div>
 		</div>
 
@@ -155,6 +124,28 @@ class FactoFullConnectionsView extends libPictView
 				this.pict.views['Pict-Section-Modal'].toast('Error loading connections: ' + pError.message, {type: 'error'});
 			});
 
+		// Fetch the form schemas and hand them to the shared
+		// pict-section-connection-form view (which renders into
+		// #Facto-Conn-Form-FieldsSlot once the user opens the form).
+		this.pict.providers.Facto.api('GET', '/facto/connection/schemas').then(
+			(pData) =>
+			{
+				let tmpSchemas = (pData && Array.isArray(pData.Schemas)) ? pData.Schemas : [];
+				let tmpFormView = this.pict.views['PictSection-ConnectionForm'];
+				if (tmpFormView && typeof(tmpFormView.setSchemas) === 'function')
+				{
+					tmpFormView.setSchemas(tmpSchemas);
+				}
+				this.pict.AppData.Facto.ConnectionFormSchemas = tmpSchemas;
+			}).catch(
+			(pError) =>
+			{
+				if (this.pict.log && this.pict.log.warn)
+				{
+					this.pict.log.warn(`Facto: failed to fetch /facto/connection/schemas: ${pError && pError.message}`);
+				}
+			});
+
 		return super.onAfterRender();
 	}
 
@@ -166,31 +157,16 @@ class FactoFullConnectionsView extends libPictView
 			tmpForm.classList.toggle('active');
 			if (tmpForm.classList.contains('active'))
 			{
-				this.updateConnectionFormFields();
+				// Make sure the schema-driven form renders into the slot
+				// when the user opens the panel.  AutoRender is false on
+				// the shared view so we trigger it here.  Schemas were
+				// fetched earlier by loadAvailableConnectionTypes().
+				let tmpFormView = this.pict.views['PictSection-ConnectionForm'];
+				if (tmpFormView) { tmpFormView.render(); }
 			}
 		}
 	}
 
-	updateConnectionFormFields()
-	{
-		let tmpType = this.pict.providers.FactoUI.getVal('Facto-Conn-Type');
-		let tmpIsFileBased = (tmpType === 'SQLite' || tmpType === 'RocksDB');
-
-		let tmpFilePathWrap = document.getElementById('Facto-Conn-FilePath-Wrap');
-		let tmpHostWrap = document.getElementById('Facto-Conn-Host-Wrap');
-		let tmpPortWrap = document.getElementById('Facto-Conn-Port-Wrap');
-		let tmpUserWrap = document.getElementById('Facto-Conn-User-Wrap');
-		let tmpPasswordWrap = document.getElementById('Facto-Conn-Password-Wrap');
-		let tmpDatabaseWrap = document.getElementById('Facto-Conn-Database-Wrap');
-
-		if (tmpFilePathWrap) tmpFilePathWrap.style.display = tmpIsFileBased ? '' : 'none';
-		if (tmpHostWrap) tmpHostWrap.style.display = tmpIsFileBased ? 'none' : '';
-		if (tmpPortWrap) tmpPortWrap.style.display = tmpIsFileBased ? 'none' : '';
-		if (tmpUserWrap) tmpUserWrap.style.display = tmpIsFileBased ? 'none' : '';
-		if (tmpPasswordWrap) tmpPasswordWrap.style.display = tmpIsFileBased ? 'none' : '';
-		if (tmpDatabaseWrap) tmpDatabaseWrap.style.display = tmpIsFileBased ? 'none' : '';
-	}
-
 	refreshConnectionList()
 	{
 		let tmpContainer = document.getElementById('Facto-Conn-List');
@@ -229,41 +205,31 @@ class FactoFullConnectionsView extends libPictView
 	addConnection()
 	{
 		let tmpName = this.pict.providers.FactoUI.getVal('Facto-Conn-Name');
-		let tmpType = this.pict.providers.FactoUI.getVal('Facto-Conn-Type');
-
 		if (!tmpName)
 		{
 			this.pict.views['Pict-Section-Modal'].toast('Connection name is required.', {type: 'warning'});
 			return;
 		}
 
-		let tmpIsFileBased = (tmpType === 'SQLite' || tmpType === 'RocksDB');
-		let tmpConfig = {};
+		// Pull Type + Config straight from the shared schema-driven view.
+		// That view handles SQLite vs server-style providers, MSSQL retry
+		// tuning, etc., uniformly via its schema definitions.
+		let tmpFormView = this.pict.views['PictSection-ConnectionForm'];
+		let tmpConnInfo = (tmpFormView && typeof(tmpFormView.getProviderConfig) === 'function')
+			? tmpFormView.getProviderConfig()
+			: { Provider: '', Config: {} };
 
-		if (tmpIsFileBased)
-		{
-			tmpConfig.SQLiteFilePath = this.pict.providers.FactoUI.getVal('Facto-Conn-FilePath');
-			if (!tmpConfig.SQLiteFilePath)
-			{
-				this.pict.views['Pict-Section-Modal'].toast('File path is required for ' + tmpType + ' connections.', {type: 'warning'});
-				return;
-			}
-		}
-		else
+		if (!tmpConnInfo.Provider)
 		{
-			tmpConfig.host = this.pict.providers.FactoUI.getVal('Facto-Conn-Host');
-			tmpConfig.server = tmpConfig.host;
-			tmpConfig.port = parseInt(this.pict.providers.FactoUI.getVal('Facto-Conn-Port')) || 0;
-			tmpConfig.user = this.pict.providers.FactoUI.getVal('Facto-Conn-User');
-			tmpConfig.password = this.pict.providers.FactoUI.getVal('Facto-Conn-Password');
-			tmpConfig.database = this.pict.providers.FactoUI.getVal('Facto-Conn-Database');
+			this.pict.views['Pict-Section-Modal'].toast('Pick a provider type.', {type: 'warning'});
+			return;
 		}
 
 		this.pict.providers.Facto.createStoreConnection(
 		{
-			Name: tmpName,
-			Type: tmpType,
-			Config: tmpConfig
+			Name:   tmpName,
+			Type:   tmpConnInfo.Provider,
+			Config: tmpConnInfo.Config || {}
 		}).then(
 			(pResponse) =>
 			{
@@ -277,16 +243,17 @@ class FactoFullConnectionsView extends libPictView
 				this.pict.providers.Facto.loadStoreConnections().then(
 					(pResult) =>
 					{
-						
+
 						this.refreshConnectionList();
 						this.toggleConnectionForm();
 
-						// Clear form
-						let tmpFields = ['Name', 'Host', 'Port', 'User', 'Password', 'Database', 'FilePath'];
-						for (let i = 0; i < tmpFields.length; i++)
+						// Clear name input + reset the shared schema-driven
+						// form back to its default (first provider, default values).
+						let tmpNameEl = document.getElementById('Facto-Conn-Name');
+						if (tmpNameEl) tmpNameEl.value = '';
+						if (tmpFormView && typeof(tmpFormView.clear) === 'function')
 						{
-							let tmpEl = document.getElementById('Facto-Conn-' + tmpFields[i]);
-							if (tmpEl) tmpEl.value = '';
+							tmpFormView.clear();
 						}
 					});
 			});