@rancher/shell 0.1.0 → 0.1.1

package/scripts/publish-shell.sh

@@ -3,6 +3,7 @@
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
 SHELL_DIR=$BASE_DIR/shell/
+PUBLISH_ARGS="--no-git-tag-version --access public"
 
 echo "Publishing Shell Packages"
 
@@ -17,36 +18,54 @@ mkdir -p ${PKG_DIST}
 rm -rf ${PKG_DIST}/app
 rm -rf ${PKG_DIST}/pkg
 
-pushd ${SHELL_DIR}
-#yarn publish . --no-git-tag-version
+pushd ${SHELL_DIR} > /dev/null
 
 PKG_VERSION=`node -p "require('./package.json').version"`
-popd
+popd > /dev/null
 
-echo $PKG_VERSION
+echo "Publishing version: $PKG_VERSION"
 
 cp -R ${SHELL_DIR}/creators/app ${PKG_DIST}
 cp -R ${SHELL_DIR}/creators/pkg ${PKG_DIST}
 
-sed -i.bak -e "s/0.0.0/"$PKG_VERSION"/g" ${PKG_DIST}/app/package.json
-sed -i.bak -e "s/0.0.0/"$PKG_VERSION"/g" ${PKG_DIST}/pkg/package.json
+sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/app/package.json
+sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/pkg/package.json
 
 rm ${PKG_DIST}/app/package.json.bak
 rm ${PKG_DIST}/pkg/package.json.bak
 
-exit 0
+function publish() {
+  NAME=$1
+  FOLDER=$2
 
-# Publish the packages - don't tag the git repo and don't auto-increment the version number
-pushd ${SHELL_DIR}
-yarn publish . --no-git-tag-version
-popd
+  echo "Publishing ${NAME} from ${FOLDER}"
+  pushd ${FOLDER} > /dev/null
+
+  # For now, copy the rancher components into the shell and ship them with it
+  if [ "$NAME" == "Shell" ]; then
+    echo "Adding Rancher Components"
+    rm -rf ${SHELL_DIR}/rancher-components
+    cp -R ${BASE_DIR}/pkg/rancher-components/src/components ${SHELL_DIR}/rancher-components/
+  fi
+
+  yarn publish . --new-version ${PKG_VERSION} ${PUBLISH_ARGS}
+  RET=$?
+
+  # Remove the rancher-components folder if we created it
+  rm -rf ${SHELL_DIR}/rancher-components
 
-exit 0 
+  popd > /dev/null
+
+  if [ $RET -ne 0 ]; then
+    echo "Error publishing package ${NAME}"
+    exit $RET
+  fi
+}
+
+# Publish the packages - don't tag the git repo and don't auto-increment the version number
+publish "Shell" ${SHELL_DIR}
 
-pushd ${PKG_DIST}/app
-yarn publish . --no-git-tag-version
-popd
+publish "Application creator" ${PKG_DIST}/app
+publish "Package creator" ${PKG_DIST}/pkg
 
-pushd ${SHELL_DIR}/creators/pkg
-yarn publish . --no-git-tag-version
-popd
+echo "Done"

package/scripts/test-plugins-build.sh

