@akinon/projectzero 1.89.0 → 1.90.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @akinon/projectzero
 
+## 1.90.0
+
+### Minor Changes
+
+- 5ccd96d: ZERO-3388: resolve plugin installation bug with prompt package
+
 ## 1.89.0
 
 ## 1.88.0

package/app-template/CHANGELOG.md

@@ -1,5 +1,39 @@
 # projectzeronext
 
+## 1.90.0
+
+### Minor Changes
+
+- 4e379cd: ZERO-3365: Added variant selection completion check
+
+### Patch Changes
+
+- Updated dependencies [2657d0c]
+- Updated dependencies [1044bce]
+- Updated dependencies [c9b8c6f]
+- Updated dependencies [d662786]
+- Updated dependencies [e68e120]
+- Updated dependencies [ec9ff89]
+- Updated dependencies [9c3a22a]
+- Updated dependencies [a1463fd]
+- Updated dependencies [99b3fd6]
+  - @akinon/pz-akifast@1.90.0
+  - @akinon/pz-bkm@1.90.0
+  - @akinon/pz-click-collect@1.90.0
+  - @akinon/pz-pay-on-delivery@1.90.0
+  - @akinon/next@1.90.0
+  - @akinon/pz-checkout-gift-pack@1.90.0
+  - @akinon/pz-otp@1.90.0
+  - @akinon/pz-gpay@1.90.0
+  - @akinon/pz-one-click-checkout@1.90.0
+  - @akinon/pz-b2b@1.90.0
+  - @akinon/pz-basket-gift-pack@1.90.0
+  - @akinon/pz-credit-payment@1.90.0
+  - @akinon/pz-masterpass@1.90.0
+  - @akinon/pz-saved-card@1.90.0
+  - @akinon/pz-tabby-extension@1.90.0
+  - @akinon/pz-tamara-extension@1.90.0
+
 ## 1.89.0
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.89.0",
+  "version": "1.90.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,22 +24,22 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.89.0",
-    "@akinon/pz-akifast": "1.89.0",
-    "@akinon/pz-b2b": "1.89.0",
-    "@akinon/pz-basket-gift-pack": "1.89.0",
-    "@akinon/pz-bkm": "1.89.0",
-    "@akinon/pz-checkout-gift-pack": "1.89.0",
-    "@akinon/pz-click-collect": "1.89.0",
-    "@akinon/pz-credit-payment": "1.89.0",
-    "@akinon/pz-gpay": "1.89.0",
-    "@akinon/pz-masterpass": "1.89.0",
-    "@akinon/pz-one-click-checkout": "1.89.0",
-    "@akinon/pz-otp": "1.89.0",
-    "@akinon/pz-pay-on-delivery": "1.89.0",
-    "@akinon/pz-saved-card": "1.89.0",
-    "@akinon/pz-tabby-extension": "1.89.0",
-    "@akinon/pz-tamara-extension": "1.89.0",
+    "@akinon/next": "1.90.0",
+    "@akinon/pz-akifast": "1.90.0",
+    "@akinon/pz-b2b": "1.90.0",
+    "@akinon/pz-basket-gift-pack": "1.90.0",
+    "@akinon/pz-bkm": "1.90.0",
+    "@akinon/pz-checkout-gift-pack": "1.90.0",
+    "@akinon/pz-click-collect": "1.90.0",
+    "@akinon/pz-credit-payment": "1.90.0",
+    "@akinon/pz-gpay": "1.90.0",
+    "@akinon/pz-masterpass": "1.90.0",
+    "@akinon/pz-one-click-checkout": "1.90.0",
+    "@akinon/pz-otp": "1.90.0",
+    "@akinon/pz-pay-on-delivery": "1.90.0",
+    "@akinon/pz-saved-card": "1.90.0",
+    "@akinon/pz-tabby-extension": "1.90.0",
+    "@akinon/pz-tamara-extension": "1.90.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -62,7 +62,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.89.0",
+    "@akinon/eslint-plugin-projectzero": "1.90.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/views/product/product-info.tsx

