From 9b9b7bf8aefc8be532e4b81a5252965142f9ddbb Mon Sep 17 00:00:00 2001 From: Jess Hosman <1183847+jhosman@users.noreply.github.com> Date: Thu, 29 Aug 2024 09:38:34 -0600 Subject: [PATCH 1/8] Create Copilot reviewing activity map topic (#52141) --- .../index.md | 1 + .../index.md | 3 --- .../index.md | 13 +++++++++++++ .../reviewing-audit-logs-for-copilot-business.md | 1 + ...nges-to-content-exclusions-for-github-copilot.md | 1 + ...ctivity-data-for-copilot-in-your-organization.md | 1 + 6 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/index.md rename content/copilot/managing-copilot/managing-github-copilot-in-your-organization/{managing-access-to-github-copilot-in-your-organization => reviewing-activity-related-to-github-copilot-in-your-organization}/reviewing-audit-logs-for-copilot-business.md (95%) rename content/copilot/managing-copilot/managing-github-copilot-in-your-organization/{managing-access-to-github-copilot-in-your-organization => reviewing-activity-related-to-github-copilot-in-your-organization}/reviewing-changes-to-content-exclusions-for-github-copilot.md (92%) rename content/copilot/managing-copilot/managing-github-copilot-in-your-organization/{managing-access-to-github-copilot-in-your-organization => reviewing-activity-related-to-github-copilot-in-your-organization}/reviewing-user-activity-data-for-copilot-in-your-organization.md (96%) diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/index.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/index.md index 9cadec614d48..8a5da15b3b71 100644 --- a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/index.md +++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/index.md @@ -15,4 +15,5 @@ children: - /configuring-your-proxy-server-or-firewall-for-copilot - /managing-access-to-github-copilot-in-your-organization - /customizing-copilot-for-your-organization + - /reviewing-activity-related-to-github-copilot-in-your-organization --- diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/index.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/index.md index e7412e60dd01..388564a4e7f6 100644 --- a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/index.md +++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/index.md @@ -11,9 +11,6 @@ children: - /managing-requests-for-copilot-business-in-your-organization - /revoking-access-to-copilot-for-members-of-your-organization - /managing-github-copilot-access-to-your-organizations-network - - /reviewing-user-activity-data-for-copilot-in-your-organization - - /reviewing-changes-to-content-exclusions-for-github-copilot - - /reviewing-audit-logs-for-copilot-business redirect_from: - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-github-copilot-activity-in-your-organization --- diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/index.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/index.md new file mode 100644 index 000000000000..80d45c51de75 --- /dev/null +++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/index.md @@ -0,0 +1,13 @@ +--- +title: Reviewing activity related to GitHub Copilot in your organization +shortTitle: Review activity +intro: 'Organization owners can review {% data variables.product.prodname_copilot_short %} usage in their organization.' +versions: + feature: copilot +topics: + - Copilot +children: + - /reviewing-user-activity-data-for-copilot-in-your-organization + - /reviewing-audit-logs-for-copilot-business + - /reviewing-changes-to-content-exclusions-for-github-copilot +--- diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business.md similarity index 95% rename from content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business.md rename to content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business.md index 394c304d354a..df9f380dcaa4 100644 --- a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business.md +++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business.md @@ -9,6 +9,7 @@ redirect_from: - /copilot/managing-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-github-copilot-activity-in-your-organization/reviewing-audit-logs-for-copilot-business + - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business versions: feature: copilot product: '{% data reusables.gated-features.copilot-audit-logs %}' diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot.md similarity index 92% rename from content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot.md rename to content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot.md index 938e247aad59..9d4e45228c23 100644 --- a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot.md +++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot.md @@ -11,6 +11,7 @@ topics: redirect_from: - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot - /copilot/managing-copilot/managing-github-copilot-in-your-organization/setting-policies-for-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot + - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-changes-to-content-exclusions-for-github-copilot --- {% data reusables.copilot.content-exclusions-availability-and-beta-note %} diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md similarity index 96% rename from content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md rename to content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md index ea287ebb16ee..5727d0b84ad2 100644 --- a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md +++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md @@ -14,6 +14,7 @@ redirect_from: - /billing/managing-billing-for-github-copilot/viewing-your-github-copilot-usage - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-github-copilot-activity-in-your-organization/reviewing-usage-data-for-github-copilot-in-your-organization - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-usage-data-for-github-copilot-in-your-organization + - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization --- ## Reviewing user activity data for {% data variables.product.prodname_copilot_short %} From 017757b8c4754c3d5f1d7ca694df1a9dae1ce9f7 Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Thu, 29 Aug 2024 09:31:28 -0700 Subject: [PATCH 2/8] Update annotation toggle to match the primer react controls (#52145) --- src/content-render/stylesheets/annotate.scss | 23 +++++++++++++++++ .../tests/__snapshots__/annotate.js.snap | 25 +------------------ src/content-render/unified/annotate.js | 6 ++--- .../components/lib/toggle-annotations.ts | 6 ++--- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/content-render/stylesheets/annotate.scss b/src/content-render/stylesheets/annotate.scss index dffe1cfb9070..624cd84ef4f6 100644 --- a/src/content-render/stylesheets/annotate.scss +++ b/src/content-render/stylesheets/annotate.scss @@ -69,6 +69,29 @@ border-bottom: 1px solid var(--color-border-default); } +.annotate-toggle { + background: var(--color-segmented-control-bg); + border-radius: 6px; + margin-right: 1rem; + font-weight: 500; +} + +.annotate-option { + background: none; + border: 1px solid transparent; + border-radius: 6px; + padding: 0.25rem 0.75rem; + + &:hover { + background: var(--color-segmented-control-button-hover-bg); + } + + &.selected { + background: var(--color-segmented-control-button-bg); + border-color: var(--color-segmented-control-button-selected-border); + } +} + .annotate-row { display: flex; flex-direction: column; diff --git a/src/content-render/tests/__snapshots__/annotate.js.snap b/src/content-render/tests/__snapshots__/annotate.js.snap index 6cae4edfc748..d70eab5517f0 100644 --- a/src/content-render/tests/__snapshots__/annotate.js.snap +++ b/src/content-render/tests/__snapshots__/annotate.js.snap @@ -1,30 +1,7 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`annotate > renders annotations 1`] = ` -"
YAML
name: Post welcome comment

The name of the workflow as it will appear in the "Actions" tab of the GitHub repository.

on:
-  pull_request:
-    types: [opened]

Add the pull_request event, so that the workflow runs automatically -every time a pull request is created.

# The name of the workflow as it will appear in the "Actions" tab of the GitHub repository.
-name: Post welcome comment
-
-# Add the \`pull_request\` event, so that the workflow runs automatically
-# every time a pull request is created.
-on:
-  pull_request:
-    types: [opened]
-
" -`; - -exports[`annotate renders annotations 1`] = ` -"
YAML