Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeTschudi committed Nov 10, 2022
2 parents 6d36db6 + 1af96f3 commit 75ed0c6
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 17 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

## [0.2.2] - November 10th 2022

## [0.2.1] - November 8th 2022

## [0.2.0] - November 7th 2022
Expand All @@ -21,5 +23,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
[0.1.11]: https://github.com/Esri/solution.js/compare/v0.1.8...v0.1.11 "v0.1.11"
[0.2.0]: https://github.com/Esri/solution.js/compare/v0.1.11...v0.2.0 "v0.2.0"
[0.2.1]: https://github.com/Esri/solution.js/compare/v0.2.0...v0.2.1 "v0.2.1"
[Unreleased]: https://github.com/Esri/solution.js/compare/v0.2.1...HEAD "Unreleased Changes"
[0.2.2]: https://github.com/Esri/solution.js/compare/v0.2.1...v0.2.2 "v0.2.2"
[Unreleased]: https://github.com/Esri/solution.js/compare/v0.2.2...HEAD "Unreleased Changes"

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/solutions-components",
"version": "0.2.1",
"version": "0.2.2",
"description": "Web Components for Esri's Solutions Applications",
"main": "dist/index.cjs.js",
"module": "dist/index.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ export class SolutionConfiguration {
render(): VNode {
const wkid = getProp(state.getStoreInfo("spatialReferenceInfo"), "spatialReference");
const hasServices: boolean = state.getStoreInfo("featureServices").length > 0;

const solutionData = state.getStoreInfo("solutionData");
this._solutionVariables = JSON.stringify(utils.getSolutionVariables(solutionData.templates, this._translations));
this._organizationVariables = JSON.stringify(utils.getOrganizationVariables(this._translations));

return (
<Host>
{
Expand Down Expand Up @@ -325,9 +330,6 @@ export class SolutionConfiguration {
protected _initProps(): void {
const solutionData = state.getStoreInfo("solutionData");

this._solutionVariables = JSON.stringify(utils.getSolutionVariables(solutionData.templates, this._translations));
this._organizationVariables = JSON.stringify(utils.getOrganizationVariables(this._translations));

this._templateHierarchy = [...utils.getInventoryItems(solutionData.templates)];

if (this._solutionContentsComponent) {
Expand Down
19 changes: 11 additions & 8 deletions src/components/solution-item-details/solution-item-details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ export class SolutionItemDetails {
*/
@Prop({ mutable: true, reflect: true }) itemId = "";

@Watch("itemId") itemIdWatchHandler(): void {
this.itemEdit = state.getItemInfo(this.itemId);
this.itemDetails = this.itemEdit.item;
this.itemType = this.itemDetails.type;
}

//--------------------------------------------------------------------------
//
// Lifecycle
Expand All @@ -67,8 +61,13 @@ export class SolutionItemDetails {
return this._getTranslations();
}

componentDidRender(): void {
this._loadThumb()
async componentWillRender(): Promise<void> {
this.itemEdit = state.getItemInfo(this.itemId);
if (this.itemEdit) {
this.itemDetails = this.itemEdit.item;
this.itemType = this.itemDetails.type;
}
return Promise.resolve();
}

/**
Expand Down Expand Up @@ -132,6 +131,10 @@ export class SolutionItemDetails {
);
}

componentDidRender(): void {
this._loadThumb();
}

//--------------------------------------------------------------------------
//
// Properties (protected)
Expand Down
7 changes: 5 additions & 2 deletions stencil.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ export const config: Config = {
{ src: 'utils' }
]
},
{ type: "dist-custom-elements", autoDefineCustomElements: true },
{
type: 'docs-readme'
},
{ type: "custom", name: "preact", generator: generatePreactTypes },
{
type: "custom",
name: "preact",
generator: generatePreactTypes
},
],
plugins: [
sass({
Expand Down
7 changes: 5 additions & 2 deletions stencil.debugconfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ export const config: Config = {
{ src: 'utils' }
]
},
{ type: "dist-custom-elements", autoDefineCustomElements: true },
{
type: 'docs-readme'
},
{ type: "custom", name: "preact", generator: generatePreactTypes },
{
type: "custom",
name: "preact",
generator: generatePreactTypes
},
],
plugins: [
sass({
Expand Down

0 comments on commit 75ed0c6

Please sign in to comment.