@@ -23,6 +23,7 @@ export default function ProductInfo({ data }: ProductPageProps) {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [stockAlertResponseMessage, setStockAlertResponseMessage] =
     useState(null);
+  const [isVariantLoading, setIsVariantLoading] = useState(false);
 
   const [addProduct, { isLoading: isAddToCartLoading }] =
     useAddProductToBasket();
@@ -30,6 +31,18 @@ export default function ProductInfo({ data }: ProductPageProps) {
     useAddStockAlertMutation();
   const inStock = data.selected_variant !== null || data.product.in_stock;
 
+  useEffect(() => {
+    isVariantSelectionComplete() && setIsVariantLoading(false);
+
+    !inStock && setIsVariantLoading(false);
+  }, [data]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  useEffect(() => {
+    if (isVariantLoading) {
+      setProductError(null);
+    }
+  }, [isVariantLoading]);
+
   useEffect(() => {
     setCurrentUrl(window.location.href);
   }, [currentUrl]);
@@ -82,6 +95,12 @@ export default function ProductInfo({ data }: ProductPageProps) {
     return true;
   };
 
+  const isVariantSelectionComplete = () => {
+    return data?.variants.every((variant) =>
+      variant?.options.some((opt) => opt.is_selected)
+    );
+  };
+
   const addProductToStockAlertList = async () => {
     try {
       await addStockAlert({
@@ -174,7 +193,10 @@ export default function ProductInfo({ data }: ProductPageProps) {
             key={variant.attribute_key}
             {...variant}
             className="items-center mt-8"
-            onChange={() => setProductError(null)}
+            onChange={() => {
+              setProductError(null);
+              setIsVariantLoading(true);
+            }}
           />
         ))}
       </div>
@@ -186,7 +208,9 @@ export default function ProductInfo({ data }: ProductPageProps) {
       )}
 
       <Button
-        disabled={isAddToCartLoading || isAddToStockAlertLoading}
+        disabled={
+          isAddToCartLoading || isAddToStockAlertLoading || isVariantLoading
+        }
         className={clsx(
           'fixed bottom-0 right-0 w-1/2 h-14 z-[20] flex items-center justify-center fill-primary-foreground',
           'hover:fill-primary sm:relative sm:w-full sm:mt-3 sm:font-semibold sm:h-12'
@@ -202,7 +226,13 @@ export default function ProductInfo({ data }: ProductPageProps) {
         }}
         data-testid="product-add-to-cart"
       >
-        {inStock ? (
+        {isVariantLoading ? (
+          <Icon
+            name="spinner"
+            size={20}
+            className="animate-spin mr-4 fill-primary"
+          />
+        ) : inStock ? (
           <span>{t('product.add_to_cart')}</span>
         ) : (
           <>

package/commands/plugins.ts

@@ -2,8 +2,7 @@ import * as fs from 'fs';
 import path from 'path';
 import { execSync } from 'child_process';
 import semver from 'semver';
-
-const Prompt = require('prompt-checkbox');
+import { checkbox } from '@inquirer/prompts';
 
 const rootDir = path.resolve(process.cwd());
 
@@ -120,36 +119,25 @@ export default async () => {
     }
   ];
 
-  const prompt = new Prompt({
-    name: 'plugins',
-    message: 'Please check/uncheck plugins to install/uninstall.',
-    type: 'checkbox',
-    default: installedPlugins.map((p) =>
-      definedPlugins.findIndex((dp) => dp.value === p)
-    ),
-    choices: definedPlugins.map((p, index) => `${index + 1}) ${p.name}`)
-  });
-
-  prompt.ask(async (answers: Array<string>) => {
-    const formattedAnswers = answers.map((answer) =>
-      answer.replace(/\d\)\s/, '')
-    );
-
-    const values = formattedAnswers.map(
-      (answer) => definedPlugins.find((p) => p.name === answer)?.value
-    );
-
-    if (formattedAnswers.length) {
-      console.log(`\nInstalling ${formattedAnswers.join(', ')}.`);
-    } else {
-      console.log(`\nUninstalling all plugins.`);
+  try {
+    const answers = await checkbox({
+      message: 'Please check/uncheck plugins to install/uninstall.',
+      choices: definedPlugins.map((plugin) => ({
+        name: plugin.name,
+        value: plugin.value,
+        checked: installedPlugins.includes(plugin.value)
+      }))
+    });
+
+    if (!answers.length) {
+      console.log('\x1b[33m%s\x1b[0m', `\nUninstalling all plugins.`);
     }
 
-    console.log(`\nPlease wait...`);
+    console.log('\x1b[36m%s\x1b[0m', `\nPlease wait...`);
 
     fs.writeFileSync(
       pluginsFilePath,
-      `module.exports = ${JSON.stringify(values)};\n`,
+      `module.exports = ${JSON.stringify(answers)};\n`,
       {
         encoding: 'utf-8'
       }
@@ -159,11 +147,13 @@ export default async () => {
 
     console.log(
       '\x1b[32m%s\x1b[0m',
-      `\n ✓ ${
-        formattedAnswers.length
+      `\n✓ ${
+        answers.length
           ? 'Installed selected plugins'
           : 'Uninstalled all plugins'
       }.\n`
     );
-  });
+  } catch (error) {
+    process.exit(1);
+  }
 };

package/dist/commands/plugins.js

@@ -39,7 +39,7 @@ const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const semver_1 = __importDefault(require("semver"));
-const Prompt = require('prompt-checkbox');
+const prompts_1 = require("@inquirer/prompts");
 const rootDir = path_1.default.resolve(process.cwd());
 function checkVersion(pkg) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -133,29 +133,28 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             value: 'pz-tamara-extension'
         }
     ];
-    const prompt = new Prompt({
-        name: 'plugins',
-        message: 'Please check/uncheck plugins to install/uninstall.',
-        type: 'checkbox',
-        default: installedPlugins.map((p) => definedPlugins.findIndex((dp) => dp.value === p)),
-        choices: definedPlugins.map((p, index) => `${index + 1}) ${p.name}`)
-    });
-    prompt.ask((answers) => __awaiter(void 0, void 0, void 0, function* () {
-        const formattedAnswers = answers.map((answer) => answer.replace(/\d\)\s/, ''));
-        const values = formattedAnswers.map((answer) => { var _a; return (_a = definedPlugins.find((p) => p.name === answer)) === null || _a === void 0 ? void 0 : _a.value; });
-        if (formattedAnswers.length) {
-            console.log(`\nInstalling ${formattedAnswers.join(', ')}.`);
-        }
-        else {
-            console.log(`\nUninstalling all plugins.`);
+    try {
+        const answers = yield (0, prompts_1.checkbox)({
+            message: 'Please check/uncheck plugins to install/uninstall.',
+            choices: definedPlugins.map((plugin) => ({
+                name: plugin.name,
+                value: plugin.value,
+                checked: installedPlugins.includes(plugin.value)
+            }))
+        });
+        if (!answers.length) {
+            console.log('\x1b[33m%s\x1b[0m', `\nUninstalling all plugins.`);
         }
-        console.log(`\nPlease wait...`);
-        fs.writeFileSync(pluginsFilePath, `module.exports = ${JSON.stringify(values)};\n`, {
+        console.log('\x1b[36m%s\x1b[0m', `\nPlease wait...`);
+        fs.writeFileSync(pluginsFilePath, `module.exports = ${JSON.stringify(answers)};\n`, {
             encoding: 'utf-8'
         });
         (0, child_process_1.execSync)('yarn install', { stdio: 'pipe' });
-        console.log('\x1b[32m%s\x1b[0m', `\n ✓ ${formattedAnswers.length
+        console.log('\x1b[32m%s\x1b[0m', `\n✓ ${answers.length
             ? 'Installed selected plugins'
             : 'Uninstalled all plugins'}.\n`);
-    }));
+    }
+    catch (error) {
+        process.exit(1);
+    }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.89.0",
+  "version": "1.90.0",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {
@@ -19,8 +19,8 @@
     "@types/temp": "0.9.4"
   },
   "dependencies": {
+    "@inquirer/prompts": "7.5.0",
     "loading-spinner": "1.2.1",
-    "prompt-checkbox": "2.2.0",
     "semver": "7.6.2",
     "temp": "0.9.4",
     "yargs": "^17.6.0"