team -> teams

Author: karpikpl

DEPLOYMENT.md

@@ -53,10 +53,10 @@ Application will use a pre-built docker image hosted in GitHub registry: `ghcr.i
 
     [![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fgithub-copilot-resources%2Fcopilot-metrics-viewer%2Fmain%2Fazure-deploy%2Fwith-app-registration%2Fazuredeploy.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2Fgithub-copilot-resources%2Fcopilot-metrics-viewer%2Fmain%2Fazure-deploy%2Fwith-app-registration%2Fportal.json)
 
-    >[!INFO]
-    >**Important**: After deploying Option 2, the redirect URI needs to be updated with the URL of the deployed container app.
-    >
-    >Go to: `https://github.com/organizations/<your-org>/settings/apps/<your-app>` or in the UI to the settings of the registered application and add the following redirect URL: `https://<your-container-app-name-and-region>.azurecontainerapps.io/auth/github`
+>[!IMPORTANT]
+>**Important**: After deploying Option 2, the redirect URI needs to be updated with the URL of the deployed container app.
+>
+>Go to: `https://github.com/organizations/<your-org>/settings/apps/<your-app>` or in the UI to the settings of the registered application and add the following redirect URL: `https://<your-container-app-name-and-region>.azurecontainerapps.io/auth/github`
 
 ### Deployment with private networking
 

README.md

@@ -99,7 +99,7 @@ Public variables:
 can be overriden by route parameters, e.g.
 - `http://localhost:3000/enterprises/octo-demo-ent`
 - `http://localhost:3000/orgs/octo-demo-org`
-- `http://localhost:3000/orgs/octo-demo-org/team/the-a-team`
+- `http://localhost:3000/orgs/octo-demo-org/teams/the-a-team`
 - `http://localhost:3000/orgs/mocked-org?mock=true`
 
 #### NUXT_PUBLIC_SCOPE

app/components/MainComponent.vue

@@ -11,14 +11,14 @@
 
       <!-- Conditionally render the logout button -->
       <AuthState>
-        <template #default="{ loggedIn, user }" >
-        <div v-show="loggedIn" class="user-info">
-          Welcome,
-          <v-avatar class="user-avatar">
-            <v-img :alt="user?.name" :src="user?.avatarUrl" />
-          </v-avatar> {{ user?.name }}
-        </div>
-        <v-btn v-if="showLogoutButton && loggedIn" class="logout-button" @click="logout">Logout</v-btn>
+        <template #default="{ loggedIn, user }">
+          <div v-show="loggedIn" class="user-info">
+            Welcome,
+            <v-avatar class="user-avatar">
+              <v-img :alt="user?.name" :src="user?.avatarUrl" />
+            </v-avatar> {{ user?.name }}
+          </div>
+          <v-btn v-if="showLogoutButton && loggedIn" class="logout-button" @click="logout">Logout</v-btn>
         </template>
       </AuthState>
 
@@ -60,11 +60,11 @@
             <BreakdownComponent v-if="item === 'editors'" :metrics="metrics" :breakdown-key="'editor'" />
             <CopilotChatViewer v-if="item === 'copilot chat'" :metrics="metrics" />
             <SeatsAnalysisViewer v-if="item === 'seat analysis'" :seats="seats" />
-            <ApiResponse v-if="item === 'api response'" :metrics="metrics" :original-metrics="originalMetrics" :seats="seats" />
+            <ApiResponse v-if="item === 'api response'" :metrics="metrics" :original-metrics="originalMetrics"
+              :seats="seats" />
           </v-card>
         </v-window-item>
-        <v-alert
-v-show="metricsReady && metrics.length == 0" density="compact" text="No data available to display"
+        <v-alert v-show="metricsReady && metrics.length == 0" density="compact" text="No data available to display"
           title="No data" type="warning" />
       </v-window>
 
