Merge branch 'main' into feature/configuration

Author: karpikpl

.dockerignore

@@ -2,10 +2,12 @@
 **/.env.local
 .env*
 .dockerignore
-.git
-.gitignore
 **/node_modules/
 api/public
+.dockerignore
+.git
+.gitignore
+node_modules/
 dist/
 .history/
 .github/

Dockerfile

@@ -8,6 +8,7 @@ RUN npm run build
 
 # Stage 2: Serve the application with Nginx
 FROM nginx:1.27 as production-stage
+
 COPY --from=build-stage /app/dist /usr/share/nginx/html
 COPY --from=build-stage /app/dist/assets/app-config.js /usr/share/nginx/html-template/app-config.template.js
 COPY ./docker-entrypoint.d/*.sh /docker-entrypoint.d/

public/assets/app-config.js

@@ -10,4 +10,4 @@ window._ENV_ = {
 
 if(window._ENV_.VUE_APP_GITHUB_TOKEN) {
   console.warn('Using hardcoded token. This is not recommended for production.');
-}
+}

src/api/ExtractSeats.ts

@@ -52,7 +52,29 @@ export const getSeatsApi = async (): Promise<Seat[]> => {
           page: page
         }
       });
+      
       seatsData = seatsData.concat(response.data.seats.map((item: any) => new Seat(item)));
+
+      // Calculate the total pages
+      const totalSeats = response.data.total_seats;
+      const totalPages = Math.ceil(totalSeats / perPage);
+
+      // Fetch the remaining pages
+      for (page = 2; page <= totalPages; page++) {
+        response = await axios.get(`${config.github.apiUrl}/copilot/billing/seats`, {
+          headers: {
+            Accept: "application/vnd.github+json",
+            Authorization: `Bearer ${config.github.token}`,
+            "X-GitHub-Api-Version": "2022-11-28",
+          },
+          params: {
+            per_page: perPage,
+            page: page
+          }
+        });
+
+        seatsData = seatsData.concat(response.data.seats.map((item: any) => new Seat(item)));
+      }
     }
     return seatsData;
   }

src/components/MainComponent.vue

@@ -88,12 +88,21 @@ export default defineComponent({
   },
   data () {
     return {
-      tabItems: ['languages', 'editors', 'copilot chat','seat analysis' , 'api response'],
+      tabItems: ['languages', 'editors', 'copilot chat', 'api response'],
       tab: null
     }
   },
   created() {
     this.tabItems.unshift(this.itemName);
+    if (config.scope.type === 'organization') {
+      // get the last item in the array,which is 'api response' 
+      //and add 'seat analysis' before it
+      let lastItem = this.tabItems.pop();
+      this.tabItems.push('seat analysis');
+      if (lastItem) {
+        this.tabItems.push(lastItem);
+      }
+    }
   },
   setup() {
       const metricsReady = ref(false);

src/config.ts

@@ -23,6 +23,7 @@ const githubOrgName = env.VUE_APP_GITHUB_ORG;
 const githubEntName = env.VUE_APP_GITHUB_ENT;
 const baseApi = env.VUE_APP_GITHUB_API;
 
+
 let scopeName: string;
 if (scopeType === 'organization') {
 	scopeName = githubOrgName;
@@ -58,7 +59,6 @@ if (!config.mockedData && !config.github.token && !config.github.baseApi) {
 export default config;
 
 interface Config {
-	/** Flag to use mocked data only */
 	mockedData: boolean;
 	scope: {
 		type: 'organization' | 'enterprise';