rails-profiler 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20025b12e3ae03c1814148f47ae152c639bb6512d43660eda538b37c4924ec40
-  data.tar.gz: 99c09a40a20ea03c41621743ab8fa73169c6512cdc8939baa7fd6a7ac55b4d8b
+  metadata.gz: 5f02d90b7d6f03504d5aa8412b3f4a3c1fc3064152057489514981daeba18307
+  data.tar.gz: bbf33083a998d3e9ac918ba7600522799bea7006c54fe66f020ea98465e7b086
 SHA512:
-  metadata.gz: dacb466a09c8fa9ff6eb415a109cfbff3e44a17c1b91da5ac2d708ba1d712d0b5b887548ddc9126d11f3f5cc9304361ab74ecb269b06d2e068c160ef73d91746
-  data.tar.gz: 803616c41249b1c8e17dd490cc27dcd166cbe4a50821e8e346cf44d68b9acb9472e98d105e0957f4b65a5a0a640fa6f20babdfcedfd866e37cce7852da606f43
+  metadata.gz: 4b92adb363521979754c08a7304e0559d8221c5541c706d45d2aea01cb9a52bc7893b00847fe741e854551b74fbf6ea02ff9a641893fa5005f7c93953715059b
+  data.tar.gz: b5a00222dee6d68456211b346210573c1781cb42cc6c196a0ade5b0c05e2fc04c86abc4f58a2dd2ee42bf21be7f99ed1a0ef5c2e320bf82642dfa0f563a09bd5

data/app/assets/builds/profiler.css

@@ -430,6 +430,12 @@ table a {
   color: #fff;
 }
 
+.profiler-load-more {
+  display: flex;
+  justify-content: center;
+  padding: var(--profiler-space-4) 0 var(--profiler-space-2);
+}
+
 .token-copy {
   background: none;
   border: none;

data/app/assets/builds/profiler.js

@@ -740,7 +740,13 @@
     };
     const [section, setSection] = d2(initialSection);
     const [profiles, setProfiles] = d2([]);
+    const [httpOffset, setHttpOffset] = d2(0);
+    const [httpHasMore, setHttpHasMore] = d2(false);
+    const [httpLoadingMore, setHttpLoadingMore] = d2(false);
     const [jobs, setJobs] = d2([]);
+    const [jobOffset, setJobOffset] = d2(0);
+    const [jobHasMore, setJobHasMore] = d2(false);
+    const [jobLoadingMore, setJobLoadingMore] = d2(false);
     const [outboundRequests, setOutboundRequests] = d2([]);
     const [loadingHttp, setLoadingHttp] = d2(true);
     const [loadingJobs, setLoadingJobs] = d2(false);
@@ -767,8 +773,10 @@
     const [outboundMethod, setOutboundMethod] = d2("");
     const [outboundStatus, setOutboundStatus] = d2("");
     y2(() => {
-      fetch(`${BASE}/api/profiles`).then((res) => res.json()).then((data) => {
-        setProfiles(data.filter((p3) => p3.profile_type !== "job"));
+      fetch(`${BASE}/api/profiles?limit=50&offset=0`).then((res) => res.json()).then((data) => {
+        setProfiles(data.profiles);
+        setHttpOffset(data.profiles.length);
+        setHttpHasMore(data.has_more);
         setLoadingHttp(false);
       }).catch(() => {
         setError("Failed to load profiles");
@@ -803,11 +811,22 @@
     const togglePreset = (key) => {
       setHttpPreset((prev) => prev === key ? "" : key);
     };
+    const loadMoreHttp = () => {
+      setHttpLoadingMore(true);
+      fetch(`${BASE}/api/profiles?limit=50&offset=${httpOffset}`).then((res) => res.json()).then((data) => {
+        setProfiles((prev) => [...prev, ...data.profiles]);
+        setHttpOffset((prev) => prev + data.profiles.length);
+        setHttpHasMore(data.has_more);
+        setHttpLoadingMore(false);
+      }).catch(() => setHttpLoadingMore(false));
+    };
     const loadJobs = () => {
       if (jobsLoaded) return;
       setLoadingJobs(true);
-      fetch(`${BASE}/api/jobs`).then((res) => res.json()).then((data) => {
-        setJobs(data);
+      fetch(`${BASE}/api/jobs?limit=50&offset=0`).then((res) => res.json()).then((data) => {
+        setJobs(data.profiles);
+        setJobOffset(data.profiles.length);
+        setJobHasMore(data.has_more);
         setLoadingJobs(false);
         setJobsLoaded(true);
       }).catch(() => {
@@ -816,6 +835,15 @@
         setJobsLoaded(true);
       });
     };
+    const loadMoreJobs = () => {
+      setJobLoadingMore(true);
+      fetch(`${BASE}/api/jobs?limit=50&offset=${jobOffset}`).then((res) => res.json()).then((data) => {
+        setJobs((prev) => [...prev, ...data.profiles]);
+        setJobOffset((prev) => prev + data.profiles.length);
+        setJobHasMore(data.has_more);
+        setJobLoadingMore(false);
+      }).catch(() => setJobLoadingMore(false));
+    };
     const loadOutbound = () => {
       if (outboundLoaded) return;
       setLoadingOutbound(true);
@@ -878,8 +906,10 @@
     const refresh = () => {
       if (section === "http") {
         setLoadingHttp(true);
-        fetch(`${BASE}/api/profiles`).then((res) => res.json()).then((data) => {
-          setProfiles(data.filter((p3) => p3.profile_type !== "job"));
+        fetch(`${BASE}/api/profiles?limit=50&offset=0`).then((res) => res.json()).then((data) => {
+          setProfiles(data.profiles);
+          setHttpOffset(data.profiles.length);
+          setHttpHasMore(data.has_more);
           setLoadingHttp(false);
         }).catch(() => {
           setError("Failed to load profiles");
@@ -887,8 +917,10 @@
         });
       } else if (section === "jobs") {
         setLoadingJobs(true);
-        fetch(`${BASE}/api/jobs`).then((res) => res.json()).then((data) => {
-          setJobs(data);
+        fetch(`${BASE}/api/jobs?limit=50&offset=0`).then((res) => res.json()).then((data) => {
+          setJobs(data.profiles);
+          setJobOffset(data.profiles.length);
+          setJobHasMore(data.has_more);
           setLoadingJobs(false);
         }).catch(() => {
           setJobsError("Failed to load job profiles");
@@ -1094,7 +1126,8 @@
                 /* @__PURE__ */ u3("td", { class: "profiler-text--xs profiler-text--mono profiler-text--muted", children: /* @__PURE__ */ u3("button", { class: "token-copy", onClick: () => copyToken(p3.token), title: "Copy full token", children: copiedToken === p3.token ? "\u2713" : p3.token.substring(0, 8) + "\u2026" }) }),
                 /* @__PURE__ */ u3("td", { children: /* @__PURE__ */ u3("button", { class: "btn-row-delete", onClick: () => deleteProfile(p3.token), title: "Delete", children: "\xD7" }) })
               ] }, p3.token)) })
-            ] })
+            ] }),
+            httpHasMore && !httpFiltersActive && /* @__PURE__ */ u3("div", { class: "profiler-load-more", children: /* @__PURE__ */ u3("button", { class: "btn btn-secondary", onClick: loadMoreHttp, disabled: httpLoadingMore, children: httpLoadingMore ? "Loading\u2026" : "Load more" }) })
           ] })),
           section === "jobs" && (loadingJobs ? /* @__PURE__ */ u3("div", { class: "profiler-empty", children: /* @__PURE__ */ u3("div", { class: "profiler-empty__title", children: "Loading..." }) }) : jobsError ? /* @__PURE__ */ u3("div", { class: "profiler-empty", children: /* @__PURE__ */ u3("div", { class: "profiler-empty__title", children: jobsError }) }) : jobs.length === 0 ? /* @__PURE__ */ u3("div", { class: "profiler-empty", children: [
             /* @__PURE__ */ u3("div", { class: "profiler-empty__title", children: "No job profiles found" }),
@@ -1162,7 +1195,8 @@
                   /* @__PURE__ */ u3("td", { children: /* @__PURE__ */ u3("button", { class: "btn-row-delete", onClick: () => deleteJob(p3.token), title: "Delete", children: "\xD7" }) })
                 ] }, p3.token);
               }) })
