From 3f2ff6ea71457caf77c4f2c0f4ae88c56766d480 Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Thu, 21 Aug 2025 10:26:46 -0400
Subject: [PATCH 1/2] Add support for ent adv to Cloud, fix some broken windows
 (#33745)

* Add support for ent adv to Cloud, fix some broken windows

* Fixes
---
 .../billing_subscriptions.scss                |  4 +-
 .../cloud_trial_banner.tsx                    | 16 +----
 .../billing_summary/billing_summary.tsx       |  7 +--
 .../billing/plan_details/feature_list.tsx     | 11 ++++
 .../billing/plan_details/index.tsx            |  4 --
 .../billing/plan_details/plan_details.tsx     |  8 +++
 .../billing/plan_details/plan_pricing.scss    | 18 ------
 .../billing/plan_details/plan_pricing.tsx     | 63 -------------------
 .../menu/menu_items/menu_cloud_trial.tsx      |  2 +-
 webapp/channels/src/i18n/en.json              | 16 +++--
 webapp/channels/src/utils/constants.tsx       |  1 +
 11 files changed, 36 insertions(+), 114 deletions(-)
 delete mode 100644 webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.scss
 delete mode 100644 webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.tsx

diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/billing_subscriptions.scss b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/billing_subscriptions.scss
index 470d70966d1..c22a11dc0b0 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/billing_subscriptions.scss
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/billing_subscriptions.scss
@@ -126,7 +126,9 @@
 }
 
 .PrivateCloudCard__actionButton {
-    display: block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     margin-top: 16px;
 }
 
diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx
index e3bbbcabcac..be90f8d0dd0 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/cloud_trial_banner.tsx
@@ -14,7 +14,6 @@ import {getCurrentUser} from 'mattermost-redux/selectors/entities/common';
 import {get as getPreference} from 'mattermost-redux/selectors/entities/preferences';
 
 import AlertBanner from 'components/alert_banner';
-import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink';
 import UpgradeLink from 'components/widgets/links/upgrade_link';
 
 import {CloudBanners, Preferences} from 'utils/constants';
