feat: Additional refactoring. Cleaned up dead APPLY_VALIDATION_ERROR dead code. Moved rendering logic to the ApplyComplete component instead.

Author: kevinwang5658

src/ui/components/default-component.tsx

@@ -59,33 +59,6 @@ export function DefaultComponent(props: {
         (plan, idx) => <PlanComponent key={idx} plan={plan}/>
       }</Static>
     }
-    {
-      renderStatus === RenderStatus.APPLY_VALIDATION_ERROR && (
-        <Static items={[renderData as ResourcePlan[]]}>{
-          (resourcePlans, idx) => (
-            <Box key={idx} flexDirection="column" marginTop={1}>
-              {resourcePlans.map((resourcePlan) => (
-                <Box key={resourcePlan.id} flexDirection="column">
-                  <Text color="red" bold>
-                    {`Apply failed: resource "${resourcePlan.id}" did not reach its desired state.`}
-                  </Text>
-                  <Text> </Text>
-                  <Text bold backgroundColor={'red'}>Changes still needed:</Text>
-                  <Text>{prettyFormatResourcePlan(resourcePlan)}</Text>
-                  <Text> </Text>
-                </Box>
-              ))}
-              <Text color="red" bold>Exiting...</Text>
-              <Text> </Text>
-              <Text color="red" bold>Potential fixes:</Text>
-              <Text color="red" bold>{'  1. Re-run the command again'}</Text>
-              <Text color="red" bold>{'  2. Manually install the resource and retry'}</Text>
-              <Text color="red" bold>{'  3. Reach out to support at https://github.com/codifycli/default-plugin/issues'}</Text>
-            </Box>
-          )
-        }</Static>
-      )
-    }
     {
       renderStatus === RenderStatus.PLUGIN_ERROR && (
         <Static items={[renderData as string[]]}>{

src/ui/components/widgets/ApplyComplete.tsx

@@ -1,16 +1,32 @@
-import { Box, Text } from 'ink';
+import { Box, Static, Text } from 'ink';
 import React from 'react';
 
 import { ApplyResult } from '../../../entities/apply-result.js';
+import { ResourcePlan } from '../../../entities/plan.js';
 import { applyEntryInkColor, applyEntryLabel } from '../../apply-result-formatter.js';
+import { prettyFormatResourcePlan } from '../../plan-pretty-printer.js';
 
 export function ApplyComplete({ result }: { result: ApplyResult }) {
   const isPartial = result.isPartialFailure();
+
+  const validationErrors = isPartial
+    ? result.errors
+        .filter((e) => e.errorData.errorType === 'apply_validation')
+        .map((e) => new ResourcePlan((e.errorData.data as any).plan))
+    : [];
+
+  const genericErrors = isPartial
+    ? result.errors
+        .filter((e) => e.errorData.errorType !== 'apply_validation')
+        .map((e) => e.message)
+    : [];
+
   return (
     <Box flexDirection="column" marginTop={1}>
       <Text bold color={isPartial ? 'red' : 'green'}>
         {isPartial ? '⚠ Apply completed with errors' : '🎉 Finished applying 🎉'}
       </Text>
+
       {result.entries.length > 0 && (
         <Box flexDirection="column" marginTop={1}>
           {result.entries.map((entry) => (
@@ -21,6 +37,33 @@ export function ApplyComplete({ result }: { result: ApplyResult }) {
           ))}
         </Box>
       )}
+
+      {validationErrors.length > 0 && (
+        <Box flexDirection="column" marginTop={1}>
+          {validationErrors.map((resourcePlan) => (
+            <Box key={resourcePlan.id} flexDirection="column">
+              <Text color="red" bold>
+                {`Apply failed: resource "${resourcePlan.id}" did not reach its desired state.`}
+              </Text>
+              <Text> </Text>
+              <Text bold backgroundColor={'red'}>Changes still needed:</Text>
+              <Text>{prettyFormatResourcePlan(resourcePlan)}</Text>
+              <Text> </Text>
+            </Box>
+          ))}
+          <Text color="red" bold>Potential fixes:</Text>
+          <Text color="red" bold>{'  1. Re-run the command again'}</Text>
+          <Text color="red" bold>{'  2. Manually install the resource and retry'}</Text>
+          <Text color="red" bold>{'  3. Reach out to support at https://github.com/codifycli/default-plugin/issues'}</Text>
+        </Box>
+      )}
+
+      {genericErrors.length > 0 && (
+        <Box flexDirection="column" marginTop={1}>
+          {genericErrors.map((msg, i) => <Text key={i} color="red">{msg}</Text>)}
+        </Box>
+      )}
+
       {!isPartial && (
         <Box marginTop={1}>
           <Text dimColor>Open a new terminal or source &apos;.zshrc&apos; for the new changes to be reflected</Text>

src/ui/reporters/default-reporter.tsx

@@ -271,27 +271,9 @@ export class DefaultReporter implements Reporter {
 
   async displayApplyComplete(result: ApplyResult): Promise<void> {
     await this.updateRenderState(RenderStatus.APPLY_COMPLETE, result);
-
-    if (result.isPartialFailure()) {
-      const validationErrors = result.errors.filter((e) => e.errorData.errorType === 'apply_validation');
-      const genericErrors = result.errors.filter((e) => e.errorData.errorType !== 'apply_validation');
-
-      if (validationErrors.length > 0) {
-        const resourcePlans = validationErrors.map((e) => new ResourcePlan((e.errorData.data as any).plan));
-        await this.updateRenderState(RenderStatus.APPLY_VALIDATION_ERROR, resourcePlans);
-      }
-      if (genericErrors.length > 0) {
-        await this.updateRenderState(RenderStatus.PLUGIN_ERROR, genericErrors.map((e) => e.message));
-      }
-    }
   }
 
   async displayPluginError(error: PluginError): Promise<void> {
-    if (error.errorData.errorType === 'apply_validation') {
-      const resourcePlan = new ResourcePlan((error.errorData.data as any).plan);
-      await this.updateRenderState(RenderStatus.APPLY_VALIDATION_ERROR, [resourcePlan]);
-      return;
-    }
     await this.updateRenderState(RenderStatus.PLUGIN_ERROR, [error.message]);
   }
 

src/ui/store/index.ts

@@ -23,7 +23,6 @@ export enum RenderStatus {
   PROMPT_PRESS_KEY_TO_CONTINUE,
   SUDO_PROMPT,
   DISPLAY_MESSAGE,
-  APPLY_VALIDATION_ERROR,
   PLUGIN_ERROR,
   APPLY_COMPLETE,
 }