-            ] })
+            ] }),
+            jobHasMore && !jobFiltersActive && /* @__PURE__ */ u3("div", { class: "profiler-load-more", children: /* @__PURE__ */ u3("button", { class: "btn btn-secondary", onClick: loadMoreJobs, disabled: jobLoadingMore, children: jobLoadingMore ? "Loading\u2026" : "Load more" }) })
           ] })),
           section === "outbound" && (loadingOutbound ? /* @__PURE__ */ u3("div", { class: "profiler-empty", children: /* @__PURE__ */ u3("div", { class: "profiler-empty__title", children: "Loading..." }) }) : outboundError ? /* @__PURE__ */ u3("div", { class: "profiler-empty", children: /* @__PURE__ */ u3("div", { class: "profiler-empty__title", children: outboundError }) }) : outboundRequests.length === 0 ? /* @__PURE__ */ u3("div", { class: "profiler-empty", children: [
             /* @__PURE__ */ u3("div", { class: "profiler-empty__title", children: "No outbound HTTP requests found" }),

data/app/controllers/profiler/api/jobs_controller.rb

@@ -6,10 +6,17 @@ module Profiler
       skip_before_action :verify_authenticity_token
 
       def index
-        all_profiles = Profiler.storage.list(limit: (params[:limit] || 200).to_i, offset: (params[:offset] || 0).to_i)
-        job_profiles = all_profiles.select { |p| p.profile_type == "job" }
-        job_profiles = job_profiles.first((params[:limit] || 50).to_i)
-        render json: job_profiles.map(&:to_h)
+        limit  = (params[:limit]  || 50).to_i
+        offset = (params[:offset] || 0).to_i
+        all    = Profiler.storage.list(limit: 1000, offset: 0)
+        jobs   = all.select { |p| p.profile_type == "job" }
+        page   = jobs.drop(offset).first(limit + 1)
+        render json: {
+          profiles: page.first(limit).map(&:to_h),
+          limit:    limit,
+          offset:   offset,
+          has_more: page.size > limit
+        }
       end
 
       def show

data/app/controllers/profiler/api/profiles_controller.rb

@@ -6,8 +6,17 @@ module Profiler
       skip_before_action :verify_authenticity_token
 
       def index
-        profiles = Profiler.storage.list(limit: params[:limit] || 50, offset: params[:offset] || 0)
-        render json: profiles.map(&:to_h)
+        limit  = (params[:limit]  || 50).to_i
+        offset = (params[:offset] || 0).to_i
+        all    = Profiler.storage.list(limit: 1000, offset: 0)
+        http   = all.reject { |p| p.profile_type == "job" }
+        page   = http.drop(offset).first(limit + 1)
+        render json: {
+          profiles: page.first(limit).map(&:to_h),
+          limit:    limit,
+          offset:   offset,
+          has_more: page.size > limit
+        }
       end
 
       def show

data/lib/profiler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Profiler
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-profiler
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Sébastien Duplessy