Merge UI into new screen

server/lib/isLicencedOrSubscribed.ts

@@ -1,22 +1,16 @@
 import { build } from "@server/build";
-import license from "@server/license/license";
+import license from "#dynamic/license/license";
 import { getOrgTierData } from "#dynamic/lib/billing";
-import { TierId } from "./billing/tiers";
+import { TierId } from "@server/lib/billing/tiers";
 
 export async function isLicensedOrSubscribed(orgId: string): Promise<boolean> {
     if (build === "enterprise") {
-        const isUnlocked = await license.isUnlocked();
-        if (!isUnlocked) {
-            return false;
-        }
+        return await license.isUnlocked();
     }
 
     if (build === "saas") {
         const { tier } = await getOrgTierData(orgId);
-        const subscribed = tier === TierId.STANDARD;
-        if (!subscribed) {
-            return false;
-        }
+        return tier === TierId.STANDARD;
     }
 
     return true;

server/private/lib/traefik/getTraefikConfig.ts

@@ -430,6 +430,7 @@ export async function getTraefikConfig(
 
                 continue;
             }
+
             const domainParts = fullDomain.split(".");
             let wildCard;
             if (domainParts.length <= 2) {

server/routers/resource/updateResource.ts

@@ -343,6 +343,7 @@ async function updateHttpResource(
 
     const isLicensed = await isLicensedOrSubscribed(resource.orgId);
     if (build == "enterprise" && !isLicensed) {
+        logger.warn("Server is not licensed! Clearing set maintenance screen values")
         // null the maintenance mode fields if not licensed
         updateData.maintenanceModeEnabled = undefined;
         updateData.maintenanceModeType = undefined;