@@ -126,20 +126,20 @@ export default defineNuxtComponent({
     const metricsReady = ref(false);
     const metrics = ref<Metrics[]>([]);
     const originalMetrics = ref<CopilotMetrics[]>([]);
-    const seatsReady = ref(false); 
-    const seats = ref<Seat[]>([]); 
+    const seatsReady = ref(false);
+    const seats = ref<Seat[]>([]);
     // API Error Message
     const apiError = ref<string | undefined>(undefined);
     const signInRequired = computed(() => {
       return config.public.usingGithubAuth && !loggedIn.value;
     });
-    
+
     /**
      * Handles API errors by setting appropriate error messages.
      * @param {H3Error} error - The error object returned from the API call.
      */
     function processError(error: H3Error) {
-      console.error(error);
+      console.error(error || 'No data returned from API');
       // Check the status code of the error response
       if (error.statusCode) {
         switch (error.statusCode) {
@@ -148,14 +148,13 @@ export default defineNuxtComponent({
             break;
           case 404:
             apiError.value = `404 Not Found - is the ${config.public.scope || ''} org:'${config.public.githubOrg || ''} ent:'${config.public.githubEnt || ''}' team:'${config.public.githubTeam}' correct? ${error.message}`;
-	             // Update apiError with the error message
+            // Update apiError with the error message
             apiError.value = error.message;
             break;
           case 500:
             apiError.value = `500 Internal Server Error - most likely a bug in the app. Error: ${error.message}`;
             break;
         }
-        // TODO: handle errors without status code?
       }
     }
 
@@ -172,6 +171,10 @@ export default defineNuxtComponent({
       metricsReady.value = true;
     }
 
+    if (config.public.scope === 'team' && metrics.value.length === 0 && !apiError.value) {
+      apiError.value = 'No data returned from API - check if the team exists and has any activity and at least 5 active members';
+    }
+
     const { data: seatsData, error: seatsError } = await seatsFetch;
     if (seatsError.value) {
       processError(seatsError.value as H3Error);

app/router.options.ts

@@ -15,7 +15,7 @@ export default {
         },
         {
             name: 'team',
-            path: '/orgs/:org/team/:team',
+            path: '/orgs/:org/teams/:team',
             component: () => import('~/pages/index.vue')
         },
         {

e2e-tests/copilot.team.spec.ts

@@ -7,7 +7,7 @@ let dashboard: DashboardPage;
 
 test.beforeAll(async ({ browser }) => {
   const page = await browser.newPage();
-  await page.goto('/orgs/octo-demo-org/team/the-a-team');
+  await page.goto('/orgs/octo-demo-org/teams/the-a-team');
 
   dashboard = new DashboardPage(page);
 

e2e-tests/metrics.spec.ts

@@ -4,7 +4,7 @@ import { DashboardPage } from './pages/DashboardPage';
 const tag = { tag: ['@ent', '@org', '@team'] };
 
 [
-    { name: 'Teams', url: '/orgs/octodemo-org/team/the-a-team' },
+    { name: 'Teams', url: '/orgs/octodemo-org/teams/the-a-team' },
     { name: 'Orgs', url: '/orgs/octodemo-org' },
     { name: 'Enterprises', url: '/enterprises/octo-enterprise' },
 ].forEach(({ name, url }) => {

infra/main.bicep

@@ -48,42 +48,6 @@ var tags = {
 var abbrs = loadJsonContent('./abbreviations.json')
 var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
 
-// "settings": [
-//   {
-//     "name": "NUXT_OAUTH_GITHUB_CLIENT_ID",
-//     "value": "${NUXT_OAUTH_GITHUB_CLIENT_ID}",
-//     "secret": true,
-//     "_comment_name": "GitHub App Client id - The name of the environment variable when running in Azure."
-//   },
-//   {
-//     "name": "NUXT_OAUTH_GITHUB_CLIENT_SECRET",
-//     "value": "${NUXT_OAUTH_GITHUB_CLIENT_SECRET}",
-//     "secret": true,
-//     "_comment_name": "GitHub App Client Secret - The name of the environment variable when running in Azure."
-//   },
-//   {
-//     "name": "NUXT_SESSION_PASSWORD",
-//     "value": "$(secretOrRandomPassword)",
-//     "secret": true,
-//     "_comment_name": "Session Secret - The name of the environment variable when running in Azure."
-//   },
-//   {
-//     "name": "NUXT_PUBLIC_SCOPE",
-//     "value": "${NUXT_PUBLIC_SCOPE}",
-//     "_comment_name": "GitHub App Scope - The name of the environment variable when running in Azure."
-//   },
-//   {
-//     "name": "NUXT_PUBLIC_GITHUB_ORG",
-//     "value": "${NUXT_PUBLIC_GITHUB_ORG}",
-//     "_comment_name": "GitHub Organization - The name of the environment variable when running in Azure."
-//   },
-//   {
-//     "name": "NUXT_PUBLIC_GITHUB_ENT",
-//     "value": "${NUXT_PUBLIC_GITHUB_ENT}",
-//     "_comment_name": "GitHub Enterprise - The name of the environment variable when running in Azure."
-//   }
-// ]
-
 var settings = concat(
   [
     {