@appland/appmap 3.104.0 → 3.105.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ # [@appland/appmap-v3.105.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.104.0...@appland/appmap-v3.105.0) (2023-10-20)
2
+
3
+
4
+ ### Features
5
+
6
+ * Finding is selected in appmaps from PR report ([#1438](https://github.com/getappmap/appmap-js/issues/1438)) ([26d355a](https://github.com/getappmap/appmap-js/commit/26d355a9575ae0e021c0263cef26133c1ca0c832))
7
+
1
8
  # [@appland/appmap-v3.104.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.103.0...@appland/appmap-v3.104.0) (2023-10-20)
2
9
 
3
10
 
@@ -34,6 +34,7 @@ const fs_1 = require("fs");
34
34
  const assert_1 = __importDefault(require("assert"));
35
35
  const Preprocessor_1 = __importStar(require("./Preprocessor"));
36
36
  const helpers_1 = __importDefault(require("./helpers"));
37
+ const models_1 = require("@appland/models");
37
38
  exports.TemplateDirectory = [
38
39
  '../../../resources/change-report',
39
40
  '../../../../resources/change-report', // In development
@@ -182,28 +183,43 @@ class ReportSection {
182
183
  tokens.push(appmap.displayName);
183
184
  return tokens.join(' ');
184
185
  };
186
+ const buildUrlString = (searchParams) => {
187
+ const url = new URL(options.appmapURL.toString());
188
+ Object.keys(searchParams).forEach((key) => url.searchParams.append(key, searchParams[key]));
189
+ return url.toString();
190
+ };
185
191
  const appmap_url = (revisionName, appmap) => {
186
192
  let { id } = appmap;
187
193
  const path = [revisionName, `${id}.appmap.json`].join('/');
188
- if (options.appmapURL) {
189
- const url = new URL(options.appmapURL.toString());
190
- url.searchParams.append('path', path);
191
- return new handlebars_1.default.SafeString(url.toString());
192
- }
193
- else {
194
- return new handlebars_1.default.SafeString(path);
195
- }
194
+ let url = path;
195
+ if (options.appmapURL)
196
+ url = buildUrlString({ path });
197
+ return new handlebars_1.SafeString(url);
196
198
  };
197
199
  const appmap_diff_url = (appmap) => {
198
200
  const path = ['diff', `${appmap.id}.diff.sequence.json`].join('/');
201
+ let url = path;
202
+ if (options.appmapURL)
203
+ url = buildUrlString({ path });
204
+ return new handlebars_1.SafeString(url);
205
+ };
206
+ const appmap_url_with_finding = (revisionName, appmap, findingHash) => {
207
+ let { id } = appmap;
208
+ const path = [revisionName, `${id}.appmap.json`].join('/');
209
+ let url = path;
199
210
  if (options.appmapURL) {
200
- const url = new URL(options.appmapURL.toString());
201
- url.searchParams.append('path', path);
202
- return new handlebars_1.default.SafeString(url.toString());
203
- }
204
- else {
205
- return new handlebars_1.default.SafeString(path);
211
+ const searchParams = { path };
212
+ try {
213
+ const stateObject = { selectedObject: `analysis-finding:${findingHash}` };
214
+ const state = (0, models_1.base64UrlEncode)(JSON.stringify(stateObject));
215
+ searchParams.state = state;
216
+ }
217
+ catch (e) {
218
+ // do not add state
219
+ }
220
+ url = buildUrlString(searchParams);
206
221
  }
222
+ return new handlebars_1.SafeString(url);
207
223
  };
208
224
  const source_link = (location, fileLinenoSeparator = '#L') => {
209
225
  const label = location;
@@ -221,6 +237,7 @@ class ReportSection {
221
237
  return Object.assign({ appmap_diff_url,
222
238
  appmap_title,
223
239
  appmap_url,
240
+ appmap_url_with_finding,
224
241
  group_appmaps_by_recorder_name,
225
242
  section_link,
226
243
  source_link,
@@ -1 +1 @@
1
- {"version":3,"file":"ReportSection.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ReportSection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ReportSection.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ReportSection.ts"],"names":[],"mappings":"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"}