npm - @pacaf/wizard-ux - Versions diffs - 3.4.3 → 3.5.1 - Mend

@pacaf/wizard-ux 3.4.3 → 3.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/assets/index-BL1yODjj.js +141 -0
package/dist/index.html +1 -1
package/package.json +2 -2
package/server/routes/state.mjs +48 -0
package/server/steps/08-connectors.mjs +93 -45
package/server/steps/09-verify-deploy.mjs +4 -0
package/server/steps/10-add-to-solution.mjs +28 -0
package/server/steps/index.mjs +2 -1
package/dist/assets/index-DJRPvUY4.js +0 -141

package/dist/index.html CHANGED Viewed

@@ -28,7 +28,7 @@
       }
       @keyframes spin { to { transform: rotate(360deg); } }
     </style>
-    <script type="module" crossorigin src="/assets/index-DJRPvUY4.js"></script>
+    <script type="module" crossorigin src="/assets/index-BL1yODjj.js"></script>
   </head>
   <body>
     <div id="root"><div id="boot"><div class="ring"></div></div></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@pacaf/wizard-ux",
-  "version": "3.4.3",
+  "version": "3.5.1",
   "private": false,
   "type": "module",
   "description": "Browser-based setup wizard for Power Apps Code Apps (parallel to @pacaf/wizard CLI).",
@@ -38,7 +38,7 @@
     "react-dom": "^19.0.0",
     "react-resizable-panels": "^2.1.7",
     "react-router-dom": "^7.1.0",
-    "@pacaf/wizard": "3.4.3"
+    "@pacaf/wizard": "3.4.4"
   },
   "devDependencies": {
     "@types/react": "^19.0.0",

package/server/routes/state.mjs CHANGED Viewed

@@ -56,6 +56,52 @@ function readPowerAppInfo(rootDir, state) {
   };
 }
+// Read the Power Platform environment GUID from power.config.json so we can
+// build a Maker Portal deep link. The GUID is required by make.powerapps.com
+// URLs (the org URL like https://contoso.crm.dynamics.com is NOT accepted).
+function readEnvironmentId(rootDir, state) {
+  const projectDir = resolve(rootDir, String(state.PROJECT_DIR || '.'));
+  const powerConfigPath = join(projectDir, 'power.config.json');
+  if (!existsSync(powerConfigPath)) return '';
+  try {
+    const c = JSON.parse(readFileSync(powerConfigPath, 'utf-8'));
+    const direct = String(
+      c.environmentId || c.environment?.id || c.targetEnvironmentId || '',
+    ).trim().toLowerCase();
+    if (direct) return direct;
+    const appUrl = String(c.localAppUrl || c.appUrl || c.playUrl || '').trim();
+    const m = appUrl.match(/\/play\/e\/([0-9a-f-]{36})\/app\//i);
+    return m ? m[1].toLowerCase() : '';
+  } catch {
+    return '';
+  }
+}
+// Build the manual "add Code App to solution" guidance consumed by Step 10 in
+// WizardUX. Returns a direct Maker Portal deep link to the user's solution
+// (falling back to the environment's solutions list, then the portal root) so
+// the user can add the deployed Code App by hand. Never exposes raw GUIDs to
+// the UI — only the human-readable solution display name and app name.
+function readSolutionInfo(rootDir, state) {
+  const environmentId = readEnvironmentId(rootDir, state);
+  const solutionId = String(state.SOLUTION_ID || '').trim().toLowerCase();
+  const displayName = String(state.SOLUTION_DISPLAY_NAME || '').trim();
+  const uniqueName = String(state.SOLUTION_UNIQUE_NAME || '').trim();
+  const appName = String(state.APP_NAME || '').trim();
+  let makerPortalUrl = 'https://make.powerapps.com/';
+  let linkTarget = 'portal'; // 'solution' | 'solutions' | 'portal'
+  if (environmentId && solutionId) {
+    makerPortalUrl = `https://make.powerapps.com/environments/${environmentId}/solutions/${solutionId}`;
+    linkTarget = 'solution';
+  } else if (environmentId) {
+    makerPortalUrl = `https://make.powerapps.com/environments/${environmentId}/solutions`;
+    linkTarget = 'solutions';
+  }
+  return { displayName, uniqueName, appName, makerPortalUrl, linkTarget };
+}
 export default async function stateRoutes(app, opts) {
   const { rootDir } = opts;
@@ -63,12 +109,14 @@ export default async function stateRoutes(app, opts) {
     const state = readState(rootDir);
     const completed = getCompletedStep(state);
     const powerApp = readPowerAppInfo(rootDir, state);
+    const solution = readSolutionInfo(rootDir, state);
     return {
       state,
       completed,
       next: Math.min(completed + 1, TOTAL_STEPS),
       totalSteps: TOTAL_STEPS,
       powerApp,
+      solution,
     };
   });

package/server/steps/08-connectors.mjs CHANGED Viewed

@@ -1,5 +1,7 @@
 // Step 8 - Connectors. Browser-native connector selection and optional data-source binding.
-import { existsSync } from 'node:fs';
+// Dataverse is NOT in this list and is never an opt-in toggle: every Code App is bound to
+// Dataverse at the environment level via the mandatory Dataverse URL captured in Step 2.
+import { existsSync, readFileSync } from 'node:fs';
 import { execFileSync } from 'node:child_process';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -19,8 +21,9 @@ const CREATE_MANUAL = '__manual__';
 const SKIP_CONNECTION = '__skip__';
 const BAP_PERMISSION_RE = /does not have permission to access|checkAccess|HTTP error status: 403/i;
+// Dataverse is intentionally excluded: it is mandatory and bound at the environment level,
+// not chosen here. See bindDataverse() for the always-on handling.
 const COMMON_CONNECTORS = [
-  { apiId: 'shared_commondataserviceforapps', name: 'Dataverse' },
   { apiId: 'shared_office365users', name: 'Office 365 Users' },
   { apiId: 'shared_sharepointonline', name: 'SharePoint' },
   { apiId: 'shared_office365', name: 'Office 365 Outlook' },
@@ -156,6 +159,46 @@ function runFileCapture(log, file, args, opts = {}) {
   });
 }
