@quadrel-enterprise-ui/framework 21.5.1 → 21.6.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.
|
@@ -6984,6 +6984,50 @@ function qdMergeParams(parts) {
|
|
|
6984
6984
|
return qdWrapParams(merged);
|
|
6985
6985
|
}
|
|
6986
6986
|
|
|
6987
|
+
const MEMORY_LIMIT = 20;
|
|
6988
|
+
/**
|
|
6989
|
+
* Remembers the view params of the routes a user has visited, so returning to one can restore them.
|
|
6990
|
+
*
|
|
6991
|
+
* Holds the most recent {@link MEMORY_LIMIT} paths and drops the oldest beyond that. The memory
|
|
6992
|
+
* lives in the browser tab only — a reload starts over.
|
|
6993
|
+
*/
|
|
6994
|
+
class QdRouteAddressMemory {
|
|
6995
|
+
_byPath = new Map();
|
|
6996
|
+
remember(path, params) {
|
|
6997
|
+
this._byPath.delete(path);
|
|
6998
|
+
this._byPath.set(path, params);
|
|
6999
|
+
if (this._byPath.size <= MEMORY_LIMIT)
|
|
7000
|
+
return;
|
|
7001
|
+
const oldest = this._byPath.keys().next().value;
|
|
7002
|
+
if (oldest !== undefined)
|
|
7003
|
+
this._byPath.delete(oldest);
|
|
7004
|
+
}
|
|
7005
|
+
recall(path) {
|
|
7006
|
+
return this._byPath.get(path);
|
|
7007
|
+
}
|
|
7008
|
+
forget(path) {
|
|
7009
|
+
this._byPath.delete(path);
|
|
7010
|
+
}
|
|
7011
|
+
}
|
|
7012
|
+
/**
|
|
7013
|
+
* Strips the query string and the fragment, so `/orders?page=2#top` and `/orders` are one path.
|
|
7014
|
+
*/
|
|
7015
|
+
function qdPathOf(url) {
|
|
7016
|
+
return url.split('#')[0].split('?')[0];
|
|
7017
|
+
}
|
|
7018
|
+
/**
|
|
7019
|
+
* Appends params to a path, keeping any the path already carries.
|
|
7020
|
+
*/
|
|
7021
|
+
function qdAppendQueryParams(path, params) {
|
|
7022
|
+
const entries = Object.entries(params);
|
|
7023
|
+
if (entries.length === 0)
|
|
7024
|
+
return path;
|
|
7025
|
+
const [base, existing] = path.split('#')[0].split('?');
|
|
7026
|
+
const search = new URLSearchParams(existing);
|
|
7027
|
+
entries.forEach(([key, value]) => search.set(key, value));
|
|
7028
|
+
return `${base}?${search.toString()}`;
|
|
7029
|
+
}
|
|
7030
|
+
|
|
6987
7031
|
/**
|
|
6988
7032
|
* Framework-wide funnel for syncing application state with the URL `?key=value` query string.
|
|
6989
7033
|
*
|
|
@@ -7056,6 +7100,7 @@ class QdRouterQueryParamHubService {
|
|
|
7056
7100
|
_destroyRef = inject(DestroyRef);
|
|
7057
7101
|
_ownership = new Map();
|
|
7058
7102
|
_ownerLabels = new WeakMap();
|
|
7103
|
+
_addressMemory = new QdRouteAddressMemory();
|
|
7059
7104
|
_destroyClaims = new WeakMap();
|
|
7060
7105
|
_navigationSettledSubject = new ReplaySubject(1);
|
|
7061
7106
|
_pendingParams = {};
|
|
@@ -7068,6 +7113,7 @@ class QdRouterQueryParamHubService {
|
|
|
7068
7113
|
return;
|
|
7069
7114
|
this.replayCurrentRouterStateForLateSubscribers(this._router);
|
|
7070
7115
|
this.forwardSettlingRouterEventsToNavigationSettled(this._router);
|
|
7116
|
+
this.rememberViewParamsBeforeLeaving(this._router);
|
|
7071
7117
|
}
|
|
7072
7118
|
/**
|
|
7073
7119
|
* Returns whether the hub can sync at all. False when the consuming injector has neither a
|
|
@@ -7119,24 +7165,43 @@ class QdRouterQueryParamHubService {
|
|
|
7119
7165
|
* is not registered.
|
|
7120
7166
|
*/
|
|
7121
7167
|
claim(keys, owner, destroyRef, featureLabel) {
|
|
7168
|
+
const conflicts = this.reserveKeys(keys, owner, destroyRef, featureLabel);
|
|
7169
|
+
if (conflicts.length === 0)
|
|
7170
|
+
return true;
|
|
7171
|
+
const existingOwner = this._ownership.get(conflicts[0]);
|
|
7172
|
+
console.error(this.formatOwnershipConflictMessage(conflicts, this._ownerLabels.get(existingOwner)));
|
|
7173
|
+
return false;
|
|
7174
|
+
}
|
|
7175
|
+
/**
|
|
7176
|
+
* Like `claim()`, but silent when the keys are taken.
|
|
7177
|
+
*
|
|
7178
|
+
* For callers that handle the failure themselves. A logged error would mislead there, and it
|
|
7179
|
+
* turns Jest runs red.
|
|
7180
|
+
*/
|
|
7181
|
+
tryClaim(keys, owner, destroyRef, featureLabel) {
|
|
7182
|
+
return this.reserveKeys(keys, owner, destroyRef, featureLabel).length === 0;
|
|
7183
|
+
}
|
|
7184
|
+
/**
|
|
7185
|
+
* Reading only — never takes a key away from a later `claim()`.
|
|
7186
|
+
*/
|
|
7187
|
+
isClaimed(key) {
|
|
7188
|
+
return this._ownership.has(key);
|
|
7189
|
+
}
|
|
7190
|
+
reserveKeys(keys, owner, destroyRef, featureLabel) {
|
|
7122
7191
|
const conflicts = [];
|
|
7123
7192
|
for (const key of keys) {
|
|
7124
7193
|
const existing = this._ownership.get(key);
|
|
7125
7194
|
if (existing && existing !== owner)
|
|
7126
7195
|
conflicts.push(key);
|
|
7127
7196
|
}
|
|
7128
|
-
if (conflicts.length > 0)
|
|
7129
|
-
|
|
7130
|
-
const existingLabel = this._ownerLabels.get(existingOwner);
|
|
7131
|
-
console.error(this.formatOwnershipConflictMessage(conflicts, existingLabel));
|
|
7132
|
-
return false;
|
|
7133
|
-
}
|
|
7197
|
+
if (conflicts.length > 0)
|
|
7198
|
+
return conflicts;
|
|
7134
7199
|
keys.forEach(key => this._ownership.set(key, owner));
|
|
7135
7200
|
if (featureLabel)
|
|
7136
7201
|
this._ownerLabels.set(owner, featureLabel);
|
|
7137
7202
|
if (destroyRef && keys.length > 0)
|
|
7138
7203
|
this.registerAutoRelease(owner, keys, destroyRef);
|
|
7139
|
-
return
|
|
7204
|
+
return [];
|
|
7140
7205
|
}
|
|
7141
7206
|
formatOwnershipConflictMessage(conflicts, existingLabel) {
|
|
7142
7207
|
const keysList = conflicts.map(key => `"${key}"`).join(', ');
|
|
@@ -7146,7 +7211,10 @@ class QdRouterQueryParamHubService {
|
|
|
7146
7211
|
const lines = [
|
|
7147
7212
|
`Quadrel Framework | Router Query Param Hub - ${paramHeader} ${keysList} ${verb} already owned by ${ownerPhrase}.`
|
|
7148
7213
|
];
|
|
7149
|
-
if (existingLabel) {
|
|
7214
|
+
if (existingLabel?.hasUid) {
|
|
7215
|
+
lines.push(`Every router-connected ${existingLabel.name} on a view needs its own param keys.`, `Please give each of the ${existingLabel.plural} a distinct uid, or set connectWithRouter: false on the extra ones.`);
|
|
7216
|
+
}
|
|
7217
|
+
else if (existingLabel) {
|
|
7150
7218
|
lines.push(`Only one router-connected ${existingLabel.name} is allowed per view.`, `Please set connectWithRouter: false on all additional ${existingLabel.plural}.`);
|
|
7151
7219
|
}
|
|
7152
7220
|
else {
|
|
@@ -7187,6 +7255,51 @@ class QdRouterQueryParamHubService {
|
|
|
7187
7255
|
snapshotQueryParam(key) {
|
|
7188
7256
|
return this._activatedRoute?.snapshot.queryParamMap.get(key) ?? undefined;
|
|
7189
7257
|
}
|
|
7258
|
+
/**
|
|
7259
|
+
* Reserves a whole namespace, so no second instance can use the same `uid`.
|
|
7260
|
+
*
|
|
7261
|
+
* Claiming the params alone misses two tables that sync different features: they contend for no
|
|
7262
|
+
* key, yet share one namespace and one store entry.
|
|
7263
|
+
*/
|
|
7264
|
+
claimNamespace(namespace, owner, messageFeature, destroyRef, featureLabel) {
|
|
7265
|
+
if (this.tryClaim([namespaceReservationKey(namespace)], owner, destroyRef, featureLabel))
|
|
7266
|
+
return true;
|
|
7267
|
+
const name = featureLabel?.name.toLowerCase() ?? 'instance';
|
|
7268
|
+
console.error(`Quadrel Framework | ${messageFeature} - Config key "uid" must be unique on a view. ` +
|
|
7269
|
+
`Got "${namespace}". Another ${name} already uses it, so both share one state.`);
|
|
7270
|
+
return false;
|
|
7271
|
+
}
|
|
7272
|
+
/**
|
|
7273
|
+
* Puts the view params a path last carried back into it.
|
|
7274
|
+
*
|
|
7275
|
+
* Used by the shell back button so a filtered overview comes back the way the user left it.
|
|
7276
|
+
*
|
|
7277
|
+
* @returns The path with its remembered params, or unchanged when nothing is remembered.
|
|
7278
|
+
*/
|
|
7279
|
+
restoreAddress(path) {
|
|
7280
|
+
const remembered = this._addressMemory.recall(qdPathOf(path));
|
|
7281
|
+
return remembered ? qdAppendQueryParams(path, remembered) : path;
|
|
7282
|
+
}
|
|
7283
|
+
/**
|
|
7284
|
+
* Navigates to another route behind every write that is still pending.
|
|
7285
|
+
*
|
|
7286
|
+
* A param write scheduled a moment earlier would otherwise overtake the navigation and land on
|
|
7287
|
+
* the route the user just left.
|
|
7288
|
+
*/
|
|
7289
|
+
navigateToUrl(url) {
|
|
7290
|
+
const router = this._router;
|
|
7291
|
+
if (!router)
|
|
7292
|
+
return;
|
|
7293
|
+
this._navigationChain = this._navigationChain.catch(() => undefined).then(() => router.navigateByUrl(url));
|
|
7294
|
+
}
|
|
7295
|
+
/**
|
|
7296
|
+
* Tells whether a param carries more than one value, as in `?sort=a&sort=b`.
|
|
7297
|
+
*
|
|
7298
|
+
* `snapshotQueryParam()` would silently return only the first.
|
|
7299
|
+
*/
|
|
7300
|
+
hasRepeatedQueryParam(key) {
|
|
7301
|
+
return (this._activatedRoute?.snapshot.queryParamMap.getAll(key).length ?? 0) > 1;
|
|
7302
|
+
}
|
|
7190
7303
|
/**
|
|
7191
7304
|
* Schedules a query-param update.
|
|
7192
7305
|
*
|
|
@@ -7238,6 +7351,23 @@ class QdRouterQueryParamHubService {
|
|
|
7238
7351
|
.pipe(filter(event => event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError), takeUntilDestroyed(this._destroyRef))
|
|
7239
7352
|
.subscribe(() => this._navigationSettledSubject.next());
|
|
7240
7353
|
}
|
|
7354
|
+
rememberViewParamsBeforeLeaving(router) {
|
|
7355
|
+
router.events
|
|
7356
|
+
.pipe(filter(event => event instanceof NavigationStart), takeUntilDestroyed(this._destroyRef))
|
|
7357
|
+
.subscribe(() => this._addressMemory.remember(qdPathOf(router.url ?? ''), this.collectViewParams()));
|
|
7358
|
+
}
|
|
7359
|
+
collectViewParams() {
|
|
7360
|
+
const snapshot = this._activatedRoute?.snapshot?.queryParams ?? {};
|
|
7361
|
+
const collected = {};
|
|
7362
|
+
this._ownership.forEach((owner, key) => {
|
|
7363
|
+
if (!this._ownerLabels.get(owner)?.isViewState)
|
|
7364
|
+
return;
|
|
7365
|
+
const value = snapshot[key];
|
|
7366
|
+
if (typeof value === 'string')
|
|
7367
|
+
collected[key] = value;
|
|
7368
|
+
});
|
|
7369
|
+
return collected;
|
|
7370
|
+
}
|
|
7241
7371
|
registerAutoRelease(owner, keys, destroyRef) {
|
|
7242
7372
|
const existingClaims = this._destroyClaims.get(destroyRef);
|
|
7243
7373
|
if (existingClaims) {
|
|
@@ -7272,6 +7402,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
7272
7402
|
type: Injectable,
|
|
7273
7403
|
args: [{ providedIn: 'root' }]
|
|
7274
7404
|
}], ctorParameters: () => [] });
|
|
7405
|
+
/**
|
|
7406
|
+
* Builds the name a namespace reservation is held under.
|
|
7407
|
+
*
|
|
7408
|
+
* The colon cannot appear in a `uid` and never in a param key, so a reservation can never collide
|
|
7409
|
+
* with a real query param.
|
|
7410
|
+
*
|
|
7411
|
+
* @param namespace The `uid` being reserved.
|
|
7412
|
+
* @returns The internal name of the reservation.
|
|
7413
|
+
*/
|
|
7414
|
+
function namespaceReservationKey(namespace) {
|
|
7415
|
+
return `uid:${namespace}`;
|
|
7416
|
+
}
|
|
7275
7417
|
|
|
7276
7418
|
class QdRwdDisabledDirective {
|
|
7277
7419
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdRwdDisabledDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
|
|
@@ -23150,6 +23292,204 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
23150
23292
|
args: ['attr.data-test-id']
|
|
23151
23293
|
}] } });
|
|
23152
23294
|
|
|
23295
|
+
const NAMESPACE_SEPARATOR = '.';
|
|
23296
|
+
const NAMESPACE_PATTERN = /^[A-Za-z0-9_-]+$/;
|
|
23297
|
+
/**
|
|
23298
|
+
* A namespace is part of every key of its instance, so it stays short enough to keep the address
|
|
23299
|
+
* readable.
|
|
23300
|
+
*/
|
|
23301
|
+
const QD_QUERY_PARAM_NAMESPACE_MAX_LENGTH = 64;
|
|
23302
|
+
/**
|
|
23303
|
+
* Builds the key an adapter reads and writes: the plain one, or `<namespace>.<key>`.
|
|
23304
|
+
*/
|
|
23305
|
+
function qdBuildQueryParamKey(namespace, key) {
|
|
23306
|
+
if (!namespace)
|
|
23307
|
+
return key;
|
|
23308
|
+
return namespace + NAMESPACE_SEPARATOR + key;
|
|
23309
|
+
}
|
|
23310
|
+
/**
|
|
23311
|
+
* The value ends up in the address bar, so it must survive a round trip without escaping and must
|
|
23312
|
+
* not contain the separator. Letters, digits, dashes and underscores only.
|
|
23313
|
+
*/
|
|
23314
|
+
function qdIsUsableQueryParamNamespace(namespace) {
|
|
23315
|
+
if (!namespace || namespace.length > QD_QUERY_PARAM_NAMESPACE_MAX_LENGTH)
|
|
23316
|
+
return false;
|
|
23317
|
+
return NAMESPACE_PATTERN.test(namespace);
|
|
23318
|
+
}
|
|
23319
|
+
|
|
23320
|
+
const holds = new WeakMap();
|
|
23321
|
+
/**
|
|
23322
|
+
* Moves the values of an address saved before the namespace into the prefixed keys.
|
|
23323
|
+
*
|
|
23324
|
+
* Only one instance adopts a given key. The plain key is held until the end of the turn, so a
|
|
23325
|
+
* plain instance that connects in the same turn can still take it back and keep its value.
|
|
23326
|
+
*
|
|
23327
|
+
* @returns The params whose plain key this instance may keep reading.
|
|
23328
|
+
*
|
|
23329
|
+
* @deprecated v21 only. In v22 delete this file and its two calls in `query-param-binding.tools.ts`.
|
|
23330
|
+
*/
|
|
23331
|
+
function qdAdoptPlainAddress(request) {
|
|
23332
|
+
const { hub, params, namespace } = request;
|
|
23333
|
+
const hold = holdOf(hub);
|
|
23334
|
+
const adoptable = params.filter(param => isAdoptable(hub, param, namespace));
|
|
23335
|
+
const adopted = adoptable.filter(param => hub.tryClaim([param], hold.owner));
|
|
23336
|
+
if (adopted.length === 0)
|
|
23337
|
+
return adopted;
|
|
23338
|
+
Promise.resolve().then(() => dropPlainKeys(hub, hold, adopted));
|
|
23339
|
+
hub.write(buildPrefixedValues(hub, adopted, namespace), { replaceUrl: true });
|
|
23340
|
+
return adopted;
|
|
23341
|
+
}
|
|
23342
|
+
/**
|
|
23343
|
+
* Lets an instance without a namespace take its plain keys back from an adoption in the same turn.
|
|
23344
|
+
*
|
|
23345
|
+
* @deprecated v21 only. Goes away with `qdAdoptPlainAddress`.
|
|
23346
|
+
*/
|
|
23347
|
+
function qdTakeBackPlainAddress(hub, params) {
|
|
23348
|
+
const hold = holdOf(hub);
|
|
23349
|
+
for (const param of params) {
|
|
23350
|
+
const wasHeld = hub.isClaimed(param);
|
|
23351
|
+
hub.release([param], hold.owner);
|
|
23352
|
+
if (wasHeld && !hub.isClaimed(param))
|
|
23353
|
+
hold.takenBack.add(param);
|
|
23354
|
+
}
|
|
23355
|
+
}
|
|
23356
|
+
function holdOf(hub) {
|
|
23357
|
+
let hold = holds.get(hub);
|
|
23358
|
+
if (!hold) {
|
|
23359
|
+
hold = { owner: {}, takenBack: new Set() };
|
|
23360
|
+
holds.set(hub, hold);
|
|
23361
|
+
}
|
|
23362
|
+
return hold;
|
|
23363
|
+
}
|
|
23364
|
+
function isAdoptable(hub, param, namespace) {
|
|
23365
|
+
if (hub.isClaimed(param))
|
|
23366
|
+
return false;
|
|
23367
|
+
if (!hasValue(hub.snapshotQueryParam(param)))
|
|
23368
|
+
return false;
|
|
23369
|
+
return !hasValue(hub.snapshotQueryParam(qdBuildQueryParamKey(namespace, param)));
|
|
23370
|
+
}
|
|
23371
|
+
/**
|
|
23372
|
+
* A key that is present but empty, as in `?orders.page=`, names no value.
|
|
23373
|
+
*/
|
|
23374
|
+
function hasValue(value) {
|
|
23375
|
+
return value !== undefined && value !== '';
|
|
23376
|
+
}
|
|
23377
|
+
function buildPrefixedValues(hub, params, namespace) {
|
|
23378
|
+
const values = {};
|
|
23379
|
+
for (const param of params)
|
|
23380
|
+
values[qdBuildQueryParamKey(namespace, param)] = hub.snapshotQueryParam(param);
|
|
23381
|
+
return values;
|
|
23382
|
+
}
|
|
23383
|
+
function dropPlainKeys(hub, hold, params) {
|
|
23384
|
+
const dropped = {};
|
|
23385
|
+
for (const param of params) {
|
|
23386
|
+
if (!hold.takenBack.delete(param))
|
|
23387
|
+
dropped[param] = undefined;
|
|
23388
|
+
}
|
|
23389
|
+
hub.release(params, hold.owner);
|
|
23390
|
+
hub.write(dropped, { replaceUrl: true });
|
|
23391
|
+
}
|
|
23392
|
+
|
|
23393
|
+
/**
|
|
23394
|
+
* Reserves the query-param keys of one instance and hands back a binding per param.
|
|
23395
|
+
*
|
|
23396
|
+
* An instance with a namespace writes keys prefixed with it, so a table with `uid: 'orders'` writes
|
|
23397
|
+
* `?orders.page=2`. An instance without one writes the plain names, which only one instance per page
|
|
23398
|
+
* can do. An unusable namespace is reported and treated as none.
|
|
23399
|
+
*
|
|
23400
|
+
* Call once per instance.
|
|
23401
|
+
*/
|
|
23402
|
+
function qdBindQueryParams(request) {
|
|
23403
|
+
const { hub, params, ownsNamespace, owner, destroyRef, featureLabel, messageFeature } = request;
|
|
23404
|
+
const namespace = resolveUsableNamespace(request.namespace, messageFeature);
|
|
23405
|
+
if (namespace === undefined) {
|
|
23406
|
+
qdTakeBackPlainAddress(hub, params);
|
|
23407
|
+
const claimed = hub.claim(params, owner, destroyRef, featureLabel);
|
|
23408
|
+
if (claimed)
|
|
23409
|
+
dropRepeatedValues(hub, params);
|
|
23410
|
+
return createBindings(claimed, undefined, []);
|
|
23411
|
+
}
|
|
23412
|
+
if (ownsNamespace === true && !hub.claimNamespace(namespace, owner, messageFeature, destroyRef, featureLabel)) {
|
|
23413
|
+
return createBindings(false, undefined, []);
|
|
23414
|
+
}
|
|
23415
|
+
const prefixed = params.map(param => qdBuildQueryParamKey(namespace, param));
|
|
23416
|
+
if (!hub.claim(prefixed, owner, destroyRef, featureLabel))
|
|
23417
|
+
return createBindings(false, undefined, []);
|
|
23418
|
+
dropRepeatedValues(hub, prefixed);
|
|
23419
|
+
const adoptedParams = qdAdoptPlainAddress({ hub, params, namespace });
|
|
23420
|
+
return createBindings(true, namespace, adoptedParams);
|
|
23421
|
+
}
|
|
23422
|
+
/**
|
|
23423
|
+
* A namespace that cannot stand in a URL is reported and dropped, so the instance writes the plain
|
|
23424
|
+
* keys the way it did before namespaces existed.
|
|
23425
|
+
*/
|
|
23426
|
+
function resolveUsableNamespace(namespace, messageFeature) {
|
|
23427
|
+
if (namespace === undefined || qdIsUsableQueryParamNamespace(namespace))
|
|
23428
|
+
return namespace;
|
|
23429
|
+
console.error(`Quadrel Framework | ${messageFeature} - Config key "uid" must be 1 to ${QD_QUERY_PARAM_NAMESPACE_MAX_LENGTH} characters long and contain only letters, digits, dashes and underscores. Got "${namespace}". The plain query params are used instead.`);
|
|
23430
|
+
return undefined;
|
|
23431
|
+
}
|
|
23432
|
+
/**
|
|
23433
|
+
* Removes params the address carries more than once, since they name no single state.
|
|
23434
|
+
*
|
|
23435
|
+
* Replaces the history entry, so going back still leads where the user came from.
|
|
23436
|
+
*/
|
|
23437
|
+
function dropRepeatedValues(hub, keys) {
|
|
23438
|
+
const repeated = keys.filter(key => hub.hasRepeatedQueryParam(key));
|
|
23439
|
+
if (repeated.length === 0)
|
|
23440
|
+
return;
|
|
23441
|
+
const rewrite = {};
|
|
23442
|
+
repeated.forEach(key => (rewrite[key] = undefined));
|
|
23443
|
+
hub.write(rewrite, { replaceUrl: true });
|
|
23444
|
+
}
|
|
23445
|
+
/**
|
|
23446
|
+
* Angular hands back an array for a repeated key, as in `?sort=a&sort=b`. That counts as absent.
|
|
23447
|
+
*/
|
|
23448
|
+
function readSingleValue(value) {
|
|
23449
|
+
return typeof value === 'string' ? value : undefined;
|
|
23450
|
+
}
|
|
23451
|
+
function createBindings(claimed, namespace, adoptedParams) {
|
|
23452
|
+
return {
|
|
23453
|
+
claimed,
|
|
23454
|
+
namespace,
|
|
23455
|
+
bindingFor: (param) => {
|
|
23456
|
+
const key = qdBuildQueryParamKey(namespace, param);
|
|
23457
|
+
const plainKey = adoptedParams.includes(param) ? param : undefined;
|
|
23458
|
+
return {
|
|
23459
|
+
key,
|
|
23460
|
+
read: (lookup) => {
|
|
23461
|
+
const own = readSingleValue(lookup(key));
|
|
23462
|
+
if (own !== undefined && own !== '')
|
|
23463
|
+
return own;
|
|
23464
|
+
if (plainKey === undefined)
|
|
23465
|
+
return own;
|
|
23466
|
+
return readSingleValue(lookup(plainKey)) ?? own;
|
|
23467
|
+
}
|
|
23468
|
+
};
|
|
23469
|
+
}
|
|
23470
|
+
};
|
|
23471
|
+
}
|
|
23472
|
+
|
|
23473
|
+
/**
|
|
23474
|
+
* Holds the URL namespace of one section, so filter and search share the prefix of its table.
|
|
23475
|
+
*
|
|
23476
|
+
* @deprecated Planned for removal in v22.
|
|
23477
|
+
*/
|
|
23478
|
+
class QdSectionUrlNamespaceService {
|
|
23479
|
+
_namespace;
|
|
23480
|
+
set(namespace) {
|
|
23481
|
+
this._namespace = namespace;
|
|
23482
|
+
}
|
|
23483
|
+
get() {
|
|
23484
|
+
return this._namespace;
|
|
23485
|
+
}
|
|
23486
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdSectionUrlNamespaceService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
23487
|
+
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdSectionUrlNamespaceService });
|
|
23488
|
+
}
|
|
23489
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdSectionUrlNamespaceService, decorators: [{
|
|
23490
|
+
type: Injectable
|
|
23491
|
+
}] });
|
|
23492
|
+
|
|
23153
23493
|
function parseFilterUrlParameter(filterUrlParameter) {
|
|
23154
23494
|
return filterUrlParameter
|
|
23155
23495
|
.split(getNotEscapedSplitRegExp(CATEGORY_SEPARATOR))
|
|
@@ -23177,19 +23517,24 @@ function unescape(escapedString) {
|
|
|
23177
23517
|
}
|
|
23178
23518
|
|
|
23179
23519
|
const FILTER_PARAM_NAME = 'filter';
|
|
23180
|
-
const
|
|
23181
|
-
|
|
23520
|
+
const FEATURE_LABEL$4 = {
|
|
23521
|
+
name: 'Filter',
|
|
23522
|
+
plural: 'filters',
|
|
23523
|
+
hasUid: true,
|
|
23524
|
+
isViewState: true
|
|
23525
|
+
};
|
|
23182
23526
|
/**
|
|
23183
|
-
* Per-view adapter that syncs `QdFilterComponent` selection with
|
|
23184
|
-
*
|
|
23185
|
-
*
|
|
23186
|
-
*
|
|
23187
|
-
* and `router-query-param-hub.integration.cy.ts`.
|
|
23527
|
+
* Per-view adapter that syncs `QdFilterComponent` selection with its filter query param.
|
|
23528
|
+
*
|
|
23529
|
+
* The param carries the namespace of its section, so a filter in a section whose table has
|
|
23530
|
+
* `uid: 'orders'` syncs `?orders.filter=`. Ownership and write batching belong to the hub.
|
|
23188
23531
|
*/
|
|
23189
23532
|
class QdFilterRouterConnectorService {
|
|
23190
23533
|
_filterService = inject(QdFilterService);
|
|
23191
23534
|
_hub = inject(QdRouterQueryParamHubService);
|
|
23535
|
+
_sectionNamespace = inject(QdSectionUrlNamespaceService, { optional: true });
|
|
23192
23536
|
_destroyRef = inject(DestroyRef);
|
|
23537
|
+
_filter;
|
|
23193
23538
|
_connectedFilter;
|
|
23194
23539
|
_readSubscription;
|
|
23195
23540
|
_writeSubscription;
|
|
@@ -23203,7 +23548,7 @@ class QdFilterRouterConnectorService {
|
|
|
23203
23548
|
return of(false);
|
|
23204
23549
|
if (this._connectedFilter === filterComponent)
|
|
23205
23550
|
return this._activatedRouteChecked$;
|
|
23206
|
-
if (!this.
|
|
23551
|
+
if (!this.reserveParamKey())
|
|
23207
23552
|
return of(false);
|
|
23208
23553
|
this._connectedFilter = filterComponent;
|
|
23209
23554
|
this._activatedRouteCheckedSubject = new ReplaySubject(1);
|
|
@@ -23212,6 +23557,20 @@ class QdFilterRouterConnectorService {
|
|
|
23212
23557
|
this.subscribeToFilterChanges();
|
|
23213
23558
|
return this._activatedRouteChecked$;
|
|
23214
23559
|
}
|
|
23560
|
+
reserveParamKey() {
|
|
23561
|
+
const bindings = qdBindQueryParams({
|
|
23562
|
+
hub: this._hub,
|
|
23563
|
+
params: [FILTER_PARAM_NAME],
|
|
23564
|
+
namespace: this._sectionNamespace?.get(),
|
|
23565
|
+
ownsNamespace: false,
|
|
23566
|
+
owner: this,
|
|
23567
|
+
destroyRef: this._destroyRef,
|
|
23568
|
+
featureLabel: FEATURE_LABEL$4,
|
|
23569
|
+
messageFeature: 'QdFilter'
|
|
23570
|
+
});
|
|
23571
|
+
this._filter = bindings.bindingFor(FILTER_PARAM_NAME);
|
|
23572
|
+
return bindings.claimed;
|
|
23573
|
+
}
|
|
23215
23574
|
tearDownConnection() {
|
|
23216
23575
|
this._connectedFilter = undefined;
|
|
23217
23576
|
this._readSubscription?.unsubscribe();
|
|
@@ -23220,7 +23579,7 @@ class QdFilterRouterConnectorService {
|
|
|
23220
23579
|
subscribeToUrlChanges() {
|
|
23221
23580
|
let isFirstEmit = true;
|
|
23222
23581
|
this._readSubscription = this._hub.navigationSettled$
|
|
23223
|
-
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => queryParams[
|
|
23582
|
+
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => this._filter.read(key => queryParams[key])), distinctUntilChanged(), switchMap(rawFilter => this._filterService.selectFilterDataById$(this._connectedFilter.filterId).pipe(take(1), map(filterData => ({ rawFilter, filterData })))), takeUntilDestroyed(this._destroyRef))
|
|
23224
23583
|
.subscribe(({ rawFilter, filterData }) => {
|
|
23225
23584
|
const emptySelection = filterData
|
|
23226
23585
|
.map(category => ({ [category.category]: [] }))
|
|
@@ -23246,9 +23605,9 @@ class QdFilterRouterConnectorService {
|
|
|
23246
23605
|
.pipe(distinctUntilChanged(), switchMap(filterUrlParameter => this._hub.navigationSettled$.pipe(take(1), map(() => filterUrlParameter))), takeUntilDestroyed(this._destroyRef))
|
|
23247
23606
|
.subscribe(filterUrlParameter => {
|
|
23248
23607
|
const target = filterUrlParameter || undefined;
|
|
23249
|
-
if (this._hub.snapshotQueryParam(
|
|
23608
|
+
if (this._hub.snapshotQueryParam(this._filter.key) === target)
|
|
23250
23609
|
return;
|
|
23251
|
-
this._hub.write({ [
|
|
23610
|
+
this._hub.write({ [this._filter.key]: target }, { replaceUrl: true });
|
|
23252
23611
|
});
|
|
23253
23612
|
}
|
|
23254
23613
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdFilterRouterConnectorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -24385,19 +24744,23 @@ function searchReducer(state, action) {
|
|
|
24385
24744
|
|
|
24386
24745
|
const PHRASE_PRESELECT_SEPARATOR = '|';
|
|
24387
24746
|
const SEARCH_PARAM_NAME = 'search';
|
|
24388
|
-
const
|
|
24389
|
-
|
|
24747
|
+
const FEATURE_LABEL$3 = {
|
|
24748
|
+
name: 'Search',
|
|
24749
|
+
plural: 'searches',
|
|
24750
|
+
hasUid: true,
|
|
24751
|
+
isViewState: true
|
|
24752
|
+
};
|
|
24390
24753
|
/**
|
|
24391
|
-
* Per-view adapter that syncs `QdSearchComponent` phrase and preselection with
|
|
24392
|
-
*
|
|
24393
|
-
*
|
|
24394
|
-
*
|
|
24395
|
-
* in `search-router-connector.service.spec.ts` and
|
|
24396
|
-
* `router-query-param-hub.integration.cy.ts`.
|
|
24754
|
+
* Per-view adapter that syncs `QdSearchComponent` phrase and preselection with its search param.
|
|
24755
|
+
*
|
|
24756
|
+
* The param carries the namespace of its section, so a search in a section whose table has
|
|
24757
|
+
* `uid: 'orders'` syncs `?orders.search=`. Ownership and write batching belong to the hub.
|
|
24397
24758
|
*/
|
|
24398
24759
|
class QdSearchRouterConnectorService {
|
|
24399
24760
|
_hub = inject(QdRouterQueryParamHubService);
|
|
24761
|
+
_sectionNamespace = inject(QdSectionUrlNamespaceService, { optional: true });
|
|
24400
24762
|
_destroyRef = inject(DestroyRef);
|
|
24763
|
+
_search;
|
|
24401
24764
|
_connectedSearch;
|
|
24402
24765
|
_readSubscription;
|
|
24403
24766
|
_writeSubscription;
|
|
@@ -24411,7 +24774,7 @@ class QdSearchRouterConnectorService {
|
|
|
24411
24774
|
return of(false);
|
|
24412
24775
|
if (this._connectedSearch === searchComponent)
|
|
24413
24776
|
return this._activatedRouteChecked$;
|
|
24414
|
-
if (!this.
|
|
24777
|
+
if (!this.reserveParamKey())
|
|
24415
24778
|
return of(false);
|
|
24416
24779
|
this._connectedSearch = searchComponent;
|
|
24417
24780
|
this._activatedRouteCheckedSubject = new ReplaySubject(1);
|
|
@@ -24420,6 +24783,20 @@ class QdSearchRouterConnectorService {
|
|
|
24420
24783
|
this.subscribeToSearchChanges();
|
|
24421
24784
|
return this._activatedRouteChecked$;
|
|
24422
24785
|
}
|
|
24786
|
+
reserveParamKey() {
|
|
24787
|
+
const bindings = qdBindQueryParams({
|
|
24788
|
+
hub: this._hub,
|
|
24789
|
+
params: [SEARCH_PARAM_NAME],
|
|
24790
|
+
namespace: this._sectionNamespace?.get(),
|
|
24791
|
+
ownsNamespace: false,
|
|
24792
|
+
owner: this,
|
|
24793
|
+
destroyRef: this._destroyRef,
|
|
24794
|
+
featureLabel: FEATURE_LABEL$3,
|
|
24795
|
+
messageFeature: 'QdSearch'
|
|
24796
|
+
});
|
|
24797
|
+
this._search = bindings.bindingFor(SEARCH_PARAM_NAME);
|
|
24798
|
+
return bindings.claimed;
|
|
24799
|
+
}
|
|
24423
24800
|
tearDownConnection() {
|
|
24424
24801
|
this._connectedSearch = undefined;
|
|
24425
24802
|
this._readSubscription?.unsubscribe();
|
|
@@ -24428,7 +24805,7 @@ class QdSearchRouterConnectorService {
|
|
|
24428
24805
|
subscribeToUrlChanges() {
|
|
24429
24806
|
let isFirstEmit = true;
|
|
24430
24807
|
this._readSubscription = this._hub.navigationSettled$
|
|
24431
|
-
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => queryParams[
|
|
24808
|
+
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => this._search.read(key => queryParams[key])), distinctUntilChanged(), takeUntilDestroyed(this._destroyRef))
|
|
24432
24809
|
.subscribe(rawSearch => {
|
|
24433
24810
|
if (typeof rawSearch === 'string' && this._connectedSearch) {
|
|
24434
24811
|
const [phrase, preSelect] = rawSearch
|
|
@@ -24451,9 +24828,9 @@ class QdSearchRouterConnectorService {
|
|
|
24451
24828
|
this._writeSubscription = this._connectedSearch.searchService.searchPostBody$.pipe(switchMap(searchData => this._hub.navigationSettled$.pipe(take(1), map(() => searchData))), takeUntilDestroyed(this._destroyRef)).subscribe(({ phrase, preSelect }) => {
|
|
24452
24829
|
const serialized = this.escape(phrase) + (preSelect ? PHRASE_PRESELECT_SEPARATOR + this.escape(preSelect) : '');
|
|
24453
24830
|
const target = serialized || undefined;
|
|
24454
|
-
if (this._hub.snapshotQueryParam(
|
|
24831
|
+
if (this._hub.snapshotQueryParam(this._search.key) === target)
|
|
24455
24832
|
return;
|
|
24456
|
-
this._hub.write({ [
|
|
24833
|
+
this._hub.write({ [this._search.key]: target }, { replaceUrl: false });
|
|
24457
24834
|
});
|
|
24458
24835
|
}
|
|
24459
24836
|
getNotEscapedSplitRegExp() {
|
|
@@ -26163,6 +26540,77 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
26163
26540
|
type: Injectable
|
|
26164
26541
|
}] });
|
|
26165
26542
|
|
|
26543
|
+
const SORT_PARAM_NAME$1 = 'sort';
|
|
26544
|
+
const PAGE_PARAM_NAME$1 = 'page';
|
|
26545
|
+
const SIZE_PARAM_NAME$1 = 'size';
|
|
26546
|
+
const FEATURE_LABEL$2 = {
|
|
26547
|
+
name: 'Table',
|
|
26548
|
+
plural: 'tables',
|
|
26549
|
+
hasUid: true,
|
|
26550
|
+
isViewState: true
|
|
26551
|
+
};
|
|
26552
|
+
/**
|
|
26553
|
+
* Decides once per table which query-param keys it uses, and hands a binding to every adapter.
|
|
26554
|
+
*
|
|
26555
|
+
* Sort and pagination connect in different lifecycle phases. Deciding per adapter would let one
|
|
26556
|
+
* table end up with `sort` and `orders.page` at the same time, so the choice is made here.
|
|
26557
|
+
*
|
|
26558
|
+
* Provided per table. The first `reserve()` settles it; later calls return the same outcome.
|
|
26559
|
+
*/
|
|
26560
|
+
class QdTableUrlNamespaceService {
|
|
26561
|
+
_hub = inject(QdRouterQueryParamHubService);
|
|
26562
|
+
_sectionNamespace = inject(QdSectionUrlNamespaceService, { optional: true });
|
|
26563
|
+
_destroyRef = inject(DestroyRef);
|
|
26564
|
+
_bindings;
|
|
26565
|
+
_isSettled = false;
|
|
26566
|
+
/**
|
|
26567
|
+
* Reserves every key this table needs, in one go. Only the keys the config actually syncs.
|
|
26568
|
+
*/
|
|
26569
|
+
reserve(config) {
|
|
26570
|
+
if (this._isSettled)
|
|
26571
|
+
return this._bindings?.claimed === true;
|
|
26572
|
+
this._isSettled = true;
|
|
26573
|
+
const params = this.collectSyncedParams(config);
|
|
26574
|
+
if (params.length === 0)
|
|
26575
|
+
return false;
|
|
26576
|
+
this._bindings = qdBindQueryParams({
|
|
26577
|
+
hub: this._hub,
|
|
26578
|
+
params,
|
|
26579
|
+
namespace: config.uid,
|
|
26580
|
+
ownsNamespace: true,
|
|
26581
|
+
owner: this,
|
|
26582
|
+
destroyRef: this._destroyRef,
|
|
26583
|
+
featureLabel: FEATURE_LABEL$2,
|
|
26584
|
+
messageFeature: 'QdTable'
|
|
26585
|
+
});
|
|
26586
|
+
if (this._bindings.claimed && this._bindings.namespace)
|
|
26587
|
+
this._sectionNamespace?.set(this._bindings.namespace);
|
|
26588
|
+
return this._bindings.claimed;
|
|
26589
|
+
}
|
|
26590
|
+
/**
|
|
26591
|
+
* Call only after `reserve()` returned true.
|
|
26592
|
+
*/
|
|
26593
|
+
bindingFor(param) {
|
|
26594
|
+
return this._bindings.bindingFor(param);
|
|
26595
|
+
}
|
|
26596
|
+
collectSyncedParams(config) {
|
|
26597
|
+
const params = [];
|
|
26598
|
+
const sort = config.sort;
|
|
26599
|
+
const pagination = config.pagination;
|
|
26600
|
+
if (typeof sort === 'object' && sort.connectWithRouter === true)
|
|
26601
|
+
params.push(SORT_PARAM_NAME$1);
|
|
26602
|
+
if (typeof pagination === 'object' && pagination.connectWithRouter === true) {
|
|
26603
|
+
params.push(PAGE_PARAM_NAME$1, SIZE_PARAM_NAME$1);
|
|
26604
|
+
}
|
|
26605
|
+
return params;
|
|
26606
|
+
}
|
|
26607
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdTableUrlNamespaceService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
26608
|
+
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdTableUrlNamespaceService });
|
|
26609
|
+
}
|
|
26610
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdTableUrlNamespaceService, decorators: [{
|
|
26611
|
+
type: Injectable
|
|
26612
|
+
}] });
|
|
26613
|
+
|
|
26166
26614
|
class QdTableSecondaryActionsService {
|
|
26167
26615
|
_configSubject = new ReplaySubject(1);
|
|
26168
26616
|
set configs(config) {
|
|
@@ -26188,8 +26636,6 @@ var QdPaginatorDirection;
|
|
|
26188
26636
|
|
|
26189
26637
|
const PAGE_PARAM_NAME = 'page';
|
|
26190
26638
|
const SIZE_PARAM_NAME = 'size';
|
|
26191
|
-
const OWNED_PARAMS$2 = [PAGE_PARAM_NAME, SIZE_PARAM_NAME];
|
|
26192
|
-
const FEATURE_LABEL$2 = { name: 'Table', plural: 'tables' };
|
|
26193
26639
|
const SIZE_SANITY_MAX = 1000;
|
|
26194
26640
|
/**
|
|
26195
26641
|
* Per-view adapter that syncs `QdTablePaginatorComponent` page and size with the URL
|
|
@@ -26197,10 +26643,11 @@ const SIZE_SANITY_MAX = 1000;
|
|
|
26197
26643
|
* synchronously on connect (so cross-adapter store reducers cannot stomp on the deep-linked
|
|
26198
26644
|
* page), then keeps store and URL in sync. Coordination, ownership, and write batching are
|
|
26199
26645
|
* delegated to the hub — see its JSDoc for details. Behavior contracts live in
|
|
26200
|
-
* `pagination-router-connector.service.spec.ts` and `router-query-param-hub.
|
|
26646
|
+
* `pagination-router-connector.service.spec.ts` and `router-query-param-hub.service.cy.ts`.
|
|
26201
26647
|
*/
|
|
26202
26648
|
class QdTablePaginationRouterConnectorService {
|
|
26203
26649
|
_hub = inject(QdRouterQueryParamHubService);
|
|
26650
|
+
_namespaceService = inject(QdTableUrlNamespaceService);
|
|
26204
26651
|
_destroyRef = inject(DestroyRef);
|
|
26205
26652
|
_connection;
|
|
26206
26653
|
_readSubscription;
|
|
@@ -26208,14 +26655,18 @@ class QdTablePaginationRouterConnectorService {
|
|
|
26208
26655
|
_activatedRouteCheckedSubject = new ReplaySubject(1);
|
|
26209
26656
|
_activatedRouteChecked$ = this._activatedRouteCheckedSubject.asObservable();
|
|
26210
26657
|
_hasInitialUrlBeenSet = false;
|
|
26658
|
+
_page;
|
|
26659
|
+
_size;
|
|
26211
26660
|
constructor() {
|
|
26212
26661
|
this._destroyRef.onDestroy(() => this.tearDownConnection());
|
|
26213
26662
|
}
|
|
26214
26663
|
connectPaginationWithRouter(paginator, tableStoreService) {
|
|
26215
26664
|
if (!paginator.shouldConnectWithRouter() || !this._hub.isAvailable())
|
|
26216
26665
|
return of(false);
|
|
26217
|
-
if (!this.
|
|
26666
|
+
if (!this._namespaceService.reserve(paginator.config))
|
|
26218
26667
|
return of(false);
|
|
26668
|
+
this._page = this._namespaceService.bindingFor(PAGE_PARAM_NAME);
|
|
26669
|
+
this._size = this._namespaceService.bindingFor(SIZE_PARAM_NAME);
|
|
26219
26670
|
this._connection = {
|
|
26220
26671
|
paginator: paginator,
|
|
26221
26672
|
tableStoreService: tableStoreService
|
|
@@ -26230,10 +26681,7 @@ class QdTablePaginationRouterConnectorService {
|
|
|
26230
26681
|
}
|
|
26231
26682
|
applyInitialUrlSynchronously() {
|
|
26232
26683
|
const { tableStoreService, paginator } = this._connection;
|
|
26233
|
-
const params = this.parseUrlParams(
|
|
26234
|
-
[PAGE_PARAM_NAME]: this._hub.snapshotQueryParam(PAGE_PARAM_NAME),
|
|
26235
|
-
[SIZE_PARAM_NAME]: this._hub.snapshotQueryParam(SIZE_PARAM_NAME)
|
|
26236
|
-
});
|
|
26684
|
+
const params = this.parseUrlParams(key => this._hub.snapshotQueryParam(key));
|
|
26237
26685
|
const pageSize = params.size ?? paginator.getPageSizeDefault();
|
|
26238
26686
|
const pageIndex = params.page !== undefined ? params.page - 1 : 0;
|
|
26239
26687
|
let currentInfo;
|
|
@@ -26260,7 +26708,7 @@ class QdTablePaginationRouterConnectorService {
|
|
|
26260
26708
|
const { tableStoreService } = this._connection;
|
|
26261
26709
|
let isFirstEmit = true;
|
|
26262
26710
|
this._readSubscription = this._hub.navigationSettled$
|
|
26263
|
-
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => this.parseUrlParams(queryParams)), distinctUntilChanged((a, b) => a.page === b.page && a.size === b.size), switchMap(params => combineLatest([tableStoreService.pageChangeInfo$(), tableStoreService.totalCount$()]).pipe(take(1), map(([currentInfo, totalCount]) => ({ params, currentInfo, totalCount })))))
|
|
26711
|
+
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => this.parseUrlParams(key => queryParams[key])), distinctUntilChanged((a, b) => a.page === b.page && a.size === b.size), switchMap(params => combineLatest([tableStoreService.pageChangeInfo$(), tableStoreService.totalCount$()]).pipe(take(1), map(([currentInfo, totalCount]) => ({ params, currentInfo, totalCount })))))
|
|
26264
26712
|
.subscribe(({ params, currentInfo, totalCount }) => {
|
|
26265
26713
|
const target = this.toStoreState(params);
|
|
26266
26714
|
const isChanged = !currentInfo || currentInfo.pageIndex !== target.pageIndex || currentInfo.pageSize !== target.pageSize;
|
|
@@ -26285,19 +26733,19 @@ class QdTablePaginationRouterConnectorService {
|
|
|
26285
26733
|
this._hasInitialUrlBeenSet = true;
|
|
26286
26734
|
const targetPage = String(pageIndex + 1);
|
|
26287
26735
|
const targetSize = String(pageSize);
|
|
26288
|
-
const urlAlreadyMatches = this._hub.snapshotQueryParam(
|
|
26289
|
-
this._hub.snapshotQueryParam(
|
|
26736
|
+
const urlAlreadyMatches = this._hub.snapshotQueryParam(this._page.key) === targetPage &&
|
|
26737
|
+
this._hub.snapshotQueryParam(this._size.key) === targetSize;
|
|
26290
26738
|
if (urlAlreadyMatches)
|
|
26291
26739
|
return;
|
|
26292
|
-
this._hub.write({ [
|
|
26740
|
+
this._hub.write({ [this._page.key]: targetPage, [this._size.key]: targetSize }, { replaceUrl });
|
|
26293
26741
|
}
|
|
26294
|
-
parseUrlParams(
|
|
26742
|
+
parseUrlParams(lookup) {
|
|
26295
26743
|
const result = {};
|
|
26296
|
-
const rawPage =
|
|
26744
|
+
const rawPage = this._page.read(lookup);
|
|
26297
26745
|
if (typeof rawPage === 'string' && this.isValidPositiveIntegerString(rawPage)) {
|
|
26298
26746
|
result.page = Number(rawPage);
|
|
26299
26747
|
}
|
|
26300
|
-
const rawSize =
|
|
26748
|
+
const rawSize = this._size.read(lookup);
|
|
26301
26749
|
if (typeof rawSize === 'string' &&
|
|
26302
26750
|
this.isValidPositiveIntegerString(rawSize) &&
|
|
26303
26751
|
this.isValidSize(Number(rawSize))) {
|
|
@@ -26662,8 +27110,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
26662
27110
|
}] } });
|
|
26663
27111
|
|
|
26664
27112
|
const SORT_PARAM_NAME = 'sort';
|
|
26665
|
-
const OWNED_PARAMS$1 = [SORT_PARAM_NAME];
|
|
26666
|
-
const FEATURE_LABEL$1 = { name: 'Table', plural: 'tables' };
|
|
26667
27113
|
const SEGMENT_SEPARATOR = ',';
|
|
26668
27114
|
const COLUMN_DIRECTION_SEPARATOR = '.';
|
|
26669
27115
|
/**
|
|
@@ -26672,10 +27118,11 @@ const COLUMN_DIRECTION_SEPARATOR = '.';
|
|
|
26672
27118
|
* only; multi-segment URLs use the first valid entry and warn), writes when the store's
|
|
26673
27119
|
* `tableSort$` selector emits. Coordination, ownership, and write batching are delegated
|
|
26674
27120
|
* to the hub — see its JSDoc for details. Behavior contracts live in
|
|
26675
|
-
* `sort-router-connector.service.spec.ts` and `router-query-param-hub.
|
|
27121
|
+
* `sort-router-connector.service.spec.ts` and `router-query-param-hub.service.cy.ts`.
|
|
26676
27122
|
*/
|
|
26677
27123
|
class QdTableSortRouterConnectorService {
|
|
26678
27124
|
_hub = inject(QdRouterQueryParamHubService);
|
|
27125
|
+
_namespaceService = inject(QdTableUrlNamespaceService);
|
|
26679
27126
|
_destroyRef = inject(DestroyRef);
|
|
26680
27127
|
_connection;
|
|
26681
27128
|
_readSubscription;
|
|
@@ -26684,14 +27131,16 @@ class QdTableSortRouterConnectorService {
|
|
|
26684
27131
|
_activatedRouteChecked$ = this._activatedRouteCheckedSubject.asObservable();
|
|
26685
27132
|
_hasInitialUrlBeenSet = false;
|
|
26686
27133
|
_hasWarnedMultiSegment = false;
|
|
27134
|
+
_sort;
|
|
26687
27135
|
constructor() {
|
|
26688
27136
|
this._destroyRef.onDestroy(() => this.tearDownConnection());
|
|
26689
27137
|
}
|
|
26690
27138
|
connectSortWithRouter(table, tableStoreService) {
|
|
26691
27139
|
if (!this.shouldConnect(table) || !this._hub.isAvailable())
|
|
26692
27140
|
return of(false);
|
|
26693
|
-
if (!this.
|
|
27141
|
+
if (!this._namespaceService.reserve(table.config))
|
|
26694
27142
|
return of(false);
|
|
27143
|
+
this._sort = this._namespaceService.bindingFor(SORT_PARAM_NAME);
|
|
26695
27144
|
this._connection = {
|
|
26696
27145
|
table: table,
|
|
26697
27146
|
tableStoreService: tableStoreService,
|
|
@@ -26716,7 +27165,7 @@ class QdTableSortRouterConnectorService {
|
|
|
26716
27165
|
const { tableStoreService } = this._connection;
|
|
26717
27166
|
let isFirstEmit = true;
|
|
26718
27167
|
this._readSubscription = this._hub.navigationSettled$
|
|
26719
|
-
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => (
|
|
27168
|
+
.pipe(switchMap(() => this._hub.queryParams()), map(queryParams => this._sort.read(key => queryParams[key]) ?? ''), distinctUntilChanged(), map(raw => this.parseRawSortValue(raw)), withLatestFrom(tableStoreService.tableSort$()))
|
|
26720
27169
|
.subscribe(([segments, currentSort]) => {
|
|
26721
27170
|
if (segments.length === 1) {
|
|
26722
27171
|
const [{ column, direction }] = segments;
|
|
@@ -26746,9 +27195,9 @@ class QdTableSortRouterConnectorService {
|
|
|
26746
27195
|
writeUrl(serialized) {
|
|
26747
27196
|
const replaceUrl = !this._hasInitialUrlBeenSet;
|
|
26748
27197
|
this._hasInitialUrlBeenSet = true;
|
|
26749
|
-
if (this._hub.snapshotQueryParam(
|
|
27198
|
+
if (this._hub.snapshotQueryParam(this._sort.key) === serialized)
|
|
26750
27199
|
return;
|
|
26751
|
-
this._hub.write({ [
|
|
27200
|
+
this._hub.write({ [this._sort.key]: serialized }, { replaceUrl });
|
|
26752
27201
|
}
|
|
26753
27202
|
shouldConnect(table) {
|
|
26754
27203
|
const sortConfig = table.config.sort;
|
|
@@ -27740,6 +28189,7 @@ class QdTableComponent {
|
|
|
27740
28189
|
QdTableScrollAnchorService,
|
|
27741
28190
|
QdTableResolverService,
|
|
27742
28191
|
QdTableExternalActionResultService,
|
|
28192
|
+
QdTableUrlNamespaceService,
|
|
27743
28193
|
QdTableSortRouterConnectorService
|
|
27744
28194
|
], viewQueries: [{ propertyName: "paginator", first: true, predicate: QdTablePaginatorComponent, descendants: true }], usesOnChanges: true, ngImport: i0, template: "<table [class]=\"'qd-table__table'\" [attr.data-test-id]=\"testId + '-element'\">\n <tr qd-table-head [config]=\"config\" [data-test-id]=\"testId\"></tr>\n <tbody qd-table-body [config]=\"config\" [data]=\"(data$ | async) ?? []\" [data-test-id]=\"testId\"></tbody>\n</table>\n\n@if (hasPagination) {\n<qd-table-paginator [config]=\"config\" [data-test-id]=\"testId\"></qd-table-paginator>\n} @if (hasEmptyStateView$ | async) {\n<qd-table-empty-state [config]=\"config.emptyStateView\"></qd-table-empty-state>\n}\n", styles: [":host{display:inline-flex;flex-direction:column}:host .qd-table__table{background:#fff;border-spacing:0;color:#171717;font-size:.875rem;font-weight:400;line-height:2.5rem}:host .qd-table__head,:host .qd-table__body{vertical-align:center}:host .qd-table__head{background:#e5e5e5;text-align:left}:host .qd-table__head ::ng-deep .qd-table__head-cell{font-weight:600}:host .qd-table__body{color:#171717}:host ::ng-deep .qd-table__head-cell,:host ::ng-deep .qd-table__body-cell{padding:.125rem 1rem 0;vertical-align:top}:host ::ng-deep .qd-table__head-cell--selection,:host ::ng-deep .qd-table__body-cell--selection{width:1.875rem;padding-top:.1875rem;text-align:center}:host ::ng-deep .qd-table__head-cell--actions-inline-menu,:host ::ng-deep .qd-table__body-cell--actions-inline-menu{padding-top:.125rem;vertical-align:top}:host.main-column-fills-width.table-has-remaining-width:not(.table-has-right-aligned-filling-column) ::ng-deep th.main-column,:host.main-column-fills-width.table-has-remaining-width:not(.table-has-right-aligned-filling-column) ::ng-deep td.main-column{width:100%}:host.main-column-fills-width.table-has-remaining-width ::ng-deep th:not(.main-column),:host.main-column-fills-width.table-has-remaining-width ::ng-deep td:not(.main-column){white-space:nowrap}:host.last-column-fills-width.table-has-remaining-width:not(.table-has-right-aligned-filling-column) ::ng-deep th.last-column,:host.last-column-fills-width.table-has-remaining-width:not(.table-has-right-aligned-filling-column) ::ng-deep td.last-column{width:100%}:host.last-column-fills-width.table-has-remaining-width ::ng-deep th:not(.last-column),:host.last-column-fills-width.table-has-remaining-width ::ng-deep td:not(.last-column){white-space:nowrap}:host.harmonized{width:100%}\n"], dependencies: [{ kind: "component", type: QdTableBodyComponent, selector: "[qd-table-body]", inputs: ["config", "data", "data-test-id"] }, { kind: "component", type: QdTableEmptyStateComponent, selector: "qd-table-empty-state", inputs: ["config"] }, { kind: "component", type: QdTableHeadComponent, selector: "[qd-table-head]", inputs: ["config", "data-test-id"] }, { kind: "component", type: QdTablePaginatorComponent, selector: "qd-table-paginator", inputs: ["config", "data-test-id"] }, { kind: "pipe", type: i1$1.AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
27745
28195
|
}
|
|
@@ -27756,6 +28206,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
27756
28206
|
QdTableScrollAnchorService,
|
|
27757
28207
|
QdTableResolverService,
|
|
27758
28208
|
QdTableExternalActionResultService,
|
|
28209
|
+
QdTableUrlNamespaceService,
|
|
27759
28210
|
QdTableSortRouterConnectorService
|
|
27760
28211
|
], changeDetection: ChangeDetectionStrategy.OnPush, host: {
|
|
27761
28212
|
'[class.qd-table]': 'true',
|
|
@@ -28511,11 +28962,11 @@ class QdSectionComponent {
|
|
|
28511
28962
|
this._outputSubscriptions = [];
|
|
28512
28963
|
}
|
|
28513
28964
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdSectionComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
28514
|
-
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.17", type: QdSectionComponent, isStandalone: false, selector: "qd-section", inputs: { config: "config" }, outputs: { searchQueryStringOutput: "searchQueryStringOutput", searchPostBodyOutput: "searchPostBodyOutput", actionOutput: "actionOutput", filterQueryStringOutput: "filterQueryStringOutput", filterPostBodyOutput: "filterPostBodyOutput", filterValueChangeOutput: "filterValueChangeOutput" }, host: { properties: { "class.no-horizontal-padding-mobile": "noHorizontalPaddingMobile" }, classAttribute: "qd-section" }, providers: [QdSectionToolbarActionService, QdSearchService, QdToolbarComponentsService], usesOnChanges: true, ngImport: i0, template: "<section>\n <qd-section-toolbar [className]=\"'qd-section__toolbar'\" [config]=\"config\"></qd-section-toolbar>\n\n @if (!config.collapse?.isContentHidden) {\n <div class=\"qd-section__content\"><ng-content></ng-content></div>\n }\n</section>\n", styles: ["qd-section{display:block;padding:1rem 1.25rem;background-color:#efefef}@media(max-width:599.98px){qd-section.no-horizontal-padding-mobile{padding:.9375rem 0 3.125rem}qd-section.no-horizontal-padding-mobile qd-section-toolbar{margin:0 .9375rem .3125rem}}.qd-section{display:block}.qd-section:has(+.qd-section){border-bottom:rgb(213,213,213) solid .0625rem}@media(max-width:959.98px){.qd-section{padding:.75rem}}\n"], dependencies: [{ kind: "component", type: QdSectionToolbarComponent, selector: "qd-section-toolbar", inputs: ["config"] }], encapsulation: i0.ViewEncapsulation.None });
|
|
28965
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.17", type: QdSectionComponent, isStandalone: false, selector: "qd-section", inputs: { config: "config" }, outputs: { searchQueryStringOutput: "searchQueryStringOutput", searchPostBodyOutput: "searchPostBodyOutput", actionOutput: "actionOutput", filterQueryStringOutput: "filterQueryStringOutput", filterPostBodyOutput: "filterPostBodyOutput", filterValueChangeOutput: "filterValueChangeOutput" }, host: { properties: { "class.no-horizontal-padding-mobile": "noHorizontalPaddingMobile" }, classAttribute: "qd-section" }, providers: [QdSectionToolbarActionService, QdSearchService, QdToolbarComponentsService, QdSectionUrlNamespaceService], usesOnChanges: true, ngImport: i0, template: "<section>\n <qd-section-toolbar [className]=\"'qd-section__toolbar'\" [config]=\"config\"></qd-section-toolbar>\n\n @if (!config.collapse?.isContentHidden) {\n <div class=\"qd-section__content\"><ng-content></ng-content></div>\n }\n</section>\n", styles: ["qd-section{display:block;padding:1rem 1.25rem;background-color:#efefef}@media(max-width:599.98px){qd-section.no-horizontal-padding-mobile{padding:.9375rem 0 3.125rem}qd-section.no-horizontal-padding-mobile qd-section-toolbar{margin:0 .9375rem .3125rem}}.qd-section{display:block}.qd-section:has(+.qd-section){border-bottom:rgb(213,213,213) solid .0625rem}@media(max-width:959.98px){.qd-section{padding:.75rem}}\n"], dependencies: [{ kind: "component", type: QdSectionToolbarComponent, selector: "qd-section-toolbar", inputs: ["config"] }], encapsulation: i0.ViewEncapsulation.None });
|
|
28515
28966
|
}
|
|
28516
28967
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdSectionComponent, decorators: [{
|
|
28517
28968
|
type: Component,
|
|
28518
|
-
args: [{ selector: 'qd-section', providers: [QdSectionToolbarActionService, QdSearchService, QdToolbarComponentsService], host: {
|
|
28969
|
+
args: [{ selector: 'qd-section', providers: [QdSectionToolbarActionService, QdSearchService, QdToolbarComponentsService, QdSectionUrlNamespaceService], host: {
|
|
28519
28970
|
class: 'qd-section',
|
|
28520
28971
|
'[class.no-horizontal-padding-mobile]': 'noHorizontalPaddingMobile'
|
|
28521
28972
|
}, encapsulation: ViewEncapsulation.None, standalone: false, template: "<section>\n <qd-section-toolbar [className]=\"'qd-section__toolbar'\" [config]=\"config\"></qd-section-toolbar>\n\n @if (!config.collapse?.isContentHidden) {\n <div class=\"qd-section__content\"><ng-content></ng-content></div>\n }\n</section>\n", styles: ["qd-section{display:block;padding:1rem 1.25rem;background-color:#efefef}@media(max-width:599.98px){qd-section.no-horizontal-padding-mobile{padding:.9375rem 0 3.125rem}qd-section.no-horizontal-padding-mobile qd-section-toolbar{margin:0 .9375rem .3125rem}}.qd-section{display:block}.qd-section:has(+.qd-section){border-bottom:rgb(213,213,213) solid .0625rem}@media(max-width:959.98px){.qd-section{padding:.75rem}}\n"] }]
|
|
@@ -32161,14 +32612,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
32161
32612
|
|
|
32162
32613
|
const TAB_PARAM_NAME = 'tab';
|
|
32163
32614
|
const OWNED_PARAMS = [TAB_PARAM_NAME];
|
|
32164
|
-
const FEATURE_LABEL = { name: 'Page Tabs', plural: 'page tabs' };
|
|
32615
|
+
const FEATURE_LABEL$1 = { name: 'Page Tabs', plural: 'page tabs', isViewState: true };
|
|
32165
32616
|
/**
|
|
32166
32617
|
* Per-view adapter that syncs `QdPageTabsComponent` selection with the URL `?tab=` query
|
|
32167
32618
|
* param via `QdRouterQueryParamHubService`. Reads on activation and selects the matching
|
|
32168
32619
|
* tab (with fallback for unknown/disabled names), writes on `tabSelection`. Coordination,
|
|
32169
32620
|
* ownership, and write batching are delegated to the hub — see its JSDoc for details.
|
|
32170
32621
|
* Behavior contracts live in `page-tabs-router-connector.service.spec.ts` and
|
|
32171
|
-
* `router-query-param-hub.
|
|
32622
|
+
* `router-query-param-hub.service.cy.ts`.
|
|
32172
32623
|
*
|
|
32173
32624
|
* Note: this is the only connector that writes synchronously without gating on
|
|
32174
32625
|
* `navigationSettled$`. Required for the deep-link case where `ngAfterViewInit` fires
|
|
@@ -32192,7 +32643,7 @@ class QdPageTabsRouterConnectorService {
|
|
|
32192
32643
|
return of(false);
|
|
32193
32644
|
if (this._connectedComponent === component)
|
|
32194
32645
|
return this._activatedRouteChecked$;
|
|
32195
|
-
if (!this._hub.claim(OWNED_PARAMS, this, this._destroyRef, FEATURE_LABEL))
|
|
32646
|
+
if (!this._hub.claim(OWNED_PARAMS, this, this._destroyRef, FEATURE_LABEL$1))
|
|
32196
32647
|
return of(false);
|
|
32197
32648
|
this._connectedComponent = component;
|
|
32198
32649
|
this._hasInitialUrlBeenSet = false;
|
|
@@ -33991,14 +34442,19 @@ const loadJavascriptAsset = (path, scriptElementAttributes = {}) => {
|
|
|
33991
34442
|
};
|
|
33992
34443
|
|
|
33993
34444
|
// @ts-strict-ignore
|
|
34445
|
+
const LANG_PARAM_NAME = 'lang';
|
|
34446
|
+
const FEATURE_LABEL = { name: 'Shell', plural: 'shells', isViewState: false };
|
|
33994
34447
|
class QdLanguageFromUrlService {
|
|
33995
34448
|
router = inject(Router, { optional: true });
|
|
33996
34449
|
activatedRoute = inject(ActivatedRoute, { optional: true });
|
|
34450
|
+
_hub = inject(QdRouterQueryParamHubService);
|
|
33997
34451
|
_navigationPending$;
|
|
33998
34452
|
_navigationEnded$;
|
|
34453
|
+
_ownsLangParam = false;
|
|
33999
34454
|
constructor() {
|
|
34000
34455
|
if (!this.router || !this.activatedRoute)
|
|
34001
34456
|
return;
|
|
34457
|
+
this._ownsLangParam = this._hub.isAvailable() && this._hub.claim([LANG_PARAM_NAME], this, undefined, FEATURE_LABEL);
|
|
34002
34458
|
const navigationPendingSubject = new ReplaySubject(1);
|
|
34003
34459
|
this._navigationPending$ = navigationPendingSubject.asObservable();
|
|
34004
34460
|
this._navigationEnded$ = this._navigationPending$.pipe(filter(navigationPending => !navigationPending));
|
|
@@ -34021,14 +34477,14 @@ class QdLanguageFromUrlService {
|
|
|
34021
34477
|
return this._navigationEnded$.pipe(switchMap(() => this.activatedRoute.queryParams), filter(queryParams => queryParams.hasOwnProperty('lang')), map(queryParams => queryParams['lang']));
|
|
34022
34478
|
}
|
|
34023
34479
|
removeLangParameterFromUrlAfterNavigation() {
|
|
34480
|
+
if (!this.router || !this.activatedRoute)
|
|
34481
|
+
return;
|
|
34024
34482
|
this._navigationPending$
|
|
34025
34483
|
.pipe(debounceTime(300), filter(navigationPending => !navigationPending), switchMap(() => this.activatedRoute.queryParams), take(1))
|
|
34026
34484
|
.subscribe(queryParams => {
|
|
34027
|
-
if (!queryParams[
|
|
34485
|
+
if (!queryParams[LANG_PARAM_NAME] || !this._ownsLangParam)
|
|
34028
34486
|
return;
|
|
34029
|
-
|
|
34030
|
-
delete newQueryParams['lang'];
|
|
34031
|
-
this.router.navigate([], { relativeTo: this.activatedRoute, queryParams: newQueryParams, replaceUrl: true });
|
|
34487
|
+
this._hub.write({ [LANG_PARAM_NAME]: undefined }, { replaceUrl: true });
|
|
34032
34488
|
});
|
|
34033
34489
|
}
|
|
34034
34490
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.17", ngImport: i0, type: QdLanguageFromUrlService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -34561,6 +35017,27 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
34561
35017
|
type: Injectable
|
|
34562
35018
|
}] });
|
|
34563
35019
|
|
|
35020
|
+
const MARKER = '__qdBackToOverview';
|
|
35021
|
+
/**
|
|
35022
|
+
* Marks a shell back link so the overview comes back the way the user left it — same filter, sort
|
|
35023
|
+
* and page.
|
|
35024
|
+
*
|
|
35025
|
+
* Put it in the route data of the detail page. Route params such as `:orderId` are substituted as
|
|
35026
|
+
* usual. Nothing is restored after a reload, because the memory lives in the browser tab only.
|
|
35027
|
+
*
|
|
35028
|
+
* @example data: { previousHref: qdBackToOverview('/orders') }
|
|
35029
|
+
*/
|
|
35030
|
+
function qdBackToOverview(path) {
|
|
35031
|
+
const href = () => path;
|
|
35032
|
+
return Object.defineProperty(href, MARKER, { value: true });
|
|
35033
|
+
}
|
|
35034
|
+
/**
|
|
35035
|
+
* Tells whether a resolved back link asked for its params to be restored.
|
|
35036
|
+
*/
|
|
35037
|
+
function qdRestoresOverviewAddress(previousHref) {
|
|
35038
|
+
return typeof previousHref === 'function' && previousHref[MARKER] === true;
|
|
35039
|
+
}
|
|
35040
|
+
|
|
34564
35041
|
// @ts-strict-ignore
|
|
34565
35042
|
class QdShellToolbarItemComponent {
|
|
34566
35043
|
/**
|
|
@@ -34650,6 +35127,8 @@ class QdShellHeaderComponent {
|
|
|
34650
35127
|
isCommentsDisplayed = false;
|
|
34651
35128
|
isServiceNavigationOpened = true;
|
|
34652
35129
|
_previousHref;
|
|
35130
|
+
_hub = inject(QdRouterQueryParamHubService);
|
|
35131
|
+
_restoresAddress = false;
|
|
34653
35132
|
_routeParams;
|
|
34654
35133
|
_routeParamsSubscription;
|
|
34655
35134
|
_breakpointSubscription;
|
|
@@ -34658,6 +35137,7 @@ class QdShellHeaderComponent {
|
|
|
34658
35137
|
const shellLeftService = this.shellLeftService;
|
|
34659
35138
|
const shellRightService = this.shellRightService;
|
|
34660
35139
|
this.backLinkDisplayed$ = navigationService.getPreviousHref$().pipe(withLatestFrom$1(navigationService.getRouteComponentInstance$()), switchMap(([previousHref, routeComponentInstance]) => {
|
|
35140
|
+
this._restoresAddress = qdRestoresOverviewAddress(previousHref);
|
|
34661
35141
|
if (typeof previousHref === 'function')
|
|
34662
35142
|
previousHref = previousHref(routeComponentInstance);
|
|
34663
35143
|
return isObservable(previousHref) ? previousHref.pipe(take(1)) : of(previousHref);
|
|
@@ -34679,7 +35159,12 @@ class QdShellHeaderComponent {
|
|
|
34679
35159
|
handleBackClick() {
|
|
34680
35160
|
if (this._previousHref == null)
|
|
34681
35161
|
return;
|
|
34682
|
-
this.
|
|
35162
|
+
const url = this.insertRouteParams(this._previousHref);
|
|
35163
|
+
if (!this._restoresAddress) {
|
|
35164
|
+
this.navigationService.navigateByUrl(url);
|
|
35165
|
+
return;
|
|
35166
|
+
}
|
|
35167
|
+
this._hub.navigateToUrl(this._hub.restoreAddress(url));
|
|
34683
35168
|
}
|
|
34684
35169
|
insertRouteParams(url) {
|
|
34685
35170
|
const routeParams = this._routeParams;
|
|
@@ -36531,5 +37016,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.17", ngImpo
|
|
|
36531
37016
|
* Generated bundle index. Do not edit.
|
|
36532
37017
|
*/
|
|
36533
37018
|
|
|
36534
|
-
export { APP_ENVIRONMENT, BACKEND_ERROR_CODES, MockLocaleDatePipe, NavigationTileComponent, NavigationTilesComponent, QD_DIALOG_CONFIRMATION_RESOLVER_TOKEN, QD_FILE_MANAGER_TOKEN, QD_FILE_UPLOAD_MANAGER_TOKEN, QD_FORM_OPTIONS_RESOLVER, QD_PAGE_OBJECT_RESOLVER_TOKEN, QD_PAGE_STEP_RESOLVER_TOKEN, QD_POPOVER_TOP_FIRST, QD_SAFE_BOTTOM_OFFSET, QD_TABLE_DATA_RESOLVER_TOKEN, QD_UPLOAD_HTTP_OPTIONS, QdButtonComponent, QdButtonGhostDirective, QdButtonGridComponent, QdButtonLinkDirective, QdButtonModule, QdButtonStackButtonComponent, QdButtonStackComponent, QdCheckboxChipsComponent, QdCheckboxComponent, QdCheckboxesComponent, QdChipComponent, QdChipModule, QdColumnAutoFillDirective, QdColumnBreakBeforeDirective, QdColumnDirective, QdColumnDisableResponsiveColspansDirective, QdColumnFullGridWidthDirective, QdColumnNextInSameRowDirective, QdColumnsDirective, QdColumnsDisableAutoFillDirective, QdColumnsDisableResponsiveColspansDirective, QdColumnsMaxDirective, QdCommentsComponent, QdCommentsModule, QdConnectFormStateToPageDirective, QdConnectorTableContextDirective, QdConnectorTableFilterDirective, QdConnectorTableSearchDirective, QdContactCardComponent, QdContactCardModule, QdContainerPairsCaptionComponent, QdContainerPairsContainerComponent, QdContainerPairsHeaderComponent, QdContainerPairsItemComponent, QdContainerPairsValueComponent, QdContextService, QdCoreModule, QdDatepickerComponent, QdDialogActionComponent, QdDialogAuthSessionEndComponent, QdDialogAuthSessionEndService, QdDialogComponent, QdDialogConfirmationComponent, QdDialogConfirmationErrorDirective, QdDialogConfirmationInfoDirective, QdDialogConfirmationSuccessDirective, QdDialogModule, QdDialogRecordStepperComponent, QdDialogService, QdDialogSize, QdDisabledDirective, QdDropdownComponent, QdFileCollectorComponent, QdFileCollectorModule, QdFileSizePipe$1 as QdFileSizePipe, QdFileUploadComponent, QdFileUploadService, QdFilterComponent, QdFilterFormItemsComponent, QdFilterModule, QdFilterRestParamBuilder, QdFilterService, QdFooterActionType, QdFormArray, QdFormBuilder, QdFormControl, QdFormGroup, QdFormModule, QdFrameworkModule, QdGridComponent, QdGridModule, QdHorizontalPairsCaptionComponent, QdHorizontalPairsComponent, QdHorizontalPairsItemComponent, QdHorizontalPairsValueComponent, QdIconButtonComponent, QdIconComponent, QdIconModule, QdImageComponent, QdImageModule, QdIndeterminateProgressBarComponent, QdInputComponent, QdListModule, QdMenuButtonComponent, QdMockBreakpointService, QdMockButtonComponent, QdMockButtonGhostDirective, QdMockButtonGridComponent, QdMockButtonLinkDirective, QdMockButtonModule, QdMockButtonStackButtonComponent, QdMockButtonStackComponent, QdMockCalendarComponent, QdMockCheckboxChipsComponent, QdMockCheckboxComponent, QdMockCheckboxesComponent, QdMockChipComponent, QdMockChipModule, QdMockColumnDirective, QdMockColumnsDirective, QdMockContactCardComponent, QdMockContactCardModule, QdMockContainerPairsCaptionComponent, QdMockContainerPairsContainerComponent, QdMockContainerPairsHeaderComponent, QdMockContainerPairsItemComponent, QdMockContainerPairsValueComponent, QdMockCoreModule, QdMockCounterBadgeComponent, QdMockDatepickerComponent, QdMockDisabledDirective, QdMockDropdownComponent, QdMockFileCollectorComponent, QdMockFileCollectorModule, QdMockFilterCategoryBooleanComponent, QdMockFilterCategoryComponent, QdMockFilterCategoryDateComponent, QdMockFilterCategoryDateRangeComponent, QdMockFilterCategoryFreeTextComponent, QdMockFilterCategorySelectComponent, QdMockFilterComponent, QdMockFilterFormItemsComponent, QdMockFilterItemBooleanComponent, QdMockFilterItemDateComponent, QdMockFilterItemDateRangeComponent, QdMockFilterItemFreeTextComponent, QdMockFilterItemMultiSelectComponent, QdMockFilterItemSingleSelectComponent, QdMockFilterModule, QdMockFilterService, QdMockFormErrorComponent, QdMockFormGroupErrorComponent, QdMockFormHintComponent, QdMockFormLabelComponent, QdMockFormReadonlyComponent, QdMockFormViewonlyComponent, QdMockFormsModule, QdMockFrameworkModule, QdMockGridModule, QdMockIconButtonComponent, QdMockIconComponent, QdMockIconModule, QdMockImageComponent, QdMockImageModule, QdMockIndeterminateProgressBarComponent, QdMockInputComponent, QdMockListModule, QdMockNavigationTileComponent, QdMockNavigationTilesComponent, QdMockNavigationTilesModule, QdMockNotificationComponent, QdMockNotificationContentComponent, QdMockNotificationsComponent, QdMockNotificationsModule, QdMockNotificationsService, QdMockPageComponent, QdMockPageModule, QdMockPercentageProgressBarComponent, QdMockPinCodeComponent, QdMockPopoverOnClickDirective, QdMockProgressBarModule, QdMockRadioButtonsComponent, QdMockRwdDisabledDirective, QdMockSearchComponent, QdMockSearchModule, QdMockSectionComponent, QdMockSectionModule, QdMockShellComponent, QdMockShellFooterComponent, QdMockShellHeaderBannerComponent, QdMockShellHeaderComponent, QdMockShellHeaderSearchComponent, QdMockShellModule, QdMockShellToolbarComponent, QdMockShellToolbarItemComponent, QdMockStatusIndicatorCaptionComponent, QdMockStatusIndicatorComponent, QdMockStatusIndicatorItemComponent, QdMockStatusIndicatorModule, QdMockStatusPairsCaptionComponent, QdMockStatusPairsComponent, QdMockStatusPairsErrorComponent, QdMockStatusPairsItemComponent, QdMockStatusPairsValueComponent, QdMockSwitchComponent, QdMockSwitchesComponent, QdMockTableComponent, QdMockTableModule, QdMockTextSectionComponent, QdMockTextSectionHeadlineComponent, QdMockTextSectionModule, QdMockTextSectionParagraphComponent, QdMockTextareaComponent, QdMockTileButtonListComponent, QdMockTileComponent, QdMockTileTextListComponent, QdMockTileTextListItemComponent, QdMockTileTitleComponent, QdMockTilesContainerComponent, QdMockTilesContainerTitleComponent, QdMockTilesModule, QdMockTranslatePipe, QdMockVisuallyHiddenDirective, QdMultiInputComponent, QdNavigationTilesModule, QdNotificationComponent, QdNotificationContentComponent, QdNotificationsComponent, QdNotificationsHttpInterceptorService, QdNotificationsModule, QdNotificationsService, QdNotificationsSnackbarListenerDirective, QdNumberInputService, QdPageComponent, QdPageControlPanelComponent, QdPageFooterComponent, QdPageFooterCustomContentDirective, QdPageHeaderExtensionDirective, QdPageInfoBannerComponent, QdPageModule, QdPageStepComponent, QdPageStepperAdapterDirective, QdPageStepperComponent, QdPageStepperModule, QdPageStoreService, QdPageTabComponent, QdPageTabsAdapterDirective, QdPageTabsComponent, QdPageTabsModule, QdPanelSectionActionsComponent, QdPanelSectionComponent, QdPanelSectionModule, QdPanelSectionStatusComponent, QdPanelSectionTextParagraphComponent, QdPendingChangesGuardDirective, QdPercentageProgressBarComponent, QdPinCodeComponent, QdPlaceholderPipe, QdProgressBarModule, QdProjectionGuardComponent, QdPushEventsService, QdQuickEditComponent, QdQuickEditModule, QdRadioButtonsComponent, QdRichtextComponent, QdRouterQueryParamHubService, QdRwdDisabledDirective, QdSearchComponent, QdSearchModule, QdSearchService, QdSectionAdapterDirective, QdSectionComponent, QdSectionModule, QdSectionToolbarComponent, QdShellComponent, QdShellModule, QdSortDirection, QdSpinnerComponent, QdSpinnerModule, QdStatusIndicatorComponent, QdStatusIndicatorModule, QdStatusPairsCaptionComponent, QdStatusPairsComponent, QdStatusPairsErrorComponent, QdStatusPairsItemComponent, QdStatusPairsValueComponent, QdSubgridComponent, QdSwitchComponent, QdSwitchesComponent, QdTableComponent, QdTableModule, QdTextSectionComponent, QdTextSectionHeadlineComponent, QdTextSectionModule, QdTextSectionParagraphComponent, QdTextareaComponent, QdTileButtonListComponent, QdTileComponent, QdTileTextListComponent, QdTileTextListItemComponent, QdTileTitleComponent, QdTilesComponent, QdTilesModule, QdTilesTitleComponent, QdTooltipIconComponent, QdTreeComponent, QdTreeModule, QdTreeRowExpanderService, QdUploadErrorType, QdValidators, QdViewportAdaptiveDirective, QdVisuallyHiddenDirective, WHITELIST_ERROR_CODES, chipStateDefault, createMetadataStream, qdFilterParameterize, qdMergeParams, qdPageTabParameterize, qdPaginationParameterize, qdSearchParameterize, qdSortParameterize, qdTableQueryParameterize, qdWrapParams, quadrelIconNames, updateHtmlLang };
|
|
37019
|
+
export { APP_ENVIRONMENT, BACKEND_ERROR_CODES, MockLocaleDatePipe, NavigationTileComponent, NavigationTilesComponent, QD_DIALOG_CONFIRMATION_RESOLVER_TOKEN, QD_FILE_MANAGER_TOKEN, QD_FILE_UPLOAD_MANAGER_TOKEN, QD_FORM_OPTIONS_RESOLVER, QD_PAGE_OBJECT_RESOLVER_TOKEN, QD_PAGE_STEP_RESOLVER_TOKEN, QD_POPOVER_TOP_FIRST, QD_SAFE_BOTTOM_OFFSET, QD_TABLE_DATA_RESOLVER_TOKEN, QD_UPLOAD_HTTP_OPTIONS, QdButtonComponent, QdButtonGhostDirective, QdButtonGridComponent, QdButtonLinkDirective, QdButtonModule, QdButtonStackButtonComponent, QdButtonStackComponent, QdCheckboxChipsComponent, QdCheckboxComponent, QdCheckboxesComponent, QdChipComponent, QdChipModule, QdColumnAutoFillDirective, QdColumnBreakBeforeDirective, QdColumnDirective, QdColumnDisableResponsiveColspansDirective, QdColumnFullGridWidthDirective, QdColumnNextInSameRowDirective, QdColumnsDirective, QdColumnsDisableAutoFillDirective, QdColumnsDisableResponsiveColspansDirective, QdColumnsMaxDirective, QdCommentsComponent, QdCommentsModule, QdConnectFormStateToPageDirective, QdConnectorTableContextDirective, QdConnectorTableFilterDirective, QdConnectorTableSearchDirective, QdContactCardComponent, QdContactCardModule, QdContainerPairsCaptionComponent, QdContainerPairsContainerComponent, QdContainerPairsHeaderComponent, QdContainerPairsItemComponent, QdContainerPairsValueComponent, QdContextService, QdCoreModule, QdDatepickerComponent, QdDialogActionComponent, QdDialogAuthSessionEndComponent, QdDialogAuthSessionEndService, QdDialogComponent, QdDialogConfirmationComponent, QdDialogConfirmationErrorDirective, QdDialogConfirmationInfoDirective, QdDialogConfirmationSuccessDirective, QdDialogModule, QdDialogRecordStepperComponent, QdDialogService, QdDialogSize, QdDisabledDirective, QdDropdownComponent, QdFileCollectorComponent, QdFileCollectorModule, QdFileSizePipe$1 as QdFileSizePipe, QdFileUploadComponent, QdFileUploadService, QdFilterComponent, QdFilterFormItemsComponent, QdFilterModule, QdFilterRestParamBuilder, QdFilterService, QdFooterActionType, QdFormArray, QdFormBuilder, QdFormControl, QdFormGroup, QdFormModule, QdFrameworkModule, QdGridComponent, QdGridModule, QdHorizontalPairsCaptionComponent, QdHorizontalPairsComponent, QdHorizontalPairsItemComponent, QdHorizontalPairsValueComponent, QdIconButtonComponent, QdIconComponent, QdIconModule, QdImageComponent, QdImageModule, QdIndeterminateProgressBarComponent, QdInputComponent, QdListModule, QdMenuButtonComponent, QdMockBreakpointService, QdMockButtonComponent, QdMockButtonGhostDirective, QdMockButtonGridComponent, QdMockButtonLinkDirective, QdMockButtonModule, QdMockButtonStackButtonComponent, QdMockButtonStackComponent, QdMockCalendarComponent, QdMockCheckboxChipsComponent, QdMockCheckboxComponent, QdMockCheckboxesComponent, QdMockChipComponent, QdMockChipModule, QdMockColumnDirective, QdMockColumnsDirective, QdMockContactCardComponent, QdMockContactCardModule, QdMockContainerPairsCaptionComponent, QdMockContainerPairsContainerComponent, QdMockContainerPairsHeaderComponent, QdMockContainerPairsItemComponent, QdMockContainerPairsValueComponent, QdMockCoreModule, QdMockCounterBadgeComponent, QdMockDatepickerComponent, QdMockDisabledDirective, QdMockDropdownComponent, QdMockFileCollectorComponent, QdMockFileCollectorModule, QdMockFilterCategoryBooleanComponent, QdMockFilterCategoryComponent, QdMockFilterCategoryDateComponent, QdMockFilterCategoryDateRangeComponent, QdMockFilterCategoryFreeTextComponent, QdMockFilterCategorySelectComponent, QdMockFilterComponent, QdMockFilterFormItemsComponent, QdMockFilterItemBooleanComponent, QdMockFilterItemDateComponent, QdMockFilterItemDateRangeComponent, QdMockFilterItemFreeTextComponent, QdMockFilterItemMultiSelectComponent, QdMockFilterItemSingleSelectComponent, QdMockFilterModule, QdMockFilterService, QdMockFormErrorComponent, QdMockFormGroupErrorComponent, QdMockFormHintComponent, QdMockFormLabelComponent, QdMockFormReadonlyComponent, QdMockFormViewonlyComponent, QdMockFormsModule, QdMockFrameworkModule, QdMockGridModule, QdMockIconButtonComponent, QdMockIconComponent, QdMockIconModule, QdMockImageComponent, QdMockImageModule, QdMockIndeterminateProgressBarComponent, QdMockInputComponent, QdMockListModule, QdMockNavigationTileComponent, QdMockNavigationTilesComponent, QdMockNavigationTilesModule, QdMockNotificationComponent, QdMockNotificationContentComponent, QdMockNotificationsComponent, QdMockNotificationsModule, QdMockNotificationsService, QdMockPageComponent, QdMockPageModule, QdMockPercentageProgressBarComponent, QdMockPinCodeComponent, QdMockPopoverOnClickDirective, QdMockProgressBarModule, QdMockRadioButtonsComponent, QdMockRwdDisabledDirective, QdMockSearchComponent, QdMockSearchModule, QdMockSectionComponent, QdMockSectionModule, QdMockShellComponent, QdMockShellFooterComponent, QdMockShellHeaderBannerComponent, QdMockShellHeaderComponent, QdMockShellHeaderSearchComponent, QdMockShellModule, QdMockShellToolbarComponent, QdMockShellToolbarItemComponent, QdMockStatusIndicatorCaptionComponent, QdMockStatusIndicatorComponent, QdMockStatusIndicatorItemComponent, QdMockStatusIndicatorModule, QdMockStatusPairsCaptionComponent, QdMockStatusPairsComponent, QdMockStatusPairsErrorComponent, QdMockStatusPairsItemComponent, QdMockStatusPairsValueComponent, QdMockSwitchComponent, QdMockSwitchesComponent, QdMockTableComponent, QdMockTableModule, QdMockTextSectionComponent, QdMockTextSectionHeadlineComponent, QdMockTextSectionModule, QdMockTextSectionParagraphComponent, QdMockTextareaComponent, QdMockTileButtonListComponent, QdMockTileComponent, QdMockTileTextListComponent, QdMockTileTextListItemComponent, QdMockTileTitleComponent, QdMockTilesContainerComponent, QdMockTilesContainerTitleComponent, QdMockTilesModule, QdMockTranslatePipe, QdMockVisuallyHiddenDirective, QdMultiInputComponent, QdNavigationTilesModule, QdNotificationComponent, QdNotificationContentComponent, QdNotificationsComponent, QdNotificationsHttpInterceptorService, QdNotificationsModule, QdNotificationsService, QdNotificationsSnackbarListenerDirective, QdNumberInputService, QdPageComponent, QdPageControlPanelComponent, QdPageFooterComponent, QdPageFooterCustomContentDirective, QdPageHeaderExtensionDirective, QdPageInfoBannerComponent, QdPageModule, QdPageStepComponent, QdPageStepperAdapterDirective, QdPageStepperComponent, QdPageStepperModule, QdPageStoreService, QdPageTabComponent, QdPageTabsAdapterDirective, QdPageTabsComponent, QdPageTabsModule, QdPanelSectionActionsComponent, QdPanelSectionComponent, QdPanelSectionModule, QdPanelSectionStatusComponent, QdPanelSectionTextParagraphComponent, QdPendingChangesGuardDirective, QdPercentageProgressBarComponent, QdPinCodeComponent, QdPlaceholderPipe, QdProgressBarModule, QdProjectionGuardComponent, QdPushEventsService, QdQuickEditComponent, QdQuickEditModule, QdRadioButtonsComponent, QdRichtextComponent, QdRouterQueryParamHubService, QdRwdDisabledDirective, QdSearchComponent, QdSearchModule, QdSearchService, QdSectionAdapterDirective, QdSectionComponent, QdSectionModule, QdSectionToolbarComponent, QdShellComponent, QdShellModule, QdSortDirection, QdSpinnerComponent, QdSpinnerModule, QdStatusIndicatorComponent, QdStatusIndicatorModule, QdStatusPairsCaptionComponent, QdStatusPairsComponent, QdStatusPairsErrorComponent, QdStatusPairsItemComponent, QdStatusPairsValueComponent, QdSubgridComponent, QdSwitchComponent, QdSwitchesComponent, QdTableComponent, QdTableModule, QdTextSectionComponent, QdTextSectionHeadlineComponent, QdTextSectionModule, QdTextSectionParagraphComponent, QdTextareaComponent, QdTileButtonListComponent, QdTileComponent, QdTileTextListComponent, QdTileTextListItemComponent, QdTileTitleComponent, QdTilesComponent, QdTilesModule, QdTilesTitleComponent, QdTooltipIconComponent, QdTreeComponent, QdTreeModule, QdTreeRowExpanderService, QdUploadErrorType, QdValidators, QdViewportAdaptiveDirective, QdVisuallyHiddenDirective, WHITELIST_ERROR_CODES, chipStateDefault, createMetadataStream, qdBackToOverview, qdFilterParameterize, qdMergeParams, qdPageTabParameterize, qdPaginationParameterize, qdSearchParameterize, qdSortParameterize, qdTableQueryParameterize, qdWrapParams, quadrelIconNames, updateHtmlLang };
|
|
36535
37020
|
//# sourceMappingURL=quadrel-enterprise-ui-framework.mjs.map
|