Merge pull request #391 from mittwald/chore/python-app-version

Hide version number of custom python apps

src/commands/app/list.ts

@@ -4,9 +4,8 @@ import { ListBaseCommand } from "../../ListBaseCommand.js";
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
 import { SuccessfulResponse } from "../../types.js";
 import { ListColumns } from "../../Formatter.js";
-import { phpInstaller } from "./create/php.js";
-import { nodeInstaller } from "./create/node.js";
 import { getAppFromUuid, getAppVersionFromUuid } from "../../lib/app/uuid.js";
+import { isCustomAppInstallation } from "../../lib/app/custom_installation.js";
 
 type AppApp = MittwaldAPIV2.Components.Schemas.AppApp;
 type AppAppVersion = MittwaldAPIV2.Components.Schemas.AppAppVersion;
@@ -93,7 +92,7 @@ export default class List extends ListBaseCommand<
       appVersion: {
         header: "Version",
         get: (i) => {
-          if ([phpInstaller.appId, nodeInstaller.appId].includes(i.appId)) {
+          if (isCustomAppInstallation(i.appId)) {
             return "n/a";
           }
 

src/lib/app/custom_installation.ts

@@ -0,0 +1,17 @@
+import { phpInstaller } from "../../commands/app/create/php.js";
+import { nodeInstaller } from "../../commands/app/create/node.js";
+import { pythonInstaller } from "../../commands/app/create/python.js";
+
+/**
+ * Tests if an app installation is for a custom app (for example, a custom PHP
+ * or Node.js app). These are treated differently in the UI.
+ *
+ * @param appId
+ */
+export function isCustomAppInstallation(appId: string): boolean {
+  return [
+    phpInstaller.appId,
+    nodeInstaller.appId,
+    pythonInstaller.appId,
+  ].includes(appId);
+}

src/rendering/react/components/AppInstallation/AppInstallationDetails.tsx

@@ -8,19 +8,15 @@ import type { MittwaldAPIV2 } from "@mittwald/api-client";
 import { Box, Text } from "ink";
 type AppAppInstallation = MittwaldAPIV2.Components.Schemas.AppAppInstallation;
 type AppApp = MittwaldAPIV2.Components.Schemas.AppApp;
-import { phpInstaller } from "../../../../commands/app/create/php.js";
-import { nodeInstaller } from "../../../../commands/app/create/node.js";
 import { useProject } from "../../../../lib/project/hooks.js";
 import { IDAndShortID } from "../IDAndShortID.js";
 import path from "path";
+import { isCustomAppInstallation } from "../../../../lib/app/custom_installation.js";
 
 export const AppInstallationDetails: FC<{
   appInstallation: AppAppInstallation;
   app: AppApp;
 }> = ({ app, appInstallation }) => {
-  const customInstallation = [phpInstaller.appId, nodeInstaller.appId].includes(
-    app.id,
-  );
   const desiredAppVersion = useAppVersion(
     app.id,
     appInstallation.appVersion.desired,
@@ -65,7 +61,7 @@ export const AppInstallationDetails: FC<{
       <Value>{appInstallation.customDocumentRoot ?? "/"}</Value>
     ),
     Description: <Value>{appInstallation.description}</Value>,
-    Status: customInstallation ? (
+    Status: isCustomAppInstallation(appInstallation.appId) ? (
       <Text>custom application</Text>
     ) : (
       <AppInstallationStatus