Merge branch 'main' into 2.0-branch

liquidweb · Jan 12, 2023 · 56c8bfa · 56c8bfa
2 parents 56a4165 + 5867f83
commit 56c8bfa
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 15 deletions.
diff --git a/.changeset/fresh-cats-sell.md b/.changeset/fresh-cats-sell.md
@@ -0,0 +1,6 @@
+---
+"@moderntribe/sitebuilder": patch
+"@moderntribe/wme-sitebuilder": patch
+---
+
+Add purchase domain icon to setup screen card
diff --git a/.changeset/purple-buckets-sell.md b/.changeset/purple-buckets-sell.md
diff --git a/.github/workflows/split.yml b/.github/workflows/split.yml
@@ -0,0 +1,63 @@
+name: 'Split Composer Packages'
+
+on:
+  push:
+    branches:
+      - main
+      - 1.0-branch
+      - 2.0-branch
+    tags:
+      - '*'
+
+env:
+  GITHUB_TOKEN: ${{ secrets.SPLIT_ACCESS_TOKEN }}
+
+jobs:
+  packages_split:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # define package to repository map
+        package:
+          -
+            local_path: 'plugins/wme-sitebuilder'
+            split_repository: 'wme-sitebuilder'
+
+    steps:
+      -   uses: actions/checkout@v3
+
+      # no tag
+      -
+        if: "!startsWith(github.ref, 'refs/tags/')"
+        uses: "symplify/[email protected]"
+        with:
+          # ↓ split "plugins/wme-sitebuilder" directory
+          package_directory: '${{ matrix.package.local_path }}'
+
+          # ↓ into https://github.com/moderntribe/wme-sitebuilder repository
+          repository_organization: 'moderntribe'
+          repository_name: '${{ matrix.package.split_repository }}'
+
+          # ↓ the user signed under the split commit
+          user_name: "bswatson"
+          user_email: "[email protected]"
+
+      # with tag
+      -
+        if: "startsWith(github.ref, 'refs/tags/')"
+        uses: "symplify/[email protected]"
+        with:
+          tag: ${GITHUB_REF#refs/tags/}
+
+          # ↓ split "plugins/wme-sitebuilder" directory
+          package_directory: '${{ matrix.package.local_path }}'
+
+          # ↓ into https://github.com/moderntribe/wme-sitebuilder repository
+          repository_organization: 'moderntribe'
+          repository_name: '${{ matrix.package.split_repository }}'
+
+          # ↓ the user signed under the split commit
+          user_name: "bswatson"
+          user_email: "[email protected]"
diff --git a/packages/sitebuilder/CHANGELOG.md b/packages/sitebuilder/CHANGELOG.md
@@ -12,6 +12,13 @@
   - @moderntribe/wme-ui@3.0.0
   - @moderntribe/wme-utils@2.0.0
 
+## 1.7.1
+
+### Patch Changes
+
+- 9ccf6b6: Adds fix to handle null domain search package property
+- 18a78d5: Type fix for Loadable component and removes outdated local dev code.
+
 ## 1.7.0
 
 ### Minor Changes

diff --git a/packages/sitebuilder/src/assets/images/setup-icon-connect.png b/packages/sitebuilder/src/assets/images/setup-icon-connect.png
diff --git a/packages/sitebuilder/src/utils/parseDomainListItem.ts b/packages/sitebuilder/src/utils/parseDomainListItem.ts
@@ -10,8 +10,8 @@ type DomainListItem = {
 	selected: boolean,
 }
 
-function getPrice(termFees: DomainTermFees, isAvailable: boolean) {
-	if (! isAvailable) {
+function getPrice(termFees: DomainTermFees | undefined, isAvailable: boolean) {
+	if (! termFees || ! isAvailable) {
 		return undefined;
 	}
 
@@ -31,8 +31,11 @@ function getPrice(termFees: DomainTermFees, isAvailable: boolean) {
 	);
 }
 
-function getChipLabel(isAvailable: boolean, isSelected: boolean) {
-	if (! isAvailable) {
+function getChipLabel(domain: Domain, isSelected: boolean) {
+	if (! domain.package) {
+		return GoLiveStringData.domainItems.unavailable;
+	}
+	if (! domain.is_available) {
 		return GoLiveStringData.domainItems.taken;
 	}
 	if (isSelected) {
@@ -52,8 +55,8 @@ export function parseDomainListItem(domain: Domain, selected: boolean): DomainLi
 	return ({
 		name: domain.domain,
 		disabled: ! domain.is_available,
-		price: getPrice(domain.package.term_fees, domain.is_available),
-		chipLabel: getChipLabel(domain.is_available, selected),
+		price: getPrice(domain.package?.term_fees, domain.is_available),
+		chipLabel: getChipLabel(domain, selected),
 		chipColor: getChipColor(domain.is_available, selected),
 		selected,
 	});

diff --git a/packages/sitebuilder/src/wizards/go-live/data/constants.ts b/packages/sitebuilder/src/wizards/go-live/data/constants.ts
@@ -83,5 +83,6 @@ export const GoLiveStringData = {
 		taken: __('Taken', 'moderntribe-sitebuilder'),
 		selected: __('Selected', 'moderntribe-sitebuilder'),
 		available: __('Available', 'moderntribe-sitebuilder'),
+		unavailable: __('Unavailable', 'moderntribe-sitebuilder'),
 	}
 };
diff --git a/packages/storebuilder/CHANGELOG.md b/packages/storebuilder/CHANGELOG.md
@@ -12,6 +12,12 @@
   - @moderntribe/wme-ui@3.0.0
   - @moderntribe/wme-utils@2.0.0
 
+## 1.5.2
+
+### Patch Changes
+
+- 18a78d5: Type fix for Loadable component and removes outdated local dev code.
+
 ## 1.5.1
 
 ### Patch Changes

diff --git a/plugins/wme-sitebuilder/CHANGELOG.md b/plugins/wme-sitebuilder/CHANGELOG.md
@@ -12,13 +12,19 @@
   - @moderntribe/sitebuilder@2.0.0
   - @moderntribe/storebuilder@2.0.0
 
+## 0.5.1
+
+### Patch Changes
+
+- Updated dependencies [9ccf6b6]
+- Updated dependencies [18a78d5]
+  - @moderntribe/sitebuilder@1.7.1
+  - @moderntribe/storebuilder@1.5.2
+
 ## 0.5.0
 
 ### Minor Changes
 
 - fcadf1d: Consolidate the WME Sitebuilder WordPress plugin and library into the same repository with other Sitebuilder packages.
-
-### Patch Changes
-
 - Updated dependencies [0413284]
   - @moderntribe/sitebuilder@1.7.0