@@ -0,0 +1,115 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "Checking plugin build"
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
+SHELL_DIR=$BASE_DIR/shell/
+
+echo ${SCRIPT_DIR}
+
+SKIP_SETUP="false"
+SKIP_STANDALONE="false"
+
+if [ "$1" == "-s" ]; then
+  SKIP_SETUP="true"
+fi
+
+if [ $SKIP_SETUP == "false" ]; then
+  set +e
+  which verdaccio > /dev/null
+  RET=$?
+  set -e
+
+  if [ $RET -ne 0 ]; then
+    echo "Verdaccio not installed"
+
+    npm install -g verdaccio
+  fi
+
+  set +e
+  RUNNING=$(ps -A | grep Verdaccio -c)
+  set -e
+
+  if [ $RUNNING -eq 0 ]; then
+    verdaccio > verdaccio.log &
+    PID=$!
+
+    echo "Verdaccio: $PID"
+
+    sleep 10
+
+    echo "Configuring Verdaccio user"
+    curl -XPUT -H "Content-type: application/json" -d '{ "name": "admin", "password": "admin" }' 'http://localhost:4873/-/user/admin' > login.json
+    TOKEN=$(jq -r .token login.json)
+    rm login.json
+    cat > ~/.npmrc << EOF
+//127.0.0.1:4873/:_authToken="$TOKEN"
+//localhost:4873/:_authToken="$TOKEN"
+EOF
+  else
+    echo "Verdaccio is already running"
+  fi
+fi
+
+rm -rf ~/.local/share/verdaccio/storage/@rancher/*
+
+export YARN_REGISTRY=http://localhost:4873
+
+# Publish shell
+echo "Publishing shell packages to local registry"
+${SHELL_DIR}/scripts/publish-shell.sh
+
+if [ "${SKIP_STANDALONE}" == "false" ]; then
+  DIR=$(mktemp -d)
+  pushd $DIR > /dev/null
+
+  echo "Using temporary directory ${DIR}"
+
+  echo "Verifying app creator package"
+
+  yarn create @rancher/app test-app
+  pushd test-app
+  yarn install
+
+  echo "Building skeleton app"
+  yarn build
+
+  # Package creator
+  echo "Verifying package creator package"
+  yarn create @rancher/pkg test-pkg
+
+  echo "Building test package"
+  yarn build-pkg test-pkg
+
+  # Add test list component to the test package
+  # Validates rancher-components imports
+  mkdir pkg/test-pkg/list
+  cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
+
+  yarn build-pkg test-pkg
+
+  echo "Cleaning temporary dir"
+  popd > /dev/null
+
+  rm -rf ${DIR}
+fi
+
+pushd $BASE_DIR
+pwd
+ls
+
+# Now try a plugin within the dashboard codebase
+echo "Validating in-tree package"
+
+yarn install
+
+rm -rf ./pkg/test-pkg
+yarn create @rancher/pkg test-pkg -t
+cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue ./pkg/test-pkg/list
+yarn build-pkg test-pkg
+rm -rf ./pkg/test-pkg
+
+echo "All done"

package/store/catalog.js

@@ -408,6 +408,10 @@ export const actions = {
     await dispatch('load', { force: true, reset: true });
   },
 
+  /*
+    Fetch full information about a specific version of a Helm chart,
+    including the standard values and README.
+  */
   async getVersionInfo({ state, getters, commit }, {
     repoType, repoName, chartName, versionName
   }) {

package/store/growl.js

@@ -10,6 +10,12 @@ export const state = function() {
   };
 };
 
+export const getters = {
+  find: state => ({ key, val }) => {
+    return findBy(state.stack, key, val);
+  }
+};
+
 export const mutations = {
   add(state, data) {
     state.stack.push({

package/store/i18n.js

@@ -59,16 +59,17 @@ export const getters = {
     return out;
   },
 
-  t: state => (key, args) => {
-    if (state.selected === NONE ) {
+  t: state => (key, args, language) => {
+    if (state.selected === NONE && !language) {
       return `%${ key }%`;
     }
 
-    const cacheKey = `${ state.selected }/${ key }`;
+    const locale = language || state.selected;
+    const cacheKey = `${ locale }/${ key }`;
     let formatter = intlCache[cacheKey];
 
     if ( !formatter ) {
-      let msg = get(state.translations[state.selected], key);
+      let msg = get(state.translations[locale], key);
 
       if ( !msg ) {
         msg = get(state.translations[state.default], key);
@@ -85,7 +86,7 @@ export const getters = {
       }
 
       if ( msg?.includes('{')) {
-        formatter = new IntlMessageFormat(msg, state.selected);
+        formatter = new IntlMessageFormat(msg, locale);
       } else {
         formatter = msg;
       }
@@ -110,8 +111,9 @@ export const getters = {
     }
   },
 
-  exists: state => (key) => {
-    const cacheKey = `${ state.selected }/${ key }`;
+  exists: state => (key, language) => {
+    const locale = language || state.selected;
+    const cacheKey = `${ locale }/${ key }`;
 
     if ( intlCache[cacheKey] ) {
       return true;
@@ -119,8 +121,8 @@ export const getters = {
 
     let msg = get(state.translations[state.default], key);
 
-    if ( !msg && state.selected && state.selected !== NONE ) {
-      msg = get(state.translations[state.selected], key);
+    if ( !msg && locale && locale !== NONE ) {
+      msg = get(state.translations[locale], key);
     }
 
     if ( msg !== undefined ) {
@@ -169,6 +171,13 @@ export const mutations = {
   },
 
   setSelected(state, locale) {
+    // this will set the lang param on HTML (best place to add this action since all locale changes go through this mutation)
+    if (locale === NONE) {
+      document.querySelector('html').removeAttribute('lang');
+    } else {
+      document.querySelector('html').setAttribute('lang', locale);
+    }
+
     state.selected = locale;
   },