@@ -30,7 +29,6 @@ const CloudTrialBanner = ({trialEndDate}: Props): JSX.Element | null => {
     const endDate = new Date(trialEndDate);
     const DISMISSED_DAYS = 10;
     const {formatMessage} = useIntl();
-    const [openSalesLink] = useOpenSalesLink();
     const dispatch = useDispatch();
     const user = useSelector(getCurrentUser);
     const storedDismissedEndDate = useSelector((state: GlobalState) => getPreference(state, Preferences.CLOUD_TRIAL_BANNER, CloudBanners.UPGRADE_FROM_TRIAL));
@@ -72,7 +70,7 @@ const CloudTrialBanner = ({trialEndDate}: Props): JSX.Element | null => {
             title={(
                 <FormattedMessage
                     id='admin.subscription.cloudTrialCard.upgradeTitle'
-                    defaultMessage='Upgrade to one of our paid plans to avoid Free plan data limits'
+                    defaultMessage='Upgrade to one of our paid plans to keep your workspace '
                 />
             )}
             message={(
@@ -94,17 +92,7 @@ const CloudTrialBanner = ({trialEndDate}: Props): JSX.Element | null => {
                 />
             )}
             actionButtonRight={(
-                <button
-                    onClick={openSalesLink}
-                    className='AlertBanner__buttonRight'
-                >
-                    <FormattedMessage
-                        id='admin.billing.subscription.privateCloudCard.contactSalesy'
-                        defaultMessage={
-                            'Contact sales'
-                        }
-                    />
-                </button>
+                null
             )}
         />
     );
diff --git a/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx b/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx
index 832b0b0f42c..e931074a931 100644
--- a/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx
+++ b/webapp/channels/src/components/admin_console/billing/billing_summary/billing_summary.tsx
@@ -98,14 +98,14 @@ export const FreeTrial = ({daysLeftOnTrial}: FreeTrialProps) => {
                 {daysLeftOnTrial > TrialPeriodDays.TRIAL_WARNING_THRESHOLD &&
                     <FormattedMessage
                         id='admin.billing.subscription.freeTrial.description'
-                        defaultMessage='Your free trial will expire in {daysLeftOnTrial} days. Add your payment information to continue after the trial ends.'
+                        defaultMessage='Your free trial will expire in {daysLeftOnTrial} days. Contact sales to continue after the trial ends.'
                         values={{daysLeftOnTrial}}
                     />
                 }
                 {(daysLeftOnTrial > TrialPeriodDays.TRIAL_1_DAY && daysLeftOnTrial <= TrialPeriodDays.TRIAL_WARNING_THRESHOLD) &&
                     <FormattedMessage
                         id='admin.billing.subscription.freeTrial.lessThan3Days.description'
-                        defaultMessage='Your free trial will end in {daysLeftOnTrial, number} {daysLeftOnTrial, plural, one {day} other {days}}. Add payment information to continue enjoying the benefits of Cloud Professional.'
+                        defaultMessage='Your free trial will end in {daysLeftOnTrial, number} {daysLeftOnTrial, plural, one {day} other {days}}. Contact sales to continue enjoying the benefits of Cloud Professional.'
                         values={{daysLeftOnTrial}}
                     />
                 }
@@ -119,9 +119,8 @@ export const FreeTrial = ({daysLeftOnTrial}: FreeTrialProps) => {
             <button
                 type='button'
                 onClick={() => openSalesLink()}
-                className='UpgradeMattermostCloud__upgradeButton'
+                className='UpgradeMattermostCloud__upgradeButton btn btn-primary'
             >
-
                 <FormattedMessage
                     id='admin.billing.subscription.privateCloudCard.contactSales'
                     defaultMessage='Contact Sales'
diff --git a/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx b/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx
index 13073a96d90..19ad8becd8a 100644
--- a/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx
+++ b/webapp/channels/src/components/admin_console/billing/plan_details/feature_list.tsx
@@ -149,6 +149,14 @@ const FeatureList = (props: FeatureListProps) => {
         }),
     ];
 
+    const featuresCloudAdvanced = [
+        intl.formatMessage({
+            id: 'admin.billing.subscription.planDetails.features.abac',
+            defaultMessage: 'Attribute-based access control (ABAC)',
+        }),
+        ...featuresCloudEnterprise,
+    ];
+
     let features: string[] = [];
 
     switch (props.subscriptionPlan) {
@@ -162,6 +170,9 @@ const FeatureList = (props: FeatureListProps) => {
     case CloudProducts.ENTERPRISE:
         features = featuresCloudEnterprise;
         break;
+    case CloudProducts.ADVANCED:
+        features = featuresCloudAdvanced;
+        break;
     default:
         // unknown product
         features = [];
diff --git a/webapp/channels/src/components/admin_console/billing/plan_details/index.tsx b/webapp/channels/src/components/admin_console/billing/plan_details/index.tsx
index 2e25978da8f..4b635970749 100644
--- a/webapp/channels/src/components/admin_console/billing/plan_details/index.tsx
+++ b/webapp/channels/src/components/admin_console/billing/plan_details/index.tsx
@@ -17,7 +17,6 @@ import {
     PlanDetailsTopElements,
     currentPlanText,
 } from './plan_details';
-import PlanPricing from './plan_pricing';
 
 import './plan_details.scss';
 
@@ -47,9 +46,6 @@ const PlanDetails = ({isFreeTrial, subscriptionPlan}: Props) => {
                 daysLeftOnTrial={daysLeftOnTrial}
                 isYearly={product.recurring_interval === 'year'}
             />
-            <PlanPricing
-                product={product}
-            />
             <div className='PlanDetails__teamAndChannelCount'>
                 <FormattedMessage
                     id='admin.billing.subscription.planDetails.subheader'
diff --git a/webapp/channels/src/components/admin_console/billing/plan_details/plan_details.tsx b/webapp/channels/src/components/admin_console/billing/plan_details/plan_details.tsx
index 7845889645f..2db9c02c9ac 100644
--- a/webapp/channels/src/components/admin_console/billing/plan_details/plan_details.tsx
+++ b/webapp/channels/src/components/admin_console/billing/plan_details/plan_details.tsx
@@ -64,6 +64,14 @@ export const PlanDetailsTopElements = ({
             />
         );
         break;
+    case CloudProducts.ADVANCED:
+        productName = (
+            <FormattedMessage
+                id='admin.billing.subscription.planDetails.productName.cloudAdvanced'
+                defaultMessage='Cloud Enterprise Advanced'
+            />
+        );
+        break;
     default:
         productName = (
             <FormattedMessage
diff --git a/webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.scss b/webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.scss
deleted file mode 100644
index 1467e37d8db..00000000000
--- a/webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.PlanPricing {
-    display: flex;
-    align-items: flex-end;
-    margin-top: 16px;
-    color: var(--sys-center-channel-color);
-
-    &__paid-tier {
-        color: rgba(var(--sys-center-channel-color-rgb), 0.75);
-        font-size: 12px;
-        font-style: normal;
-        font-weight: normal;
-        line-height: 16px;
-
-        a {
-            margin-left: 5px;
-        }
-    }
-}
diff --git a/webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.tsx b/webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.tsx
deleted file mode 100644
index 51486fd9781..00000000000
--- a/webapp/channels/src/components/admin_console/billing/plan_details/plan_pricing.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-import {FormattedMessage} from 'react-intl';
-
-import type {Product} from '@mattermost/types/cloud';
-
-import {trackEvent} from 'actions/telemetry_actions';
-
-import ExternalLink from 'components/external_link';
-
-import {BillingSchemes, CloudProducts, CloudLinks, RecurringIntervals} from 'utils/constants';
-
-import './plan_pricing.scss';
-
-interface Props {
-    product: Product;
-}
-const PlanPricing = ({
-    product,
-}: Props) => {
-    if (product.sku === CloudProducts.STARTER) {
-        return null;
-    }
-
-    const getPrice = (product: Product) => {
-        if (product.recurring_interval === RecurringIntervals.YEAR) {
-            return (product.price_per_seat / 12).toFixed(2);
-        }
-        return product.price_per_seat.toFixed(2);
-    };
-
-    return (
-        <div className='PlanPricing'>
-            <div className='PlanDetails__paid-tier'>
-                {`$${getPrice(product)}`}
-                {product.billing_scheme === BillingSchemes.FLAT_FEE ? (
-                    <FormattedMessage
-                        id='admin.billing.subscription.planDetails.flatFeePerMonth'
-                        defaultMessage='/month (Unlimited Users). '
-                    />
-                ) : (
-                    <FormattedMessage
-                        id='admin.billing.subscription.planDetails.perUserPerMonth'
-                        defaultMessage='/user/month. '
-                    />) }
-                <ExternalLink
-                    location='plan_pricing'
-                    href={CloudLinks.BILLING_DOCS}
-                    onClick={() => trackEvent('cloud_admin', 'click_how_billing_works', {screen: 'payment'})}
-                >
-                    <FormattedMessage
-                        id='admin.billing.subscription.planDetails.howBillingWorks'
-                        defaultMessage='See how billing works'
-                    />
-                </ExternalLink>
-            </div>
-        </div>
-    );
-};
-
-export default PlanPricing;
diff --git a/webapp/channels/src/components/widgets/menu/menu_items/menu_cloud_trial.tsx b/webapp/channels/src/components/widgets/menu/menu_items/menu_cloud_trial.tsx
index 1d840e88f7b..a1066f6a079 100644
--- a/webapp/channels/src/components/widgets/menu/menu_items/menu_cloud_trial.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_items/menu_cloud_trial.tsx
@@ -71,7 +71,7 @@ const MenuCloudTrial = ({id}: Props): JSX.Element | null => {
             <h5 className='MenuCloudTrial__free-trial__content-title'>
                 <FormattedMessage
                     id='menu.cloudFree.enterpriseTrialTitle'
-                    defaultMessage='Enterprise Trial'
+                    defaultMessage='Enterprise Advanced Trial'
                 />
             </h5>
             <div className='MenuCloudTrial__free-trial__content-section'>
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index cc10a8b4600..36772333c9c 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -445,14 +445,15 @@
   "admin.billing.subscription.creditCardHasExpired": "Your credit card has expired",
   "admin.billing.subscription.creditCardHasExpired.description": "Please <link>update your payment information</link> to avoid any disruption.",
   "admin.billing.subscription.downgrading": "Downgrading your workspace",
-  "admin.billing.subscription.freeTrial.description": "Your free trial will expire in {daysLeftOnTrial} days. Add your payment information to continue after the trial ends.",
-  "admin.billing.subscription.freeTrial.lastDay.description": "Your free trial has ended. Add payment information to continue enjoying the benefits of Cloud Professional.",
+  "admin.billing.subscription.freeTrial.description": "Your free trial will expire in {daysLeftOnTrial} days. Contact Sales to continue after the trial ends.",
+  "admin.billing.subscription.freeTrial.lastDay.description": "Your free trial has ended. Contact Sales to continue enjoying the benefits of Cloud Professional.",
   "admin.billing.subscription.freeTrial.lastDay.title": "Your free trial ends today",
-  "admin.billing.subscription.freeTrial.lessThan3Days.description": "Your free trial will end in {daysLeftOnTrial, number} {daysLeftOnTrial, plural, one {day} other {days}}. Add payment information to continue enjoying the benefits of Cloud Professional.",
+  "admin.billing.subscription.freeTrial.lessThan3Days.description": "Your free trial will end in {daysLeftOnTrial, number} {daysLeftOnTrial, plural, one {day} other {days}}. Contact Sales to continue enjoying the benefits of Cloud Professional.",
   "admin.billing.subscription.freeTrial.title": "You're currently on a free trial",
   "admin.billing.subscription.invoice.next": "Next Invoice",
   "admin.billing.subscription.mostRecentPaymentFailed": "Your most recent payment failed",
   "admin.billing.subscription.planDetails.currentPlan": "Current Plan",
+  "admin.billing.subscription.planDetails.features.abac": "Attribute-based access control (ABAC)",
   "admin.billing.subscription.planDetails.features.advanceTeamPermission": "Advanced team permissions",
   "admin.billing.subscription.planDetails.features.autoComplianceExports": "Automated compliance exports",
   "admin.billing.subscription.planDetails.features.customRetentionPolicies": "Custom data retention policies",
@@ -476,9 +477,7 @@
   "admin.billing.subscription.planDetails.features.ssoSaml": "SSO w/ SAML (includes Okta and OneLogIn)",
   "admin.billing.subscription.planDetails.features.unlimitedUsers": "Unlimited users",
   "admin.billing.subscription.planDetails.features.unlimittedUsersAndMessagingHistory": "Unlimited users & message history",
-  "admin.billing.subscription.planDetails.flatFeePerMonth": "/month (Unlimited Users). ",
-  "admin.billing.subscription.planDetails.howBillingWorks": "See how billing works",
-  "admin.billing.subscription.planDetails.perUserPerMonth": "/user/month. ",
+  "admin.billing.subscription.planDetails.productName.cloudAdvanced": "Cloud Enterprise Advanced",
   "admin.billing.subscription.planDetails.productName.cloudEnterprise": "Cloud Enterprise",
   "admin.billing.subscription.planDetails.productName.cloudFree": "Cloud Free",
   "admin.billing.subscription.planDetails.productName.cloudProfessional": "Cloud Professional",
@@ -492,7 +491,6 @@
   "admin.billing.subscription.privateCloudCard.cloudProfessional.description": "Advanced security and compliance features with premium support. See {pricingLink} for more details.",
   "admin.billing.subscription.privateCloudCard.cloudProfessional.title": "Upgrade to Cloud Enterprise",
   "admin.billing.subscription.privateCloudCard.contactSales": "Contact Sales",
-  "admin.billing.subscription.privateCloudCard.contactSalesy": "Contact sales",
   "admin.billing.subscription.privateCloudCard.contactSupport": "Contact Support",
   "admin.billing.subscription.privateCloudCard.freeTrial.description": "We love to work with our customers and their needs. Contact sales for subscription, billing or trial-specific questions.",
   "admin.billing.subscription.privateCloudCard.freeTrial.title": "Questions about your trial?",
@@ -2769,7 +2767,7 @@
   "admin.sql.traceTitle": "SQL Statement Logging: ",
   "admin.subscription.cloudTrialCard.description": "Your trial ends on {date} {time}. Upgrade to one of our paid plans with no limits.",
   "admin.subscription.cloudTrialCard.upgrade": "Upgrade",
-  "admin.subscription.cloudTrialCard.upgradeTitle": "Upgrade to one of our paid plans to avoid Free plan data limits",
+  "admin.subscription.cloudTrialCard.upgradeTitle": "Upgrade to one of our paid plans to keep your workspace",
   "admin.support.aboutDesc": "The URL for the About link on the Mattermost login and sign-up pages. If this field is empty, the About link is hidden from users.",
   "admin.support.aboutTitle": "About Link:",
   "admin.support.enableAskCommunityDesc": "When true, \"Ask the community\" link appears on the Mattermost user interface and Help Menu, which allows users to join the Mattermost Community to ask questions and help others troubleshoot issues. When false, the link is hidden from users.",
@@ -4734,7 +4732,7 @@
   "marketplace_modal.web_marketplace_link.desc": "Connect the tools you use most to Mattermost",
   "marketplace_modal.web_marketplace_link.title": "Discover community integrations",
   "menu.cloudFree.enterpriseTrialDescription": "Your trial is active until {trialEndDay}. Discover our top Enterprise features. <openModalLink>Learn more</openModalLink>",
-  "menu.cloudFree.enterpriseTrialTitle": "Enterprise Trial",
+  "menu.cloudFree.enterpriseTrialTitle": "Enterprise Advanced Trial",
   "menu.cloudFree.postTrial.tryEnterprise": "Interested in a limitless plan with high-security features? <openModalLink>See plans</openModalLink>",
   "message_submit_error.invalidCommand": "Command with a trigger of ''{command}'' not found. ",
   "message_submit_error.sendAsMessageLink": "Click here to send as a message.",
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index f49f7299ebe..58f185c336c 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -518,6 +518,7 @@ export const CloudProducts = {
     PROFESSIONAL: 'cloud-professional',
     ENTERPRISE: 'cloud-enterprise',
     LEGACY: 'cloud-legacy',
+    ADVANCED: 'cloud-advanced',
 };
 
 export const CloudBillingTypes = {

From bfa136e20eab28860c7bbe645b24abeb9b7dff60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20V=C3=A9lez?= <pablovv2012@gmail.com>
Date: Thu, 21 Aug 2025 19:37:43 +0200
Subject: [PATCH 2/2] Mm 64498 - create base code for channel settings modal
 (#32170)

* MM-6449 - manage channel access rules permissions backend part

* add the system console changes to show the new permission

* MM-64496 - update abac api permissions check

* fix unit tests

* enhance test coverage and fix broken unit tests

* fix linter issues

* add proper translations

* MM-64498 - create base code for channel settings modal

* Add feature flag to the channel admin abac rules

* fix unit tests

* remove unused translations

* add missing translation

* readd missing translations

* fix unit test after master merge

* fix linter issues

* migrate test to RTL

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 server/channels/api4/access_control.go        |  49 +++++++
 server/channels/api4/access_control_test.go   |   4 +
 server/public/model/feature_flags.go          |   6 +
 ...el_settings_access_rules_tab.test.tsx.snap |  29 ++++
 .../channel_settings_access_rules_tab.scss    |  44 ++++++
 ...channel_settings_access_rules_tab.test.tsx | 127 ++++++++++++++++++
 .../channel_settings_access_rules_tab.tsx     |  55 ++++++++
 .../channel_settings_modal.tsx                |  31 +++++
 webapp/channels/src/i18n/en.json              |   5 +
 webapp/channels/src/selectors/general.ts      |   6 +
 webapp/platform/types/src/config.ts           |   9 +-
 11 files changed, 364 insertions(+), 1 deletion(-)
 create mode 100644 webapp/channels/src/components/channel_settings_modal/__snapshots__/channel_settings_access_rules_tab.test.tsx.snap
 create mode 100644 webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.scss
 create mode 100644 webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.test.tsx
 create mode 100644 webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.tsx

diff --git a/server/channels/api4/access_control.go b/server/channels/api4/access_control.go
index d9db767e3f0..96d792d1006 100644
--- a/server/channels/api4/access_control.go
+++ b/server/channels/api4/access_control.go
@@ -56,6 +56,13 @@ func createAccessControlPolicy(c *Context, w http.ResponseWriter, r *http.Reques
 		hasManageSystemPermission := c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem)
 
 		if !hasManageSystemPermission {
+			// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this check when feature is GA
+			if !c.App.Config().FeatureFlags.ChannelAdminManageABACRules {
+				c.SetPermissionError(model.PermissionManageSystem)
+				return
+			}
+			// END FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules
+
 			// For non-system admins, check channel-specific permission
 			if !model.IsValidId(policy.ID) {
 				c.SetInvalidParam("policy.id")
@@ -110,6 +117,13 @@ func getAccessControlPolicy(c *Context, w http.ResponseWriter, r *http.Request)
 	// Check if user has system admin permission OR channel-specific permission
 	hasManageSystemPermission := c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem)
 	if !hasManageSystemPermission {
+		// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this check when feature is GA
+		if !c.App.Config().FeatureFlags.ChannelAdminManageABACRules {
+			c.SetPermissionError(model.PermissionManageSystem)
+			return
+		}
+		// END FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules
+
 		// For non-system admins, validate policy access permission
 		if appErr := c.App.ValidateAccessControlPolicyPermission(c.AppContext, c.AppContext.Session().UserId, policyID); appErr != nil {
 			c.SetPermissionError(model.PermissionManageSystem)
@@ -148,6 +162,13 @@ func deleteAccessControlPolicy(c *Context, w http.ResponseWriter, r *http.Reques
 	// Check if user has system admin permission OR channel-specific permission
 	hasManageSystemPermission := c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem)
 	if !hasManageSystemPermission {
+		// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this check when feature is GA
+		if !c.App.Config().FeatureFlags.ChannelAdminManageABACRules {
+			c.SetPermissionError(model.PermissionManageSystem)
+			return
+		}
+		// END FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules
+
 		// For non-system admins, validate policy access permission
 		if appErr := c.App.ValidateAccessControlPolicyPermission(c.AppContext, c.AppContext.Session().UserId, policyID); appErr != nil {
 			c.SetPermissionError(model.PermissionManageSystem)
@@ -180,6 +201,13 @@ func checkExpression(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this check when feature is GA
+	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem) && !c.App.Config().FeatureFlags.ChannelAdminManageABACRules {
+		c.SetPermissionError(model.PermissionManageSystem)
+		return
+	}
+	// END FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules
+
 	errs, appErr := c.App.CheckExpression(c.AppContext, checkExpressionRequest.Expression)
 	if appErr != nil {
 		c.Err = appErr
@@ -210,6 +238,13 @@ func testExpression(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this check when feature is GA
+	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem) && !c.App.Config().FeatureFlags.ChannelAdminManageABACRules {
+		c.SetPermissionError(model.PermissionManageSystem)
+		return
+	}
+	// END FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules
+
 	users, count, appErr := c.App.TestExpression(c.AppContext, checkExpressionRequest.Expression, model.SubjectSearchOptions{
 		Term:  checkExpressionRequest.Term,
 		Limit: checkExpressionRequest.Limit,
@@ -490,6 +525,13 @@ func getFieldsAutocomplete(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this check when feature is GA
+	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem) && !c.App.Config().FeatureFlags.ChannelAdminManageABACRules {
+		c.SetPermissionError(model.PermissionManageSystem)
+		return
+	}
+	// END FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules
+
 	after := r.URL.Query().Get("after")
 	if after != "" && !model.IsValidId(after) {
 		c.SetInvalidParam("after")
@@ -533,6 +575,13 @@ func convertToVisualAST(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this check when feature is GA
+	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem) && !c.App.Config().FeatureFlags.ChannelAdminManageABACRules {
+		c.SetPermissionError(model.PermissionManageSystem)
+		return
+	}
+	// END FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules
+
 	var cel struct {
 		Expression string `json:"expression"`
 	}
diff --git a/server/channels/api4/access_control_test.go b/server/channels/api4/access_control_test.go
index 1620efc76cd..6f4464fd5a1 100644
--- a/server/channels/api4/access_control_test.go
+++ b/server/channels/api4/access_control_test.go
@@ -16,10 +16,14 @@ import (
 
 func TestCreateAccessControlPolicy(t *testing.T) {
 	os.Setenv("MM_FEATUREFLAGS_ATTRIBUTEBASEDACCESSCONTROL", "true")
+	// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this env var when feature is GA
+	os.Setenv("MM_FEATUREFLAGS_CHANNELADMINMANAGEABACRULES", "true")
 	th := Setup(t).InitBasic()
 	t.Cleanup(func() {
 		th.TearDown()
 		os.Unsetenv("MM_FEATUREFLAGS_ATTRIBUTEBASEDACCESSCONTROL")
+		// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this unsetenv when feature is GA
+		os.Unsetenv("MM_FEATUREFLAGS_CHANNELADMINMANAGEABACRULES")
 	})
 
 	samplePolicy := &model.AccessControlPolicy{
diff --git a/server/public/model/feature_flags.go b/server/public/model/feature_flags.go
index ab12ad710af..f84a54d2566 100644
--- a/server/public/model/feature_flags.go
+++ b/server/public/model/feature_flags.go
@@ -73,6 +73,10 @@ type FeatureFlags struct {
 
 	// Enable AppsForm for Interactive Dialogs instead of legacy dialog implementation
 	InteractiveDialogAppsForm bool
+
+	// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this field when feature is GA
+	// Enable channel admins to manage ABAC rules for their channels
+	ChannelAdminManageABACRules bool
 }
 
 func (f *FeatureFlags) SetDefaults() {
@@ -103,6 +107,8 @@ func (f *FeatureFlags) SetDefaults() {
 	f.AttributeBasedAccessControl = true
 	f.ContentFlagging = false
 	f.InteractiveDialogAppsForm = true
+	// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this default when feature is GA
+	f.ChannelAdminManageABACRules = false // Default to false for safety
 }
 
 // ToMap returns the feature flags as a map[string]string
diff --git a/webapp/channels/src/components/channel_settings_modal/__snapshots__/channel_settings_access_rules_tab.test.tsx.snap b/webapp/channels/src/components/channel_settings_modal/__snapshots__/channel_settings_access_rules_tab.test.tsx.snap
new file mode 100644
index 00000000000..1aba87eb37d
--- /dev/null
+++ b/webapp/channels/src/components/channel_settings_modal/__snapshots__/channel_settings_access_rules_tab.test.tsx.snap
@@ -0,0 +1,29 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`components/channel_settings_modal/ChannelSettingsAccessRulesTab should match snapshot 1`] = `
+<div>
+  <div
+    class="ChannelSettingsModal__accessRulesTab"
+  >
+    <div
+      class="ChannelSettingsModal__accessRulesHeader"
+    >
+      <h3
+        class="ChannelSettingsModal__accessRulesTitle"
+      >
+        Access Rules
+      </h3>
+      <p
+        class="ChannelSettingsModal__accessRulesSubtitle"
+      >
+        Select user attributes and values as rules to restrict channel membership
+      </p>
+    </div>
+    <p
+      class="ChannelSettingsModal__accessRulesDescription"
+    >
+      Select attributes and values that users must match in addition to access this channel. All selected attributes are required.
+    </p>
+  </div>
+</div>
+`;
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.scss b/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.scss
new file mode 100644
index 00000000000..38dd0c85081
--- /dev/null
+++ b/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.scss
@@ -0,0 +1,44 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+.ChannelSettingsModal {
+    &__accessRulesTab {
+        display: flex;
+        flex-direction: column;
+        padding-bottom: 60px;
+    }
+
+    &__accessRulesHeader {
+        display: flex;
+        flex-direction: column;
+        margin-bottom: 24px;
+        gap: 8px;
+    }
+
+    &__accessRulesTitle {
+        margin: 0;
+        color: var(--center-channel-color);
+        font-family: Metropolis, sans-serif;
+        font-size: 20px;
+        font-weight: 600;
+        line-height: 28px;
+    }
+
+    &__accessRulesSubtitle {
+        margin: 0;
+        color: rgba(var(--center-channel-color-rgb), 0.72);
+        font-family: 'Open Sans', sans-serif;
+        font-size: 14px;
+        font-weight: 400;
+        line-height: 20px;
+    }
+
+    &__accessRulesDescription {
+        margin: 24px 0 0 0;
+        color: rgba(var(--center-channel-color-rgb), 0.72);
+        font-family: 'Open Sans', sans-serif;
+        font-size: 14px;
+        font-weight: 400;
+        line-height: 20px;
+    }
+}
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.test.tsx b/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.test.tsx
new file mode 100644
index 00000000000..43b63d3dd90
--- /dev/null
+++ b/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.test.tsx
@@ -0,0 +1,127 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+import {TestHelper} from 'utils/test_helper';
+
+import ChannelSettingsAccessRulesTab from './channel_settings_access_rules_tab';
+
+describe('components/channel_settings_modal/ChannelSettingsAccessRulesTab', () => {
+    const baseProps = {
+        channel: TestHelper.getChannelMock({
+            id: 'channel_id',
+            name: 'test-channel',
+            display_name: 'Test Channel',
+            type: 'P',
+        }),
+        setAreThereUnsavedChanges: jest.fn(),
+        showTabSwitchError: false,
+    };
+
+    const initialState = {
+        entities: {
+            general: {
+                config: {},
+            },
+            users: {
+                currentUserId: 'current_user_id',
+            },
+        },
+        plugins: {
+            components: {},
+        },
+    };
+
+    test('should match snapshot', () => {
+        const {container} = renderWithContext(
+            <ChannelSettingsAccessRulesTab {...baseProps}/>,
+            initialState,
+        );
+
+        expect(container).toMatchSnapshot();
+    });
+
+    test('should render access rules title and subtitle', () => {
+        renderWithContext(
+            <ChannelSettingsAccessRulesTab {...baseProps}/>,
+            initialState,
+        );
+
+        expect(screen.getByRole('heading', {name: 'Access Rules'})).toBeInTheDocument();
+        expect(screen.getByText('Select user attributes and values as rules to restrict channel membership')).toBeInTheDocument();
+    });
+
+    test('should render access rules description', () => {
+        renderWithContext(
+            <ChannelSettingsAccessRulesTab {...baseProps}/>,
+            initialState,
+        );
+
+        expect(screen.getByText('Select attributes and values that users must match in addition to access this channel. All selected attributes are required.')).toBeInTheDocument();
+    });
+
+    test('should render with main container class', () => {
+        renderWithContext(
+            <ChannelSettingsAccessRulesTab {...baseProps}/>,
+            initialState,
+        );
+
+        expect(screen.getByText('Access Rules').closest('.ChannelSettingsModal__accessRulesTab')).toBeInTheDocument();
+    });
+
+    test('should handle missing optional props gracefully', () => {
+        const minimalProps = {
+            channel: baseProps.channel,
+        };
+
+        expect(() => {
+            renderWithContext(
+                <ChannelSettingsAccessRulesTab {...minimalProps}/>,
+                initialState,
+            );
+        }).not.toThrow();
+
+        expect(screen.getByRole('heading', {name: 'Access Rules'})).toBeInTheDocument();
+    });
+
+    test('should render header section with correct structure', () => {
+        renderWithContext(
+            <ChannelSettingsAccessRulesTab {...baseProps}/>,
+            initialState,
+        );
+
+        const header = screen.getByText('Access Rules').closest('.ChannelSettingsModal__accessRulesHeader');
+        expect(header).toBeInTheDocument();
+
+        // Check that both title and subtitle are within the header
+        const title = screen.getByRole('heading', {name: 'Access Rules'});
+        const subtitle = screen.getByText('Select user attributes and values as rules to restrict channel membership');
+
+        expect(header).toContainElement(title);
+        expect(header).toContainElement(subtitle);
+    });
+
+    test('should render with different channel types', () => {
+        const publicChannel = TestHelper.getChannelMock({
+            id: 'public_channel_id',
+            name: 'public-channel',
+            display_name: 'Public Channel',
+            type: 'O',
+        });
+
+        const propsWithPublicChannel = {
+            ...baseProps,
+            channel: publicChannel,
+        };
+
+        renderWithContext(
+            <ChannelSettingsAccessRulesTab {...propsWithPublicChannel}/>,
+            initialState,
+        );
+
+        expect(screen.getByRole('heading', {name: 'Access Rules'})).toBeInTheDocument();
+        expect(screen.getByText('Select user attributes and values as rules to restrict channel membership')).toBeInTheDocument();
+    });
+});
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.tsx b/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.tsx
new file mode 100644
index 00000000000..3b921110682
--- /dev/null
+++ b/webapp/channels/src/components/channel_settings_modal/channel_settings_access_rules_tab.tsx
@@ -0,0 +1,55 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {useIntl} from 'react-intl';
+
+import type {Channel} from '@mattermost/types/channels';
+
+import './channel_settings_access_rules_tab.scss';
+
+type ChannelSettingsAccessRulesTabProps = {
+    channel: Channel;
+    setAreThereUnsavedChanges?: (unsaved: boolean) => void;
+    showTabSwitchError?: boolean;
+};
+
+function ChannelSettingsAccessRulesTab({
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    channel,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setAreThereUnsavedChanges,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    showTabSwitchError,
+}: ChannelSettingsAccessRulesTabProps) {
+    const {formatMessage} = useIntl();
+
+    return (
+        <div className='ChannelSettingsModal__accessRulesTab'>
+            <div className='ChannelSettingsModal__accessRulesHeader'>
+                <h3 className='ChannelSettingsModal__accessRulesTitle'>
+                    {formatMessage({id: 'channel_settings.access_rules.title', defaultMessage: 'Access Rules'})}
+                </h3>
+                <p className='ChannelSettingsModal__accessRulesSubtitle'>
+                    {formatMessage({
+                        id: 'channel_settings.access_rules.subtitle',
+                        defaultMessage: 'Select user attributes and values as rules to restrict channel membership',
+                    })}
+                </p>
+            </div>
+
+            {/* TODO: Add rules table here */}
+
+            <p className='ChannelSettingsModal__accessRulesDescription'>
+                {formatMessage({
+                    id: 'channel_settings.access_rules.description',
+                    defaultMessage: 'Select attributes and values that users must match in addition to access this channel. All selected attributes are required.',
+                })}
+            </p>
+
+            {/* TODO: Add autoadd members based on access rules section */}
+        </div>
+    );
+}
+
+export default ChannelSettingsAccessRulesTab;
diff --git a/webapp/channels/src/components/channel_settings_modal/channel_settings_modal.tsx b/webapp/channels/src/components/channel_settings_modal/channel_settings_modal.tsx
index e244100d2d8..3893dc66084 100644
--- a/webapp/channels/src/components/channel_settings_modal/channel_settings_modal.tsx
+++ b/webapp/channels/src/components/channel_settings_modal/channel_settings_modal.tsx
@@ -20,12 +20,14 @@ import {
     setShowPreviewOnChannelSettingsHeaderModal,
     setShowPreviewOnChannelSettingsPurposeModal,
 } from 'actions/views/textbox';
+import {isChannelAdminManageABACRulesEnabled} from 'selectors/general';
 
 import {focusElement} from 'utils/a11y_utils';
 import Constants from 'utils/constants';
 
 import type {GlobalState} from 'types/store';
 
+import ChannelSettingsAccessRulesTab from './channel_settings_access_rules_tab';
 import ChannelSettingsArchiveTab from './channel_settings_archive_tab';
 import ChannelSettingsConfigurationTab from './channel_settings_configuration_tab';
 import ChannelSettingsInfoTab from './channel_settings_info_tab';
@@ -44,6 +46,7 @@ type ChannelSettingsModalProps = {
 
 enum ChannelSettingsTabs {
     INFO = 'info',
+    ACCESS_RULES = 'access_rules',
     CONFIGURATION = 'configuration',
     ARCHIVE = 'archive',
 }
@@ -74,6 +77,15 @@ function ChannelSettingsModal({channelId, isOpen, onExited, focusOriginElement}:
         haveIChannelPermission(state, channel.team_id, channel.id, Permissions.DELETE_PUBLIC_CHANNEL),
     );
 
+    const canManageChannelAccessRules = useSelector((state: GlobalState) =>
+        haveIChannelPermission(state, channel.team_id, channel.id, Permissions.MANAGE_CHANNEL_ACCESS_RULES),
+    );
+
+    // FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove the feature flag check when feature is GA
+    const channelAdminABACRulesEnabled = useSelector(isChannelAdminManageABACRulesEnabled);
+
+    const shouldShowAccessRulesTab = channelAdminABACRulesEnabled && canManageChannelAccessRules && channel.type === Constants.PRIVATE_CHANNEL;
+
     const [show, setShow] = useState(isOpen);
 
     // Active tab
@@ -137,6 +149,8 @@ function ChannelSettingsModal({channelId, isOpen, onExited, focusOriginElement}:
         switch (activeTab) {
         case ChannelSettingsTabs.INFO:
             return renderInfoTab();
+        case ChannelSettingsTabs.ACCESS_RULES:
+            return renderAccessRulesTab();
         case ChannelSettingsTabs.CONFIGURATION:
             return renderConfigurationTab();
         case ChannelSettingsTabs.ARCHIVE:
@@ -166,6 +180,16 @@ function ChannelSettingsModal({channelId, isOpen, onExited, focusOriginElement}:
         );
     };
 
+    const renderAccessRulesTab = () => {
+        return (
+            <ChannelSettingsAccessRulesTab
+                channel={channel}
+                setAreThereUnsavedChanges={setAreThereUnsavedChanges}
+                showTabSwitchError={showTabSwitchError}
+            />
+        );
+    };
+
     const renderArchiveTab = () => {
         return (
             <ChannelSettingsArchiveTab
@@ -183,6 +207,13 @@ function ChannelSettingsModal({channelId, isOpen, onExited, focusOriginElement}:
             icon: 'icon icon-information-outline',
             iconTitle: formatMessage({id: 'generic_icons.info', defaultMessage: 'Info Icon'}),
         },
+        {
+            name: ChannelSettingsTabs.ACCESS_RULES,
+            uiName: formatMessage({id: 'channel_settings.tab.access_rules', defaultMessage: 'Access Rules'}),
+            icon: 'icon icon-account-multiple-outline',
+            iconTitle: formatMessage({id: 'generic_icons.access_rules', defaultMessage: 'Access Rules Icon'}),
+            display: shouldShowAccessRulesTab,
+        },
         {
             name: ChannelSettingsTabs.CONFIGURATION,
             uiName: formatMessage({id: 'channel_settings.tab.configuration', defaultMessage: 'Configuration'}),
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 36772333c9c..13c3f63a6f0 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -3661,6 +3661,9 @@
   "channel_settings_modal.header.placeholder": "Enter a header for this channel",
   "channel_settings_modal.name.placeholder": "Enter a name for your channel",
   "channel_settings_modal.purpose.placeholder": "Enter a purpose for this channel (optional)",
+  "channel_settings.access_rules.description": "Select attributes and values that users must match in addition to access this channel. All selected attributes are required.",
+  "channel_settings.access_rules.subtitle": "Select user attributes and values as rules to restrict channel membership",
+  "channel_settings.access_rules.title": "Access Rules",
   "channel_settings.archive.button": "Archive this channel",
   "channel_settings.archive.warning": "Archiving a channel removes it from the user interface, but doesn't permanently delete the channel. New messages can't be posted to archived channels.",
   "channel_settings.channel_info_tab.name": "Channel Info",
@@ -3678,6 +3681,7 @@
   "channel_settings.save_changes_panel.banner_text.required_error": "Channel banner text cannot be empty when enabled",
   "channel_settings.save_changes_panel.reset": "Reset",
   "channel_settings.save_changes_panel.standard_error": "There are errors in the form above",
+  "channel_settings.tab.access_rules": "Access Rules",
   "channel_settings.tab.archive": "Archive Channel",
   "channel_settings.tab.configuration": "Configuration",
   "channel_settings.tab.info": "Info",
@@ -4293,6 +4297,7 @@
   "general_tab.teamNameRestrictions": "Team Name must be {min} or more characters up to a maximum of {max}. You can add a longer team description.",
   "generic_btn.cancel": "Cancel",
   "generic_btn.save": "Save",
+  "generic_icons.access_rules": "Access Rules Icon",
   "generic_icons.add": "Add Icon",
   "generic_icons.add-mail": "Add Mail Icon",
   "generic_icons.add-reaction": "Add Reaction Icon",
diff --git a/webapp/channels/src/selectors/general.ts b/webapp/channels/src/selectors/general.ts
index e38fea69c86..ec8d6b3d700 100644
--- a/webapp/channels/src/selectors/general.ts
+++ b/webapp/channels/src/selectors/general.ts
@@ -30,3 +30,9 @@ export function isDevModeEnabled(state: GlobalState) {
     const EnableDeveloper = config && config.EnableDeveloper ? config.EnableDeveloper === 'true' : false;
     return EnableDeveloper;
 }
+
+// FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this function when feature is GA
+export function isChannelAdminManageABACRulesEnabled(state: GlobalState): boolean {
+    const config = getConfig(state);
+    return config?.FeatureFlagChannelAdminManageABACRules === 'true';
+}
diff --git a/webapp/platform/types/src/config.ts b/webapp/platform/types/src/config.ts
index 3a27b4f3905..d89770caf5b 100644
--- a/webapp/platform/types/src/config.ts
+++ b/webapp/platform/types/src/config.ts
@@ -129,6 +129,9 @@ export type ClientConfig = {
     FeatureFlagWebSocketEventScope: string;
     FeatureFlagInteractiveDialogAppsForm: string;
     FeatureFlagContentFlagging: string;
+
+    // FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this property when feature is GA
+    FeatureFlagChannelAdminManageABACRules?: string;
     ForgotPasswordLink: string;
     GiphySdkKey: string;
     GoogleDeveloperKey: string;
@@ -953,7 +956,11 @@ export type CloudSettings = {
     PreviewModalBucketURL: string;
 };
 
-export type FeatureFlags = Record<string, string | boolean>;
+export type FeatureFlags = Record<string, string | boolean> & {
+
+    // FEATURE_FLAG_REMOVAL: ChannelAdminManageABACRules - Remove this property when feature is GA
+    ChannelAdminManageABACRules?: string;
+};
 
 export type ImportSettings = {
     Directory: string;