Skip to content

add other orgs #265749

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

Merged
bpasero merged 1 commit into from
Sep 9, 2025
+2 −2
Merged

add other orgs #265749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ export class ChatEntitlementContext extends Disposable {
this.enterpriseContextKey.set(state.entitlement === ChatEntitlement.Enterprise);

this.organisationsContextKey.set(state.organisations);
this.isInternalContextKey.set(Boolean(state.organisations?.some(org => org === 'github' || org === 'microsoft' || org === 'ms-copilot')));
this.isInternalContextKey.set(Boolean(state.organisations?.some(org => org === 'github' || org === 'microsoft' || org === 'ms-copilot' || org === 'MicrosoftCopilot')));
this.skuContextKey.set(state.sku);

this.hiddenContext.set(!!state.hidden);
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/services/assignment/common/assignmentFilters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class CopilotAssignmentFilterProvider extends Disposable implements IExpe
private updateCopilotEntitlementInfo() {
const newSku = this._chatEntitlementService.sku;
const newIsGitHubInternal = this._chatEntitlementService.organisations?.includes('github');
const newIsMicrosoftInternal = this._chatEntitlementService.organisations?.includes('microsoft');
const newIsMicrosoftInternal = this._chatEntitlementService.organisations?.includes('microsoft') || this._chatEntitlementService.organisations?.includes('ms-copilot') || this._chatEntitlementService.organisations?.includes('MicrosoftCopilot');
const newInternalOrg = newIsGitHubInternal ? 'github' : newIsMicrosoftInternal ? 'microsoft' : undefined;

if (this.copilotSku === newSku && this.copilotInternalOrg === newInternalOrg) {
Expand Down
Loading