@stratusjs/angular 0.4.8 → 0.4.10

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.
@@ -63,9 +63,12 @@ System.register(["@angular/core", "@angular/forms", "@angular/cdk/drag-drop", "@
63
63
  this.isStyled = false;
64
64
  this._ = lodash_1.default;
65
65
  this.Stratus = stratus_1.Stratus;
66
+ this.apiBase = '/Api/Content';
67
+ this.isSingleContentLoading = false;
68
+ this.limit = 20;
66
69
  this.isContentLoading = false;
67
70
  this.isContentLoaded = false;
68
- this.basicContentSelectorQuery = '/Api/Content?options[isContent]=null&options[isCollection]=null&options[showRoutable]=true&options[showRouting]=true&q=';
71
+ this.basicContentQueryAttributes = 'options[isContent]=null&options[isCollection]=null&options[showRoutable]=true&options[showRouting]=true';
69
72
  }
70
73
  ngOnInit() {
71
74
  this.uid = lodash_1.default.uniqueId(`sa_${lodash_1.default.snakeCase(moduleName)}_component_`);
@@ -91,13 +94,13 @@ System.register(["@angular/core", "@angular/forms", "@angular/cdk/drag-drop", "@
91
94
  .valueChanges
92
95
  .pipe(operators_1.debounceTime(300), operators_1.tap(() => this.isContentLoading = true), operators_1.switchMap((value) => {
93
96
  if (lodash_1.default.isString(value)) {
94
- this.lastContentSelectorQuery = `${this.basicContentSelectorQuery}${value}`;
97
+ this.lastContentSelectorQuery = this.getQueryUrl(value);
95
98
  }
96
99
  else {
97
100
  this.data.content = value;
98
101
  this.data.url = null;
99
102
  }
100
- return this.backend.get(this.lastContentSelectorQuery || this.basicContentSelectorQuery)
103
+ return this.backend.get(this.lastContentSelectorQuery || this.getQueryUrl())
101
104
  .pipe(operators_1.finalize(() => {
102
105
  this.isContentLoading = false;
103
106
  this.isContentLoaded = true;
@@ -105,9 +108,31 @@ System.register(["@angular/core", "@angular/forms", "@angular/cdk/drag-drop", "@
105
108
  }))
106
109
  .subscribe((response) => this.handleContent(response));
107
110
  this.backend
108
- .get(this.basicContentSelectorQuery)
111
+ .get(this.getQueryUrl())
109
112
  .pipe(operators_1.finalize(() => this.isContentLoading = false))
110
113
  .subscribe((response) => this.handleContent(response));
114
+ if (this.data.content && this.data.content.id) {
115
+ this.isSingleContentLoading = true;
116
+ this.backend
117
+ .get(this.getQueryUrl(null, this.data.content.id))
118
+ .pipe(operators_1.finalize(() => this.isSingleContentLoading = false))
119
+ .subscribe((response) => {
120
+ if (!response.ok || response.status !== 200 || lodash_1.default.isEmpty(response.body)) {
121
+ return null;
122
+ }
123
+ const payload = lodash_1.default.get(response.body, 'payload') || response.body;
124
+ if (lodash_1.default.isEmpty(payload) || Array.isArray(payload) || !lodash_1.default.isObject(payload)) {
125
+ return null;
126
+ }
127
+ this.contentEntity = payload;
128
+ this.isSingleContentLoading = false;
129
+ this.dialogContentForm
130
+ .get('contentSelectorInput')
131
+ .patchValue(this.contentEntity);
132
+ this.refresh();
133
+ return this.contentEntity;
134
+ });
135
+ }
111
136
  this.isInitialized = true;
112
137
  }
113
138
  ngOnDestroy() {
@@ -145,7 +170,7 @@ System.register(["@angular/core", "@angular/forms", "@angular/cdk/drag-drop", "@
145
170
  this.filteredContent = [];
146
171
  return this.filteredContent;
147
172
  }
148
- this.filteredContent = this.selectedOnTop(payload, this.data.content);
173
+ this.filteredContent = payload;
149
174
  return this.filteredContent;
150
175
  }
151
176
  destroy() {
@@ -173,6 +198,11 @@ System.register(["@angular/core", "@angular/forms", "@angular/cdk/drag-drop", "@
173
198
  getSvg(url, options) {
174
199
  return this.tree.getSvg(url, options);
175
200
  }
201
+ getQueryUrl(query, id) {
202
+ query = (!lodash_1.default.isString(query) || lodash_1.default.isEmpty(query)) ? '' : `"${query}"`;
203
+ id = !lodash_1.default.isString(id) && !lodash_1.default.isNumber(id) ? '' : `/${id}`;
204
+ return `${this.apiBase}${id}?limit=${this.limit}&${this.basicContentQueryAttributes}&q=${query}`;
205
+ }
176
206
  selectedOnTop(list, selected) {
177
207
  if (!list || !list.length) {
178
208
  return list;
@@ -1 +1 @@
1
- {"version":3,"sources":["tree-dialog.component.ts"],"names":[],"mappings":"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","file":"tree-dialog.component.js"}
1
+ {"version":3,"sources":["tree-dialog.component.ts"],"names":[],"mappings":"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","file":"tree-dialog.component.js"}
@@ -1 +1 @@
1
- System.register(["@angular/core","@angular/forms","@angular/cdk/drag-drop","@angular/material/dialog","rxjs/operators","lodash","@stratusjs/runtime/stratus","@stratusjs/core/environment","@stratusjs/angular/core/responsive.component"],function(t,e){"use strict";var n,i,s,o,r,a,d,l,u,c,h,f,g,p=this&&this.__decorate||function(t,e,n,i){var s,o=arguments.length,r=o<3?e:null===i?i=Object.getOwnPropertyDescriptor(e,n):i;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)r=Reflect.decorate(t,e,n,i);else for(var a=t.length-1;a>=0;a--)(s=t[a])&&(r=(o<3?s(r):o>3?s(e,n,r):s(e,n))||r);return o>3&&r&&Object.defineProperty(e,n,r),r},C=this&&this.__metadata||function(t,e){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(t,e)},y=this&&this.__param||function(t,e){return function(n,i){e(n,i,t)}};e&&e.id;return{setters:[function(t){n=t},function(t){i=t},function(t){s=t},function(t){o=t},function(t){r=t},function(t){a=t},function(t){d=t},function(t){l=t},function(t){u=t}],execute:function(){"@stratusjs/angular",c="tree-dialog","tree",h=l.cookie("env")?"":".min",f=`${d.Stratus.BaseUrl}${boot.configuration.paths["@stratusjs/angular/*"].replace(/[^/]*$/,"")}`,g=class extends u.ResponsiveComponent{constructor(t,e,n,i){super(),this.dialogRef=t,this.data=e,this.fb=n,this.ref=i,this.title="tree-dialog_component",this.isInitialized=!1,this.isDestroyed=!1,this.isStyled=!1,this._=a.default,this.Stratus=d.Stratus,this.isContentLoading=!1,this.isContentLoaded=!1,this.basicContentSelectorQuery="/Api/Content?options[isContent]=null&options[isCollection]=null&options[showRoutable]=true&options[showRouting]=true&q="}ngOnInit(){this.uid=a.default.uniqueId(`sa_${a.default.snakeCase(c)}_component_`),d.Stratus.Instances[this.uid]=this,d.Stratus.Internals.CssLoader(`${f}/tree/tree-dialog.component${h}.css`).then(()=>{this.isStyled=!0}).catch(t=>{console.warn("Issue detected in CSS Loader for Component:",this),console.error(t),this.isStyled=!0}),this.tree=this.data.tree,this.treeNode=this.data.treeNode,this.backend=this.data.backend,this.iconRegistry=this.data.iconRegistry,this.dialogContentForm=this.fb.group({contentSelectorInput:this.data.content||null}),this.dialogContentForm.get("contentSelectorInput").valueChanges.pipe(r.debounceTime(300),r.tap(()=>this.isContentLoading=!0),r.switchMap(t=>(a.default.isString(t)?this.lastContentSelectorQuery=`${this.basicContentSelectorQuery}${t}`:(this.data.content=t,this.data.url=null),this.backend.get(this.lastContentSelectorQuery||this.basicContentSelectorQuery).pipe(r.finalize(()=>{this.isContentLoading=!1,this.isContentLoaded=!0}))))).subscribe(t=>this.handleContent(t)),this.backend.get(this.basicContentSelectorQuery).pipe(r.finalize(()=>this.isContentLoading=!1)).subscribe(t=>this.handleContent(t)),this.isInitialized=!0}ngOnDestroy(){this.isDestroyed=!0}refresh(){return this.isDestroyed?new Promise(t=>t()):super.refresh()}onCancelClick(){this.dialogRef.close()}onBrowserTargetChange(t){this.data.browserTarget=this.browserTarget?"_blank":null}displayContentText(t){if(!t)return;const e=a.default.get(t,"routing[0].url"),n=a.default.isUndefined(e)?" (No route!)":` (/${e})`,i=a.default.get(t,"id"),s=a.default.isUndefined(i)?null:`Content: ${i}`;return(a.default.get(t,"version.title")||s)+n}handleContent(t){if(!t.ok||200!==t.status||a.default.isEmpty(t.body))return this.filteredContent=[],this.filteredContent;const e=a.default.get(t.body,"payload")||t.body;return a.default.isEmpty(e)||!Array.isArray(e)?(this.filteredContent=[],this.filteredContent):(this.filteredContent=this.selectedOnTop(e,this.data.content),this.filteredContent)}destroy(){this.treeNode.destroy().afterClosed().subscribe(t=>{t&&this.onCancelClick()})}toggleStatus(){this.treeNode.toggleStatus()}addChild(){this.treeNode.addChild()}isSelected(t){return!!this.data.content&&this.data.content.id===t.id}getSvg(t,e){return this.tree.getSvg(t,e)}selectedOnTop(t,e){if(!t||!t.length)return t;if(!e||!e.id)return t;const n=a.default.clone(t),i=t.findIndex(t=>t.id===e.id);return-1===i?(n.unshift(e),n):(s.moveItemInArray(n,i,0),n)}},g=p([n.Component({selector:"sa-tree-dialog",templateUrl:`${f}/tree/tree-dialog.component${h}.html`}),y(1,n.Inject(o.MAT_DIALOG_DATA)),C("design:paramtypes",[o.MatDialogRef,Object,i.FormBuilder,n.ChangeDetectorRef])],g),t("TreeDialogComponent",g)}}});
1
+ System.register(["@angular/core","@angular/forms","@angular/cdk/drag-drop","@angular/material/dialog","rxjs/operators","lodash","@stratusjs/runtime/stratus","@stratusjs/core/environment","@stratusjs/angular/core/responsive.component"],function(t,e){"use strict";var n,i,s,o,r,a,l,d,u,h,c,f,g,p=this&&this.__decorate||function(t,e,n,i){var s,o=arguments.length,r=o<3?e:null===i?i=Object.getOwnPropertyDescriptor(e,n):i;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)r=Reflect.decorate(t,e,n,i);else for(var a=t.length-1;a>=0;a--)(s=t[a])&&(r=(o<3?s(r):o>3?s(e,n,r):s(e,n))||r);return o>3&&r&&Object.defineProperty(e,n,r),r},y=this&&this.__metadata||function(t,e){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(t,e)},C=this&&this.__param||function(t,e){return function(n,i){e(n,i,t)}};e&&e.id;return{setters:[function(t){n=t},function(t){i=t},function(t){s=t},function(t){o=t},function(t){r=t},function(t){a=t},function(t){l=t},function(t){d=t},function(t){u=t}],execute:function(){"@stratusjs/angular",h="tree-dialog","tree",c=d.cookie("env")?"":".min",f=`${l.Stratus.BaseUrl}${boot.configuration.paths["@stratusjs/angular/*"].replace(/[^/]*$/,"")}`,g=class extends u.ResponsiveComponent{constructor(t,e,n,i){super(),this.dialogRef=t,this.data=e,this.fb=n,this.ref=i,this.title="tree-dialog_component",this.isInitialized=!1,this.isDestroyed=!1,this.isStyled=!1,this._=a.default,this.Stratus=l.Stratus,this.apiBase="/Api/Content",this.isSingleContentLoading=!1,this.limit=20,this.isContentLoading=!1,this.isContentLoaded=!1,this.basicContentQueryAttributes="options[isContent]=null&options[isCollection]=null&options[showRoutable]=true&options[showRouting]=true"}ngOnInit(){this.uid=a.default.uniqueId(`sa_${a.default.snakeCase(h)}_component_`),l.Stratus.Instances[this.uid]=this,l.Stratus.Internals.CssLoader(`${f}/tree/tree-dialog.component${c}.css`).then(()=>{this.isStyled=!0}).catch(t=>{console.warn("Issue detected in CSS Loader for Component:",this),console.error(t),this.isStyled=!0}),this.tree=this.data.tree,this.treeNode=this.data.treeNode,this.backend=this.data.backend,this.iconRegistry=this.data.iconRegistry,this.dialogContentForm=this.fb.group({contentSelectorInput:this.data.content||null}),this.dialogContentForm.get("contentSelectorInput").valueChanges.pipe(r.debounceTime(300),r.tap(()=>this.isContentLoading=!0),r.switchMap(t=>(a.default.isString(t)?this.lastContentSelectorQuery=this.getQueryUrl(t):(this.data.content=t,this.data.url=null),this.backend.get(this.lastContentSelectorQuery||this.getQueryUrl()).pipe(r.finalize(()=>{this.isContentLoading=!1,this.isContentLoaded=!0}))))).subscribe(t=>this.handleContent(t)),this.backend.get(this.getQueryUrl()).pipe(r.finalize(()=>this.isContentLoading=!1)).subscribe(t=>this.handleContent(t)),this.data.content&&this.data.content.id&&(this.isSingleContentLoading=!0,this.backend.get(this.getQueryUrl(null,this.data.content.id)).pipe(r.finalize(()=>this.isSingleContentLoading=!1)).subscribe(t=>{if(!t.ok||200!==t.status||a.default.isEmpty(t.body))return null;const e=a.default.get(t.body,"payload")||t.body;return a.default.isEmpty(e)||Array.isArray(e)||!a.default.isObject(e)?null:(this.contentEntity=e,this.isSingleContentLoading=!1,this.dialogContentForm.get("contentSelectorInput").patchValue(this.contentEntity),this.refresh(),this.contentEntity)})),this.isInitialized=!0}ngOnDestroy(){this.isDestroyed=!0}refresh(){return this.isDestroyed?new Promise(t=>t()):super.refresh()}onCancelClick(){this.dialogRef.close()}onBrowserTargetChange(t){this.data.browserTarget=this.browserTarget?"_blank":null}displayContentText(t){if(!t)return;const e=a.default.get(t,"routing[0].url"),n=a.default.isUndefined(e)?" (No route!)":` (/${e})`,i=a.default.get(t,"id"),s=a.default.isUndefined(i)?null:`Content: ${i}`;return(a.default.get(t,"version.title")||s)+n}handleContent(t){if(!t.ok||200!==t.status||a.default.isEmpty(t.body))return this.filteredContent=[],this.filteredContent;const e=a.default.get(t.body,"payload")||t.body;return a.default.isEmpty(e)||!Array.isArray(e)?(this.filteredContent=[],this.filteredContent):(this.filteredContent=e,this.filteredContent)}destroy(){this.treeNode.destroy().afterClosed().subscribe(t=>{t&&this.onCancelClick()})}toggleStatus(){this.treeNode.toggleStatus()}addChild(){this.treeNode.addChild()}isSelected(t){return!!this.data.content&&this.data.content.id===t.id}getSvg(t,e){return this.tree.getSvg(t,e)}getQueryUrl(t,e){return t=!a.default.isString(t)||a.default.isEmpty(t)?"":`"${t}"`,e=a.default.isString(e)||a.default.isNumber(e)?`/${e}`:"",`${this.apiBase}${e}?limit=${this.limit}&${this.basicContentQueryAttributes}&q=${t}`}selectedOnTop(t,e){if(!t||!t.length)return t;if(!e||!e.id)return t;const n=a.default.clone(t),i=t.findIndex(t=>t.id===e.id);return-1===i?(n.unshift(e),n):(s.moveItemInArray(n,i,0),n)}},g=p([n.Component({selector:"sa-tree-dialog",templateUrl:`${f}/tree/tree-dialog.component${c}.html`}),C(1,n.Inject(o.MAT_DIALOG_DATA)),y("design:paramtypes",[o.MatDialogRef,Object,i.FormBuilder,n.ChangeDetectorRef])],g),t("TreeDialogComponent",g)}}});
@@ -131,10 +131,16 @@ export class TreeDialogComponent extends ResponsiveComponent implements OnInit,
131
131
  // AutoComplete Data
132
132
  filteredContent: Array<ContentEntity>
133
133
  dialogContentForm: FormGroup
134
+
135
+ // API Data
136
+ apiBase = '/Api/Content'
137
+ isSingleContentLoading = false
138
+ limit = 20
134
139
  isContentLoading = false
135
140
  isContentLoaded = false
136
141
  lastContentSelectorQuery: string
137
- basicContentSelectorQuery = '/Api/Content?options[isContent]=null&options[isCollection]=null&options[showRoutable]=true&options[showRouting]=true&q='
142
+ basicContentQueryAttributes = 'options[isContent]=null&options[isCollection]=null&options[showRoutable]=true&options[showRouting]=true'
143
+ contentEntity: ContentEntity
138
144
 
139
145
  // Normalized Data
140
146
  browserTarget: boolean
@@ -208,12 +214,13 @@ export class TreeDialogComponent extends ResponsiveComponent implements OnInit,
208
214
  tap(() => this.isContentLoading = true),
209
215
  switchMap((value: any) => {
210
216
  if (_.isString(value)) {
211
- this.lastContentSelectorQuery = `${this.basicContentSelectorQuery}${value}`
217
+ this.lastContentSelectorQuery = this.getQueryUrl(value)
212
218
  } else {
219
+ // console.log('switchMap value is not a string:', value)
213
220
  this.data.content = value
214
221
  this.data.url = null
215
222
  }
216
- return this.backend.get(this.lastContentSelectorQuery || this.basicContentSelectorQuery)
223
+ return this.backend.get(this.lastContentSelectorQuery || this.getQueryUrl())
217
224
  .pipe(
218
225
  finalize(() => {
219
226
  this.isContentLoading = false
@@ -232,12 +239,44 @@ export class TreeDialogComponent extends ResponsiveComponent implements OnInit,
232
239
 
233
240
  // Initial Call for Content
234
241
  this.backend
235
- .get(this.basicContentSelectorQuery)
242
+ .get(this.getQueryUrl())
236
243
  .pipe(
237
244
  finalize(() => this.isContentLoading = false),
238
245
  )
239
246
  .subscribe((response: HttpResponse<Convoy<ContentEntity>>) => this.handleContent(response))
240
247
 
248
+ // Hydrate Selected Content
249
+ if (this.data.content && this.data.content.id) {
250
+ this.isSingleContentLoading = true
251
+ this.backend
252
+ .get(
253
+ this.getQueryUrl(
254
+ null,
255
+ this.data.content.id
256
+ )
257
+ )
258
+ .pipe(
259
+ finalize(() => this.isSingleContentLoading = false),
260
+ )
261
+ .subscribe((response: HttpResponse<Convoy<ContentEntity>>) => {
262
+ if (!response.ok || response.status !== 200 || _.isEmpty(response.body)) {
263
+ return null
264
+ }
265
+ const payload = _.get(response.body, 'payload') || response.body
266
+ if (_.isEmpty(payload) || Array.isArray(payload) || !_.isObject(payload)) {
267
+ return null
268
+ }
269
+ // @ts-ignore
270
+ this.contentEntity = payload
271
+ this.isSingleContentLoading = false
272
+ this.dialogContentForm
273
+ .get('contentSelectorInput')
274
+ .patchValue(this.contentEntity)
275
+ this.refresh()
276
+ return this.contentEntity
277
+ })
278
+ }
279
+
241
280
  // Handle Parent Selector
242
281
  // this.dialogParentForm = this.fb.group({
243
282
  // parentSelectorInput: this.data.nestParent
@@ -340,7 +379,8 @@ export class TreeDialogComponent extends ResponsiveComponent implements OnInit,
340
379
  // this.refresh()
341
380
  return this.filteredContent
342
381
  }
343
- this.filteredContent = this.selectedOnTop(payload, this.data.content)
382
+ // this.filteredContent = this.selectedOnTop(payload, this.data.content)
383
+ this.filteredContent = payload
344
384
  // FIXME: We have to go in this roundabout way to force changes to be detected since the
345
385
  // Dialog Sub-Components don't seem to have the right timing for ngOnInit
346
386
  // this.refresh()
@@ -377,6 +417,12 @@ export class TreeDialogComponent extends ResponsiveComponent implements OnInit,
377
417
  return this.tree.getSvg(url, options)
378
418
  }
379
419
 
420
+ getQueryUrl(query?: string, id?: string|number): string {
421
+ query = (!_.isString(query) || _.isEmpty(query)) ? '' : `"${query}"`
422
+ id = !_.isString(id) && !_.isNumber(id) ? '' : `/${id}`
423
+ return `${this.apiBase}${id}?limit=${this.limit}&${this.basicContentQueryAttributes}&q=${query}`
424
+ }
425
+
380
426
  selectedOnTop(list?: Array<ContentEntity>, selected?: ContentEntity): Array<ContentEntity> {
381
427
  if (!list || !list.length) {
382
428
  return list