[chore] Remove unmanaged sites logic

epfl-si · Jan 30, 2025 · 8d4dc8b · 8d4dc8b
1 parent 78f12db
commit 8d4dc8b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 61 deletions.
diff --git a/app/imports/api/methods/sites.js b/app/imports/api/methods/sites.js
@@ -154,17 +154,8 @@ const validateConsistencyOfFields = (newSite) => {
     }
 
     // Check if subdomains-lite site datas are OK
-    if (
-      newSite.openshiftEnv === "subdomains-lite" ||
-      newSite.openshiftEnv.startsWith("unm-") ||
-      newSite.theme === "wp-theme-light"
-    ) {
-      if (
-        !(
-          (newSite.openshiftEnv === "subdomains-lite" || newSite.openshiftEnv.startsWith("unm-")) &&
-          newSite.theme === "wp-theme-light"
-        )
-      ) {
+    if (newSite.openshiftEnv === "subdomains-lite" || newSite.theme === "wp-theme-light") {
+      if (!(newSite.openshiftEnv === "subdomains-lite" && newSite.theme === "wp-theme-light")) {
         throwMeteorErrors(
           ["theme", "openshiftEnv"],
           "Site subdomains-lite: Les champs thème et environnement OpenShift ne sont pas cohérents"

diff --git a/app/imports/ui/components/sites/Add.jsx b/app/imports/ui/components/sites/Add.jsx
@@ -186,11 +186,9 @@ class Add extends Component {
     // Display 'Normalize button' if
     // - user edit current site (no when user add a new site)
     // - the current site belongs to WordPress Infra
-    // - the current site is not an unmanaged
     return (
       this.state.action === "edit" &&
-      initialValues.wpInfra &&
-      !initialValues.openshiftEnv.startsWith("unm-")
+      initialValues.wpInfra
     );
   };
 

diff --git a/app/private/openshiftenvs_update.csv b/app/private/openshiftenvs_update.csv
diff --git a/app/private/unmanaged.csv b/app/private/unmanaged.csv