Skip to content

Commit 6651aff

Browse files
BrunoQuaresmaBrunoQuaresma
authored
feat(site): add user activity on template insights (#10013)
Close #9497 https://github.com/coder/coder/assets/3165839/941e268c-6c06-47ae-b57d-665e01e804b0
1 parent b468415 commit 6651aff

File tree

4 files changed

+299
-9
lines changed

4 files changed

+299
-9
lines changed

‎site/src/api/api.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,14 @@ export const getInsightsUserLatency = async (
14881488
return response.data;
14891489
};
14901490

1491+
export const getInsightsUserActivity = async (
1492+
filters: InsightsParams,
1493+
): Promise<TypesGen.UserActivityInsightsResponse> => {
1494+
const params = new URLSearchParams(filters);
1495+
const response = await axios.get(`/api/v2/insights/user-activity?${params}`);
1496+
return response.data;
1497+
};
1498+
14911499
export type InsightsTemplateParams = InsightsParams & {
14921500
interval: "day" | "week";
14931501
};

‎site/src/api/queries/insights.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,10 @@ export const insightsUserLatency = (params: API.InsightsParams) => {
1313
queryFn: () => API.getInsightsUserLatency(params),
1414
};
1515
};
16+
17+
export const insightsUserActivity = (params: API.InsightsParams) => {
18+
return {
19+
queryKey: ["insights", "userActivity", params.template_ids, params],
20+
queryFn: () => API.getInsightsUserActivity(params),
21+
};
22+
};

‎site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.stories.tsx

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ export const Empty: Story = {
3737
users: [],
3838
},
3939
},
40+
userActivity: {
41+
report: {
42+
end_time: "",
43+
start_time: "",
44+
template_ids: [],
45+
users: [],
46+
},
47+
},
4048
},
4149
};
4250

