Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace EUGeo with EUDB #2456

Merged
merged 19 commits into from
Dec 5, 2024
Merged

Replace EUGeo with EUDB #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
35f0c42
update labels
Nov 28, 2024
dd762fe
complete Area not support AOAI
Dec 1, 2024
1471377
complete EUDB area
Dec 1, 2024
415393d
add clean tag
Dec 1, 2024
5ba00af
Merge branch 'main' of https://github.com/microsoft/BCApps into priva…
Dec 2, 2024
f1b7d1e
Improve labels and fields' names
Dec 2, 2024
625f125
Update link with locked labels
Dec 2, 2024
562e98e
update the layout
Dec 2, 2024
c2ae101
Update the labels and fix bug
Dec 3, 2024
9e52bd5
Update layout for WithinAOAIRegion
Dec 3, 2024
499f679
implement a new method to check EUDB
Dec 4, 2024
1eeef33
Replace EUGeo with EUDB
Dec 4, 2024
fc174d5
Merge branch 'main' of https://github.com/microsoft/BCApps into priva…
Dec 4, 2024
12b6a97
rename procedure
Dec 4, 2024
f34413a
obsolete the old procedure
Dec 4, 2024
d18316b
obsolete the old procedure
Dec 4, 2024
78cb61c
Merge branch 'main' of https://github.com/microsoft/BCApps into priva…
Dec 4, 2024
77e7557
Merge branch 'main' of https://github.com/microsoft/BCApps into priva…
Dec 5, 2024
8410a9c
remove unsued function
Dec 5, 2024
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
13 changes: 6 additions & 7 deletions src/System Application/App/AI/src/Copilot/CopilotAICapabilities.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ page 7775 "Copilot AI Capabilities"
var
EnvironmentInformation: Codeunit "Environment Information";
WithinGeo: Boolean;
WithinEuropeGeo: Boolean;
WithinEUDB: Boolean;
begin
OnRegisterCopilotCapability();

CopilotCapabilityImpl.CheckGeo(WithinGeo, WithinEuropeGeo);
CopilotCapabilityImpl.CheckGeoAndEUDB(WithinGeo, WithinEUDB);

case PrivacyNotice.GetPrivacyNoticeApprovalState(CopilotCapabilityImpl.GetAzureOpenAICategory(), false) of
Enum::"Privacy Notice Approval State"::Agreed:
Expand All @@ -274,17 +274,16 @@ page 7775 "Copilot AI Capabilities"
if not EnvironmentInformation.IsSaaSInfrastructure() then
CopilotCapabilityImpl.ShowCapabilitiesNotAvailableOnPremNotification();

if (WithinGeo and not WithinEuropeGeo) and (not AllowDataMovement) then
if (WithinGeo and not WithinEUDB) and (not AllowDataMovement) then
CopilotCapabilityImpl.ShowPrivacyNoticeDisagreedNotification();

CopilotCapabilityImpl.UpdateGuidedExperience(AllowDataMovement);

HasEarlyPreview := HasEarlyPreviewCapabilities();

//Todo: replace WithinEuropeGeo with WithinEUBD
WithinEUDBArea := WithinEuropeGeo;
WithinAOAIServicesInRegionArea := WithinGeo and (not WithinEuropeGeo);
WithinAOAIOutOfRegionArea := (not WithinGeo) and (not WithinEuropeGeo);
WithinEUDBArea := WithinEUDB;
WithinAOAIServicesInRegionArea := WithinGeo and (not WithinEUDB);
WithinAOAIOutOfRegionArea := (not WithinGeo) and (not WithinEUDB);
end;

local procedure HasEarlyPreviewCapabilities(): Boolean
Expand Down
4 changes: 2 additions & 2 deletions src/System Application/App/AI/src/Copilot/CopilotCapabilityImpl.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,12 @@ codeunit 7774 "Copilot Capability Impl"
end;

[TryFunction]
procedure CheckGeo(var WithinGeo: Boolean; var WithinEuropeGeo: Boolean)
procedure CheckGeoAndEUDB(var WithinGeo: Boolean; var WithinEUDB: Boolean)
gggdttt marked this conversation as resolved.
Show resolved Hide resolved
var
ALCopilotFunctions: DotNet ALCopilotFunctions;
begin
WithinGeo := ALCopilotFunctions.IsWithinGeo();
WithinEuropeGeo := ALCopilotFunctions.IsEuropeGeo();
WithinEUDB := ALCopilotFunctions.IsWithinEUDB();
end;

procedure UpdateGuidedExperience(AllowDataMovement: Boolean)
Expand Down
Loading