From c25193821356cb9d760040231d3d3a245ec2a8e1 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Tue, 20 Jul 2021 13:38:24 -0700 Subject: [PATCH] Use 'brief=true' query parameter on API calls from API-backed select elements --- netbox/project-static/dist/netbox.js | Bin 695044 -> 695102 bytes netbox/project-static/dist/netbox.js.map | Bin 1641866 -> 1641998 bytes netbox/project-static/src/global.d.ts | 4 ++-- netbox/project-static/src/select/api.ts | 7 ++++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 968e670ddb59dfc1fe0b385d7216eb4f29c9c892..7b305f531dd8f458143d2fcf9fca2e4c2984bc2f 100644 GIT binary patch delta 77 zcmZqKrnPUIRznM83sVbo3rh=Y3tJ2O7LN3<+(|{5scA|&iUyiG+XKIH1W1T06_*rc h=A|ns+Llxnq~@n7r0V4*=BBpK=jGf!pO-7O7XTUB8l35Apy2 diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 3fe495b15d1172f0409143b08dac261476687965..ef3c1cce5bc99772c9d90612a76ed4cc97536210 100644 GIT binary patch delta 381 zcmYMuze@sP9Ds4W^X}{{f0TFH5^n@ncw__-WEAgdxI_gG&7Phqsb_a5WH>Y&2ttt! zy^#$CE$!7c^d|%cZ9zk0Q;5}4MBlC9Gd}P%+u4J&?4ISYD2uk77IV$cbZO0yN&1C~ z@)?Y=w2UjJOwQjZk*v-+d}Qgu#S^XVWJu?oV#wnx?IU+x7Euv{v?5%BOnFG zephIgtZ%uRw@1vA!#@0A=Q%2GkcV&flCN#cE7AtuDavHE?i#UAe%O7wFNJYRO5*tL zO@M2O!6e2;Tq?*I=Vds-YtkBy=i~O3$R*v5XrnvI0T<{4JaB`4FaSKj3w*#22Eh;r z*xga#?UYA#q-a`EO_%NGd%-{CQS^eE8<&u&SJlaw-RTJ87)lf}=7M4Bh4Ll@_Sf{?9H!xQd5M#zX6 delta 275 zcmeC1lhQRirJ;qfg{g(Pg{6gc3!BkL=G4|rl^tqB99UXOC9rH?@rZ0HOBsSg8 zoKawUgAzN}^!(W@tkciGXJVax!IW8G`i_rm3XB%h7rbGzn6B`hm3O+qS2nKc3g6gR zr~mU|W}9A{&C#`O66Y; url: string; [k: string]: JSONAble; }; diff --git a/netbox/project-static/src/select/api.ts b/netbox/project-static/src/select/api.ts index eb0d92888..0a3870780 100644 --- a/netbox/project-static/src/select/api.ts +++ b/netbox/project-static/src/select/api.ts @@ -15,7 +15,7 @@ import { import type { Option } from 'slim-select/dist/data'; -type QueryFilter = Map; +type QueryFilter = Map; // Various one-off patterns to replace in query param keys. const REPLACE_PATTERNS = [ @@ -161,6 +161,7 @@ class APISelect { this.updatePathValues(filter); } + this.queryParams.set('brief', true); this.queryParams.set('limit', 0); this.updateQueryUrl(); @@ -414,7 +415,7 @@ class APISelect { private updateQueryUrl(): void { // Create new URL query parameters based on the current state of `queryParams` and create an // updated API query URL. - const query = {} as Record; + const query = {} as Dict; for (const [key, value] of this.queryParams.entries()) { query[key] = value; } @@ -529,7 +530,7 @@ class APISelect { displayName = result[legacyDisplayProperty] as string; } - if (!displayName) { + if (!displayName && typeof result.name === 'string') { displayName = result.name; }