@@ -662,5 +670,194 @@ export const Loaded: Story = {
662670
],
663671
},
664672
},
673+
userActivity: {
674+
report: {
675+
start_time: "2023-09-03T00:00:00-03:00",
676+
end_time: "2023-10-01T00:00:00-03:00",
677+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
678+
users: [
679+
{
680+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
681+
user_id: "0bac0dfd-b086-4b6d-b8ba-789e0eca7451",
682+
username: "kylecarbs",
683+
avatar_url: "https://avatars.githubusercontent.com/u/7122116?v=4",
684+
seconds: 671040,
685+
},
686+
{
687+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
688+
user_id: "12b03f43-1bb7-4fca-967a-585c97f31682",
689+
username: "coadler",
690+
avatar_url: "https://avatars.githubusercontent.com/u/6332295?v=4",
691+
seconds: 1487460,
692+
},
693+
{
694+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
695+
user_id: "15890ddb-142c-443d-8fd5-cd8307256ab1",
696+
username: "jsjoeio",
697+
avatar_url: "https://avatars.githubusercontent.com/u/3806031?v=4",
698+
seconds: 6600,
699+
},
700+
{
701+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
702+
user_id: "1c3e3fff-6a0e-4179-9ba3-27f5443e6fce",
703+
username: "Kira-Pilot",
704+
avatar_url: "https://avatars.githubusercontent.com/u/19142439?v=4",
705+
seconds: 195240,
706+
},
707+
{
708+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
709+
user_id: "2e1e7f76-ae77-424a-a209-f35a99731ec9",
710+
username: "phorcys420",
711+
avatar_url: "https://avatars.githubusercontent.com/u/57866459?v=4",
712+
seconds: 16320,
713+
},
714+
{
715+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
716+
user_id: "3f8c0eef-6a45-4759-a4d6-d00bbffb1369",
717+
username: "dean",
718+
avatar_url: "https://avatars.githubusercontent.com/u/11241812?v=4",
719+
seconds: 533520,
720+
},
721+
{
722+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
723+
user_id: "59da0bfe-9c99-47fa-a563-f9fdb18449d0",
724+
username: "cian",
725+
avatar_url:
726+
"https://lh3.googleusercontent.com/a/ACg8ocKKaBWosY_nuQvecIaUPh5RYjxkEN-C8FNGVPlC0Ch2fx0=s96-c",
727+
seconds: 607080,
728+
},
729+
{
730+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
731+
user_id: "5ccd3128-cbbb-4cfb-8139-5a1edbb60c71",
732+
username: "bpmct",
733+
avatar_url: "https://avatars.githubusercontent.com/u/22407953?v=4",
734+
seconds: 161340,
735+
},
736+
{
737+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
738+
user_id: "631f78f6-098e-4cb0-ae4f-418fafb0a406",
739+
username: "matifali",
740+
avatar_url: "https://avatars.githubusercontent.com/u/10648092?v=4",
741+
seconds: 202500,
742+
},
743+
{
744+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
745+
user_id: "740bba7f-356d-4203-8f15-03ddee381998",
746+
username: "eric",
747+
avatar_url: "https://avatars.githubusercontent.com/u/9683576?v=4",
748+
seconds: 352680,
749+
},
750+
{
751+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
752+
user_id: "78dd2361-4a5a-42b0-9ec3-3eea23af1094",
753+
username: "code-asher",
754+
avatar_url: "https://avatars.githubusercontent.com/u/45609798?v=4",
755+
seconds: 518640,
756+
},
757+
{
758+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
759+
user_id: "7f5cc5e9-20ee-48ce-959d-081b3f52273e",
760+
username: "mafredri",
761+
avatar_url: "https://avatars.githubusercontent.com/u/147409?v=4",
762+
seconds: 218100,
763+
},
764+
{
765+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
766+
user_id: "8b474a55-d414-4b53-a6ba-760f3d4eed7b",
767+
username: "kirby",
768+
avatar_url:
769+
"https://lh3.googleusercontent.com/a-/ALV-UjUHd9l3CaO99BfVlP8L9D9HqKFOUac7zVCA_Bb_2lj0hcPkQvHkMk4HRaMw4b1YF7E-uHnJO-w8sXf3pqRA2EUP9sDvX6ITd2S2YN23kttVCJKTiI-YEIS8eVDfrF8YLqjfKL3PWsxyiPcgtcdfmPiEnlh4mpUMRXZudwtINfk0W3B9KEpwJTpipdlb57HdYO-mD3DEfmwnpZIO_iVjwnpWZZimXH5g15NVregb8VH_vlsW-vHrMsZ1fRGpm6GWnTcWx2rTImz5Qq5dd15MPKYUxc4wpyYImg07eD41ShzHDJhmDaj_n3hjOwFLuyloLBck-t9skQLWf2r7Voq42jVhzJ2-GAv9atC41_ohG1kq8TpCf9ak6S4hE3xMIB4yzDC0VZxl-BlsBHCuKBRTwC-58yTL2GZI31a0Q9PpR720AyiZaOWhX1QOVZmPZey8b8SG7jWTOfzNa9Shf9E0pz3yyIxFx7KSY5Qeye5AmO1au-rXuWr4whXXY6fsn0tnG4nxdyetCiXd0mOmvYHoJuuQFfqYNjdObduRD0yaVZGL-hPFDYH6K-wiedT1y-66jKXcqjVqe0Rwo7YzcVcP-IeV5RGuJ36TEpC1lhi2V-AnG7pmvIn_4AmXfycclrISO10LgQsrx8bxeBW61t9oTFTZCXXBDAd9bLRxndLi_mWYEfOSnWODgfCrapL_GNZsV0tkQ9x-zvlSXQXtze5bg__uAo7CEnZ20yWT5Gr25_NPsH6vyR3hplKn67qBti5_rKzFQ1sVbcuab2BRmF_Al9MTQw-R2gmd0mle9JRr8tyuwCYh82mBrM-dGebXSdqvabws7_WmF5TNwDHHzeeiHq1_6FYB0tBldx3yWk3U8olZ3SiPAe_NRnY0vUKI3ZANOA-IRYxyTAfjShJE0fRMCe70BsqzJj3RDAciqt5IaP2vZQeImjPZLd2NGo-Bbw=s96-c",
770+
seconds: 543960,
771+
},
772+
{
773+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
774+
user_id: "9ed91bb9-db45-4cef-b39c-819856e98c30",
775+
username: "jon",
776+
avatar_url:
777+
"https://lh3.googleusercontent.com/a/ACg8ocJEE9R4__Pdh40DHGD-3noKezyw-1qo2auV_cb2gxBg=s96-c",
778+
seconds: 464100,
779+
},
780+
{
781+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
782+
user_id: "a73425d1-53a7-43d3-b6ae-cae9ba59b92b",
783+
username: "ammar",
784+
avatar_url: "https://avatars.githubusercontent.com/u/7416144?v=4",
785+
seconds: 316200,
786+
},
787+
{
788+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
789+
user_id: "af657bc3-6949-4b1b-bc2d-d41a40b546a4",
790+
username: "BrunoQuaresma",
791+
avatar_url: "https://avatars.githubusercontent.com/u/3165839?v=4",
792+
seconds: 329100,
793+
},
794+
{
795+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
796+
user_id: "b006209d-fdd2-4716-afb2-104dafb32dfb",
797+
username: "mtojek",
798+
avatar_url: "https://avatars.githubusercontent.com/u/14044910?v=4",
799+
seconds: 11520,
800+
},
801+
{
802+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
803+
user_id: "b3e1b884-1a5b-44eb-b8b3-423f8eddc503",
804+
username: "spikecurtis",
805+
avatar_url: "https://avatars.githubusercontent.com/u/5375600?v=4",
806+
seconds: 523140,
807+
},
808+
{
809+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
810+
user_id: "baf63990-16a9-472f-b715-64e24c6bcefb",
811+
username: "atif",
812+
avatar_url:
813+
"https://lh3.googleusercontent.com/a-/ALV-UjVWiI2I5XOkxxi5KwAyfzZlfcOSYlMw8dIwJVwg2satTlOaLUy2PXcFcHCYtMg41DImXlB4F7YFIEW-CR_ANiCol7LnHTFomTyeh5N4ZvVQ4rx_sCl3PARywl0-UBW6usVGRVB8CnHve95q4ZDzJA6wJGVvr7gceCpgGe2A2597_KM1L5KIWKr5SAn41AZgQHZc7pgYJtiyKNleDN8LYzmceOtR3GJgFKjMrSOczNLNI3S2TrRPmIBIr_pZFDI3_npKDmQu9fPiVip5RDTAsuP9PdqruNJ4rB0rBae4Gog-RhqUV4L_i01-bJ6aepjH9gqxEkHHkXi7W0ldH8uV2fsQ4Eul78OQp0NrWxx9xZmFseTPK0toiop3EAWnuyp5ikaAnLodtvJ8L3iZXh45LvDv1ADESYPVAeuyHY5eee54O5xy72HABVB_UTE45Zhq086i4zaTNZoObXPrgiU3uNo0EhDQKa2jPNY2oQO0oZa991Oo9zCT9AULz5RP_3GTnfRMgD8ofCKr8Y3dVmSGI0RYOMI5Yqi76sEROCT5LqwAqRTFeGSMIF7-VI9qCctCtZ50n0OVtbFjPCgUGFVN1gZxe2qb66XCQnZOklTaMadj7KvtgIIJFlBSZJLkoPhSyIdiUAOp3VpDn8jOuEI0109YHzEM7l5KFNL-cHxQQyYB9hquld6y6EVRJdro8uVQdwkZ-_Yu4oD70A-WLb-Gi5RLdbB1iFwr99Lg-l4HNDWhh0h1wT5yhn4kgjPMgeTNT7F6fkiteAIvK_jJjVVh-PtKTt48kPv9c7rbc_jCBP70zUQ9X4Xxf9917BPUfvMgLk0gShSaFXxAGTgA7TzRaEsWSi9_DuJ0Q-yQZXwCJ1Y_1VrSF9B2FKsrugotVoC5BORu9tiaWi9jRP6RymM2X0HxsLv0lUFFVjgV0SZnynBNCgqyS02xAs8vEYpw-T7RJg=s96-c",
814+
seconds: 2040,
815+
},
816+
{
817+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
818+
user_id: "c0240345-f14a-4632-b713-a0f09c2ed927",
819+
username: "asher-user",
820+
avatar_url: "",
821+
seconds: 0,
822+
},
823+
{
824+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
825+
user_id: "c5eb8310-cf4f-444c-b223-0e991f828b40",
826+
username: "Emyrk",
827+
avatar_url: "https://avatars.githubusercontent.com/u/5446298?v=4",
828+
seconds: 24540,
829+
},
830+
{
831+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
832+
user_id: "d96bf761-3f94-46b3-a1da-6316e2e4735d",
833+
username: "aslilac",
834+
avatar_url: "https://avatars.githubusercontent.com/u/418348?v=4",
835+
seconds: 824820,
836+
},
837+
{
838+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
839+
user_id: "db38462b-e63d-4304-87e9-2640eea4a3b8",
840+
username: "marc",
841+
avatar_url: "",
842+
seconds: 120,
843+
},
844+
{
845+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
846+
user_id: "e9b24091-a633-4ba0-9746-ca325a86f0f5",
847+
username: "michaelsmith",
848+
avatar_url:
849+
"https://lh3.googleusercontent.com/a-/ALV-UjXDMd9gEl4aMyM5ENfj4Ruzzn57AETWW6UuNC3Od03Y3AjvrCDhp8iE4I8L0393C_peQF9PZQyVklGCW-FCzODkvyVojUFqafbFi6AtvxjKn59ZyUVtG0ELoDNZOtRQaqUuMNIjtafNQ19LgwYm7LSB47My__oafDZ6jw6Kd_H-qtx19Vh62t3ACoJBHpDrF0BdDxWGBCkUAlC8aJcnqdRqPbKB5WGGcEfwLzrhLc5REN4CuXzm09_ZpU2jdvMUKCBX9H_8j2wcPwtgY0JG0DfIOX_VgTdM6Zy7BLiVQHSjD-uSkwqOEoXvsuKWlEBt74rqjyNDjjM1NyHiUdKpUd26hI2jcro_yrf4Jli7MCf5SjnkGMxQCgrD6-D9bcyBNzXpc1_5mDWrGpSh0X6pVK6GsmuYAc68hfTIHYVs-jB97mls9ClOJ2m51AdOAlizT80Ram2yJ09l-YbTVd4fG3L9FajMsvRhcvwwvN5tGcOk36KcIm0wFy9NQyH09QP3M1Rr2kDn9MzYYuyAZ9Um0tZydrPN9FA59JUytq8GtwnZZVmlZk2X2fXsCgJBv3dCwuF3THqSvL0M3lQa89-slrp2qgSRekiCmbb0-b62T413mOA9KNXcCvct_NN-JAE0b6o7To8B1WW8-AZiFQ2DesSEXL-CWYfqfecs4hoIrSBnQLa3Pm2Q5O-R7R99eRD7H3EqPihl_TiG2s_8gvLUF7ft55hYkV0j-YzTS4nOnUtEAXSqN-JYAd_BTJPJ0kyJLGIScwUQGoNFUQYs5nmlKPepeNpoQYYpQe0zK4ZVYm6fnRXUgv1cWvkD5RuxbBs1kgoVyZrZSNco8apuIjg6sBejRJFre_m0N6emp-Jn5wIkFB1f6IRb7S1aPvCqrqgqI8mTcI6Z-4Z3E3YwiYsn8_zVF9EPa1f1zpzeoppGd_YKaAxLjyOv_nC15bN3eio43A=s96-c",
850+
seconds: 449820,
851+
},
852+
{
853+
template_ids: ["0d286645-29aa-4eaf-9b52-cc5d2740c90b"],
854+
user_id: "fdc2dab9-dabd-4980-843f-2e93042db566",
855+
username: "sharkymark",
856+
avatar_url: "https://avatars.githubusercontent.com/u/2022166?v=4",
857+
seconds: 124440,
858+
},
859+
],
860+
},
861+
},
665862
},
666863
};

0 commit comments

Comments
 (0)