Merge branch 'ux'

# Conflicts:
#	app.config.yaml
#	package-lock.json
#	package.json
#	web-src/src/components/App.js
#	web-src/src/components/ApplicationProvider.js
#	web-src/src/components/GenerateButton.js
#	web-src/src/components/PromptTemplatePicker.js
#	web-src/src/components/VariationsSection.js
#	web-src/src/helpers/SpreadsheetParser.js
#	web-src/src/index.js
#	web-src/src/services/FirefallService.js

.babelrc

@@ -1,10 +1,13 @@
 {
   "plugins": [
     [
-      "@babel/plugin-transform-react-jsx", {
+      "@babel/plugin-transform-react-jsx",
+      {
         "runtime": "automatic"
       }
     ],
-    [ "@babel/plugin-transform-modules-commonjs" ]
+    [
+      "@babel/plugin-transform-modules-commonjs"
+    ]
   ]
 }

.eslintrc.cjs

@@ -17,6 +17,9 @@ module.exports = {
     "eslint:recommended",
     "plugin:react/recommended"
   ],
+  plugins: [
+    "react-hooks"
+  ],
   rules: {
     'no-console': 'off',
     'no-unused-vars': 'off',
@@ -27,7 +30,8 @@ module.exports = {
       'ignoreTemplateLiterals': true,
       'ignoreStrings': true,
       'code': 120
-    }]
+    }],
+    'react-hooks/rules-of-hooks': 'error'
   },
   env: {
     browser: true,

.npmrc

@@ -0,0 +1 @@
+@identity:registry=https://artifactory.corp.adobe.com/artifactory/api/npm/npm-adobe-release-local/

README.md

@@ -53,6 +53,7 @@ The list of supported parameters:
 - `label` - The label to display for the placeholder. If not provided, the placeholder will be displayed as the identifier transformed into a user-friendly format.
 - `description` - The description to display for the placeholder.
 - `type` - The type of input to expect from the user. If not provided, the placeholder will be displayed as a text input.
+- `default` - The default value to use for the placeholder. If not provided, the placeholder will be displayed as an empty input.
 - `spreadsheet` - The name of the spreadsheet to use for the placeholder. If not provided, the placeholder will be displayed as a text input. This parameter sets the type to `spreadsheet`.
 
 The list of supported types:

app.config.yaml

@@ -11,15 +11,15 @@ application:
             runtime: nodejs:18
             inputs:
               LOG_LEVEL: debug
-              FIREFALL_API_KEY: $FIREFALL_API_KEY
               FIREFALL_ENDPOINT: $FIREFALL_ENDPOINT
-              IMS_ENV: $IMS_ENV
+              FIREFALL_API_KEY: $FIREFALL_API_KEY
               IMS_ENDPOINT: $IMS_ENDPOINT
               IMS_CLIENT_ID: $IMS_CLIENT_ID
               IMS_SERVICE_CLIENT_ID: $IMS_SERVICE_CLIENT_ID
               IMS_SERVICE_CLIENT_SECRET: $IMS_SERVICE_CLIENT_SECRET
               IMS_SERVICE_PERM_AUTH_CODE: $IMS_SERVICE_PERM_AUTH_CODE
               IMS_PRODUCT_CONTEXT: $IMS_PRODUCT_CONTEXT
+              IMS_ENV: $IMS_ENV
             limits:
               timeout: 180000
           feedback:
@@ -28,14 +28,14 @@ application:
             runtime: nodejs:18
             inputs:
               LOG_LEVEL: debug
-              FIREFALL_API_KEY: $FIREFALL_API_KEY
               FIREFALL_ENDPOINT: $FIREFALL_ENDPOINT
-              IMS_ENV: $IMS_ENV
+              FIREFALL_API_KEY: $FIREFALL_API_KEY
               IMS_ENDPOINT: $IMS_ENDPOINT
               IMS_CLIENT_ID: $IMS_CLIENT_ID
               IMS_SERVICE_CLIENT_ID: $IMS_SERVICE_CLIENT_ID
               IMS_SERVICE_CLIENT_SECRET: $IMS_SERVICE_CLIENT_SECRET
               IMS_SERVICE_PERM_AUTH_CODE: $IMS_SERVICE_PERM_AUTH_CODE
               IMS_PRODUCT_CONTEXT: $IMS_PRODUCT_CONTEXT
+              IMS_ENV: $IMS_ENV
             limits:
               timeout: 180000

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "start": "REACT_APP_VERSION=$npm_package_version REACT_APP_API_ENDPOINT=http://localhost:3233/api/v1/web/guest/aem-genai-assistant aio app run --local",
+    "start": "REACT_APP_VERSION=$npm_package_version aio app run --local",
     "preview": "REACT_APP_VERSION=$npm_package_version aio app run",
     "grammar": "nearleyc web-src/src/helpers/expressions.ne -o web-src/src/helpers/Parser.generated.js",
     "build": "REACT_APP_VERSION=$npm_package_version aio app build",
@@ -18,8 +18,10 @@
   "dependencies": {
     "@adobe/aio-sdk": "3.0.0",
     "@adobe/generator-add-action-generic": "0.2.9",
-    "@adobe/react-spectrum": "3.31.1",
-    "@identity/imslib": "^0.40.0",
+    "@adobe/react-spectrum": "3.32.0",
+    "@emotion/css": "11.11.2",
+    "@emotion/react": "11.11.1",
+    "@identity/imslib": "0.40.0",
     "@react-spectrum/toast": "3.0.0-beta.6",
     "@spectrum-icons/illustrations": "3.6.7",
     "@spectrum-icons/workflow": "4.2.6",
@@ -29,7 +31,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-simple-code-editor": "0.13.1",
-    "react-transition-group": "^4.4.5",
+    "react-transition-group": "4.4.5",
     "recoil": "0.7.7",
     "uuid": "9.0.1",
     "wretch": "2.7.0"
@@ -43,10 +45,12 @@
     "@babel/polyfill": "7.8.7",
     "@babel/preset-env": "7.8.7",
     "@openwhisk/wskdebug": "1.3.0",
+    "@parcel/transformer-sass": "2.10.2",
     "@semantic-release/changelog": "6.0.3",
     "babel-jest": "29.7.0",
     "eslint": "8.53.0",
     "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react-hooks": "4.6.0",
     "jest": "29"
   },
   "engines": {
@@ -57,5 +61,12 @@
   ],
   "@parcel/resolver-default": {
     "packageExports": true
+  },
+  "targets": {
+    "default": {
+      "sourceMap": {
+        "inline": true
+      }
+    }
   }
 }

web-src/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="spectrum spectrum--medium spectrum--light">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
@@ -10,6 +10,6 @@
 <body>
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
-  <script src="./src/index.js" async="true" type="module"></script>
+  <script src="./src/index.js" type="module"></script>
 </body>
 </html>