Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions src/System Application/App/Email/src/EmailInstaller.Codeunit.al
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace System.Email;

using System.DataAdministration;
using System.Upgrade;
using System.Environment.Configuration;
using System.Reflection;

#pragma warning disable AA0235
Expand Down Expand Up @@ -38,9 +37,10 @@ codeunit 1596 "Email Installer"
Field: Record Field;
RetenPolAllowedTables: Codeunit "Reten. Pol. Allowed Tables";
UpgradeTag: Codeunit "Upgrade Tag";
EmailUpgrade: Codeunit "Email Upgrade";
IsInitialSetup: Boolean;
begin
IsInitialSetup := not UpgradeTag.HasUpgradeTag(GetEmailTablesAddedToAllowedListUpgradeTag());
IsInitialSetup := not UpgradeTag.HasUpgradeTag(EmailUpgrade.GetEmailTablesAddedToAllowedListUpgradeTag());
if not (IsInitialSetup or ForceUpdate) then
exit;

Expand All @@ -49,23 +49,12 @@ codeunit 1596 "Email Installer"
RetenPolAllowedTables.AddAllowedTable(Database::"Email Inbox", Field.FieldNo(SystemCreatedAt), 2);

if IsInitialSetup then
UpgradeTag.SetUpgradeTag(GetEmailTablesAddedToAllowedListUpgradeTag());
end;

local procedure GetEmailTablesAddedToAllowedListUpgradeTag(): Code[250]
begin
exit('MS-373161-EmailLogEntryAdded-20201005');
UpgradeTag.SetUpgradeTag(EmailUpgrade.GetEmailTablesAddedToAllowedListUpgradeTag());
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"Reten. Pol. Allowed Tables", OnRefreshAllowedTables, '', false, false)]
local procedure AddAllowedTablesOnRefreshAllowedTables()
begin
AddRetentionPolicyAllowedTables(true);
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"System Initialization", OnAfterLogin, '', false, false)]
local procedure AddAllowedTablesOnAfterSystemInitialization()
begin
AddRetentionPolicyAllowedTables();
end;
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ codeunit 1597 "Email Upgrade"
exit('MS-592720-DefaultEmailMaxConcurrencyLimitChanged-20250723');
end;

procedure GetEmailTablesAddedToAllowedListUpgradeTag(): Code[250]
begin
exit('MS-373161-EmailLogEntryAdded-20201005');
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"Upgrade Tag", OnGetPerCompanyUpgradeTags, '', false, false)]
local procedure RegisterPerCompanyTags(var PerCompanyUpgradeTags: List of [Code[250]])
var
Expand All @@ -75,5 +80,7 @@ codeunit 1597 "Email Upgrade"
PerCompanyUpgradeTags.Add(GetDefaultEmailViewPolicyUpgradeTag());
if not UpgradeTag.HasUpgradeTag(GetDefaultEmailMaxConcurrencyLimitUpgradeTag()) then
PerCompanyUpgradeTags.Add(GetDefaultEmailMaxConcurrencyLimitUpgradeTag());
if not UpgradeTag.HasUpgradeTag(GetEmailTablesAddedToAllowedListUpgradeTag()) then
PerCompanyUpgradeTags.Add(GetEmailTablesAddedToAllowedListUpgradeTag());
end;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace System.Tooling;

using System.Environment.Configuration;
using System.DataAdministration;
using System.PerformanceProfile;
using System.Upgrade;
Expand Down Expand Up @@ -57,9 +56,12 @@ codeunit 1933 "Performance Profiler Installer"
AddRetentionPolicyAllowedTables(true);
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"System Initialization", OnAfterLogin, '', false, false)]
local procedure AddAllowedTablesOnAfterSystemInitialization()
[EventSubscriber(ObjectType::Codeunit, Codeunit::"Upgrade Tag", OnGetPerCompanyUpgradeTags, '', false, false)]
local procedure RegisterPerCompanyTags(var PerCompanyUpgradeTags: List of [Code[250]])
var
UpgradeTag: Codeunit "Upgrade Tag";
begin
AddRetentionPolicyAllowedTables(false);
if not UpgradeTag.HasUpgradeTag(GetPerformanceProfileAddedToAllowedListUpgradeTag()) then
PerCompanyUpgradeTags.Add(GetPerformanceProfileAddedToAllowedListUpgradeTag());
end;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace System.DataAdministration;

using System.Environment.Configuration;
using System.Upgrade;
using System.Environment;

Expand Down Expand Up @@ -109,9 +108,12 @@ codeunit 3907 "Retention Policy Installer"
AddAllowedTables(true);
end;

[EventSubscriber(ObjectType::Codeunit, Codeunit::"System Initialization", OnAfterLogin, '', false, false)]
local procedure AddAllowedTablesOnAfterLogin()
[EventSubscriber(ObjectType::Codeunit, Codeunit::"Upgrade Tag", OnGetPerCompanyUpgradeTags, '', false, false)]
local procedure RegisterPerCompanyTags(var PerCompanyUpgradeTags: List of [Code[250]])
var
UpgradeTag: Codeunit "Upgrade Tag";
begin
AddAllowedTables();
if not UpgradeTag.HasUpgradeTag(GetRetenPolLogEntryAddedUpgradeTag()) then
PerCompanyUpgradeTags.Add(GetRetenPolLogEntryAddedUpgradeTag());
end;
}
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ page 3903 "Retention Policy Setup List"
trigger OnOpenPage()
var
FeatureTelemetry: Codeunit "Feature Telemetry";
RetenPolAllowedTables: Codeunit "Reten. Pol. Allowed Tables";
begin
FeatureTelemetry.LogUptake('0000FW0', 'Retention policies', Enum::"Feature Uptake Status"::Discovered);
RetenPolAllowedTables.OnRefreshAllowedTables();
end;
}
Loading