+// Read the planned Dataverse tables produced by the planning workflow
+// (dataverse/register-datasources.plan.json). Missing/invalid plan = no tables yet.
+function dataverseRegistrationPlan(projectDir) {
+  const planPath = join(projectDir, 'dataverse', 'register-datasources.plan.json');
+  if (!existsSync(planPath)) return { planPath, tables: [] };
+  try {
+    const plan = JSON.parse(readFileSync(planPath, 'utf-8'));
+    const tables = Array.isArray(plan.dataverseTables) ? plan.dataverseTables.filter(Boolean) : [];
+    return { planPath, tables };
+  } catch {
+    return { planPath, tables: [] };
+  }
+}
+// Dataverse is always bound to a Code App — never optional. When planned tables exist and we
+// have a verified user PAC profile, register them now; otherwise emit clear, non-optional status.
+async function bindDataverse(log, { pac, projectDir, canRegister }) {
+  log.info('Dataverse is always bound to this Code App at the environment level (the Dataverse URL you confirmed in Step 2). It is never optional.');
+  const { tables } = dataverseRegistrationPlan(projectDir);
+  if (tables.length === 0) {
+    log.info('No Dataverse tables are planned yet. Once your planning payload defines tables, register them with: npm run register:dataverse');
+    return [];
+  }
+  if (!canRegister || !pac) {
+    log.info(`${tables.length} planned Dataverse table(s) found. Register them with: npm run register:dataverse (or pac code add-data-source -a dataverse -t <table>).`);
+    return [];
+  }
+  const registered = [];
+  for (const table of tables) {
+    const result = await runFileCapture(log, pac, ['code', 'add-data-source', '-a', 'dataverse', '-t', table], { cwd: projectDir });
+    if (!result.ok || BAP_PERMISSION_RE.test(result.stderr)) {
+      log.warn(`Dataverse table ${table} - registration failed. Retry later with: pac code add-data-source -a dataverse -t ${table}`);
+    } else {
+      log.ok(`Dataverse table ${table} - data source registered`);
+      registered.push(table);
+    }
+  }
+  return registered;
+}
 function parseCustomConnectors(rawEntries) {
   const connectors = [];
   const seen = new Set();
@@ -204,7 +247,7 @@ export default {
   meta: {
     number: 8,
     title: 'Bind Connectors',
-    description: 'Choose connector references and optionally register connector data sources for the Code App.',
+    description: 'Dataverse is always bound at the environment level (Step 2). Here you optionally choose additional connector references and register their data sources.',
     canRunInBrowser: true,
     optional: true,
     needsSecret: true,
@@ -266,8 +309,6 @@ export default {
         showIf: { id: 'DEFER_CONNECTORS', equals: false },
       });
-      if (connector.apiId === 'shared_commondataserviceforapps') continue;
       const discovered = discoverConnections(pac, connector.apiId);
       const savedConnectionId = state.CONNECTOR_CONNECTION_IDS?.[connector.apiId] || '';
       const defaultValue = savedConnectionId || (discovered.length === 1 ? discovered[0].connectionId : SKIP_CONNECTION);
@@ -324,6 +365,12 @@ export default {
     if (answers.DEFER_CONNECTORS !== false) {
       log.ok('Connector binding deferred until prototype validation is complete');
       if (customRaw.length > 0) log.info(`Recorded connector notes: ${customRaw.join(', ')}`);
+      // Dataverse is never deferred — it is bound at the environment level regardless.
+      await bindDataverse(log, {
+        pac: null,
+        projectDir: resolve(String(state.PROJECT_DIR || PROJECT_DIR)),
+        canRegister: false,
+      });
       return {
         stateUpdate: {
           CONNECTOR_BINDING_DEFERRED: true,
@@ -347,59 +394,55 @@ export default {
       ...customConnectors.map((connector) => connector.apiId),
     ])).filter((apiId) => connectorMap.has(apiId));
-    if (selectedApiIds.length === 0) {
-      log.warn('No connectors selected. Nothing to bind.');
-      return {
-        stateUpdate: {
-          CONNECTOR_BINDING_DEFERRED: false,
-          CONNECTOR_API_IDS: [],
-          CUSTOM_CONNECTORS: customRaw,
-        },
-        completedStep: 8,
-      };
-    }
+    const projectDir = resolve(String(state.PROJECT_DIR || PROJECT_DIR));
     const prefix = state.PUBLISHER_PREFIX || '';
     const solutionName = state.SOLUTION_UNIQUE_NAME || '';
-    if (!prefix) throw new Error('Publisher prefix is missing. Complete Step 5 before binding connectors.');
-    if (!solutionName) throw new Error('Solution unique name is missing. Complete Step 6 before binding connectors.');
-    log.info('Checking existing connection references...');
-    let existingRefs = [];
-    if (!isUserAuth) {
-      try {
-        existingRefs = await listConnectionReferences(prefix);
-      } catch (err) {
-        log.warn(`Could not query connection references: ${err.message}`);
-      }
-    }
-    if (isUserAuth) {
-      log.warn('User auth does not support automated connection reference creation via the Dataverse API.');
-      log.info('Create connection references manually in the Maker Portal:');
-      log.info(`  1. Go to make.powerapps.com → your Dev environment → Solutions → ${solutionName}`);
-      log.info('  2. Add existing → Connection reference → for each connector');
-      log.info('  3. Or create them during pac code add-data-source.');
+    if (selectedApiIds.length === 0) {
+      log.info('No additional connectors selected. Dataverse is still bound automatically.');
     } else {
-      log.info('Creating missing connection references in the selected solution...');
-      for (const apiId of selectedApiIds) {
-        const connector = connectorMap.get(apiId);
+      if (!prefix) throw new Error('Publisher prefix is missing. Complete Step 5 before binding connectors.');
+      if (!solutionName) throw new Error('Solution unique name is missing. Complete Step 6 before binding connectors.');
+      log.info('Checking existing connection references...');
+      let existingRefs = [];
+      if (!isUserAuth) {
         try {
-          const created = await createConnectionReference(log, connector, prefix, solutionName, existingRefs);
-          existingRefs.push(created);
+          existingRefs = await listConnectionReferences(prefix);
         } catch (err) {
-          if (/already exists|database constraint/i.test(err.message)) log.ok(`${connector.name} - connection reference already exists`);
-          else log.warn(`${connector.name} - connection reference failed: ${err.message}`);
+          log.warn(`Could not query connection references: ${err.message}`);
+        }
+      }
+      if (isUserAuth) {
+        log.warn('User auth does not support automated connection reference creation via the Dataverse API.');
+        log.info('Create connection references manually in the Maker Portal:');
+        log.info(`  1. Go to make.powerapps.com → your Dev environment → Solutions → ${solutionName}`);
+        log.info('  2. Add existing → Connection reference → for each connector');
+        log.info('  3. Or create them during pac code add-data-source.');
+      } else {
+        log.info('Creating missing connection references in the selected solution...');
+        for (const apiId of selectedApiIds) {
+          const connector = connectorMap.get(apiId);
+          try {
+            const created = await createConnectionReference(log, connector, prefix, solutionName, existingRefs);
+            existingRefs.push(created);
+          } catch (err) {
+            if (/already exists|database constraint/i.test(err.message)) log.ok(`${connector.name} - connection reference already exists`);
+            else log.warn(`${connector.name} - connection reference failed: ${err.message}`);
+          }
         }
       }
     }
     const connectionIds = {};
+    let dataversePac = null;
+    let dataverseCanRegister = false;
     if (answers.REGISTER_DATA_SOURCES === true) {
       const pac = SHELL.pacPath();
       if (!pac) throw new Error('PAC CLI was not found. Install PAC CLI before registering data sources.');
-      const projectDir = resolve(String(state.PROJECT_DIR || PROJECT_DIR));
       if (!existsSync(join(projectDir, 'power.config.json'))) {
         throw new Error(`power.config.json was not found in ${projectDir}. Complete Step 7 before registering data sources.`);
       }
@@ -407,8 +450,10 @@ export default {
       const credentialValues = isUserAuth ? null : resolveCredentialValues(state);
       const verification = verifyUserProfile(pac, projectDir, state, credentialValues);
       log.ok(`Verified user profile ${verification.profileName}`);
+      dataversePac = pac;
+      dataverseCanRegister = true;
-      for (const apiId of selectedApiIds.filter((id) => id !== 'shared_commondataserviceforapps')) {
+      for (const apiId of selectedApiIds) {
         const connector = connectorMap.get(apiId);
         const connectionId = connectionIdFromAnswers(answers, connector);
         if (!connectionId) {
@@ -425,9 +470,12 @@ export default {
         }
       }
     } else {
-      log.info('Data-source registration skipped. Connection references were handled in the solution.');
+      log.info('Connector data-source registration skipped. Connection references were handled in the solution.');
     }
+    // Dataverse is ALWAYS present — registered here when planned tables and a verified profile exist.
+    await bindDataverse(log, { pac: dataversePac, projectDir, canRegister: dataverseCanRegister });
     return {
       stateUpdate: {
         CONNECTOR_BINDING_DEFERRED: false,

package/server/steps/09-verify-deploy.mjs CHANGED Viewed

@@ -118,6 +118,10 @@ export default {
     title: 'Verify & Deploy',
     description: 'Build the project, optionally push it to Power Platform, and surface the live app URL when available.',
     canRunInBrowser: true,
+    // Do NOT auto-advance away from the deploy step: the user needs time to read
+    // the pac code push log (solution association, app URL, warnings) before
+    // moving on to the manual "add to solution" step.
+    noAutoAdvance: true,
   },
   questions() {

package/server/steps/10-add-to-solution.mjs ADDED Viewed

@@ -0,0 +1,28 @@
+// Step 10 — Add the Code App to your Solution (manual).
+//
+// This is a MANUAL step, not a terminal/automation step. `pac code push -s`
+// only associates the Code App with a solution when that solution already
+// exists in the target environment, and even then the binding can silently
+// fall back to the Default solution. Rather than pretend that automation is
+// reliable, this step hands the user a direct Maker Portal deep link and the
+// exact clicks needed to add the Code App to their target solution by hand.
+//
+// Because it is manual, it has no questions and no apply(): `canRunInBrowser`
+// is false and `manual` is true so the WizardUX StepRunner renders a guided
+// panel (deep link + "Outside Dataverse" guidance + illustration) instead of
+// the question/run machinery. The deep link and solution display name are
+// supplied to the frontend by GET /api/state (see routes/state.mjs).
+export default {
+  meta: {
+    number: 10,
+    title: 'Add App to Solution',
+    description:
+      'Required manual step — open the Maker Portal and add your deployed Code App to your target solution.',
+    canRunInBrowser: false,
+    manual: true,
+  },
+  questions() {
+    return [];
+  },
+};

package/server/steps/index.mjs CHANGED Viewed

@@ -13,8 +13,9 @@ import step6 from './06-solution.mjs';
 import step7 from './07-scaffold.mjs';
 import step8 from './08-connectors.mjs';
 import step9 from './09-verify-deploy.mjs';
+import step10 from './10-add-to-solution.mjs';
-export const STEPS = [step1, step2, step3, step4, step5, step6, step7, step8, step9];
+export const STEPS = [step1, step2, step3, step4, step5, step6, step7, step8, step9, step10];
 export const TOTAL_STEPS = STEPS.length;
 export function getStep(n) {