Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relative path calculation on the backend #175

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Relative path calculation on the backend #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ec574c
Relative path calculation on the backend
Jun 13, 2020
1268410
Relative path - frontend handling
Jun 14, 2020
1d8e8c4
Fix root path relative calculation
Jun 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion meta_request/lib/meta_request/app_notifications.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ class AppNotifications

VIEW_BLOCK = proc { |*args|
name, start, ending, transaction_id, payload = args
payload[:identifier] = MetaRequest::Utils.sub_source_path(payload[:identifier])
identifier = payload[:identifier]
payload[:identifier] = MetaRequest::Utils.sub_source_path(identifier)
payload[:relative_identifier] = MetaRequest::Utils.relative_path(identifier)

Event.new(name, start, ending, transaction_id, payload)
}
Expand Down
7 changes: 6 additions & 1 deletion meta_request/lib/meta_request/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def dev_callsite(caller)

{
filename: sub_source_path(filename),
relative_filename: relative_path(filename),
line: line.to_i,
method: method
}
Expand All @@ -22,7 +23,11 @@ def sub_source_path(path)
source_path = MetaRequest.config.source_path
return path if rails_root == source_path

path.sub(rails_root, source_path)
path.sub(%r{\A#{rails_root}}, source_path)
end

def relative_path(path)
path.sub(%r{\A#{MetaRequest.rails_root}/?}, '')
end
end
end
6 changes: 4 additions & 2 deletions meta_request/spec/meta_request/utils_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
]

expect(MetaRequest::Utils.dev_callsite(stacktrace)).to eq(
filename: filename, line: line, method: method
filename: filename, relative_filename: 'test_file.rb',
line: line, method: method
)
end

Expand All @@ -39,7 +40,8 @@
]

expect(MetaRequest::Utils.dev_callsite(stacktrace)).to eq(
filename: '/Users/foo/bar/test_file.rb', line: line, method: method
filename: '/Users/foo/bar/test_file.rb',
relative_filename: 'test_file.rb', line: line, method: method
)

# revert configuration
Expand Down
20 changes: 16 additions & 4 deletions rails_panel/panel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@
<tr ng-repeat="sql in activeSqls()" ng-show="showQuery(sql.payload.name)" class="{{sql.payload.name}}">
<td>
<span ng-show="sql.payload.filename != undefined && sql.payload.line != undefined">
<a href="{{sql.payload.filename | editorify:sql.payload.line}}">{{sql.payload.filename | normalizePath}}:{{sql.payload.line}}</a>
<a href="{{sql.payload.filename | editorify:sql.payload.line}}">
<span ng-show="!sql.payload.relative_filename">{{ sql.payload.filename | normalizePath}}:{{sql.payload.line}}</span>
<span ng-show="sql.payload.relative_filename">{{ sql.payload.relative_filename}}:{{sql.payload.line}}</span>
</a>
</span>
</td>
<td>{{sql.payload.name}}</td>
Expand All @@ -185,7 +188,10 @@
<tbody>
<tr ng-repeat="view in activeViews()">
<td>
<a href="{{view.payload.identifier | editorify:1}}">{{view.payload.identifier | normalizePath}}</a>
<a href="{{view.payload.identifier | editorify:1}}">
<span ng-show="!view.payload.relative_identifier">{{view.payload.identifier | normalizePath}}</span>
<span ng-show="view.payload.relative_identifier">{{view.payload.relative_identifier}}</span>
</a>
<span ng-show="view.payload.layout">within {{view.payload.layout}}</span>
</td>
<td class="duration" data-sort-value="{{-view.duration}}">{{view.duration | number:0}} ms</td>
Expand All @@ -209,7 +215,10 @@
<tr ng-repeat="cache in activeCaches()" class="{{cache.payload.name}}">
<td>
<span ng-show="cache.payload.filename != undefined && cache.payload.line != undefined">
<a href="{{cache.payload.filename | editorify:cache.payload.line }}">{{cache.payload.filename | normalizePath}}:{{cache.payload.line}}</a>
<a href="{{cache.payload.filename | editorify:cache.payload.line }}">
<span ng-show="!cache.payload.relative_filename">{{cache.payload.filename | normalizePath}}:{{cache.payload.line}}</span>
<span ng-show="cache.payload.relative_filename">{{cache.payload.relative_filename}}:{{cache.payload.line}}</span>
</a>
</span>
</td>
<td>{{cache.payload.type}}</td>
Expand All @@ -231,7 +240,10 @@
</thead>
<tbody>
<tr ng-repeat="log in activeLog()">
<td><a href="{{log.payload.filename | editorify:log.payload.line}}">{{log.payload.filename | normalizePath}}:{{log.payload.line}}</a></td>
<td><a href="{{log.payload.filename | editorify:log.payload.line}}">
<span ng-show="!log.payload.relative_filename">{{log.payload.filename | normalizePath}}:{{log.payload.line}}</span>
<span ng-show="log.payload.relative_filename">{{log.payload.relative_filename}}:{{log.payload.line}}</span>
</a></td>
<td ng-bind-html-unsafe="log.payload.message | toString | sanitize | ansi2html"></td>
</tr>
</tbody>
Expand Down