@rancher/shell 0.5.3 → 1.2.1

package/rancher-components/components/StringList/StringList.vue

@@ -82,13 +82,6 @@ export default Vue.extend({
         return {} as ErrorMessages;
       },
     },
-    /**
-     * Enables bulk addition and defines the delimiter to split the input string.
-     */
-    bulkAdditionDelimiter: {
-      type:    RegExp,
-      default: null,
-    }
   },
   data() {
     return {
@@ -132,9 +125,13 @@ export default Vue.extend({
   },
 
   methods: {
-    onChange(value: string, index?: number) {
+    onChange(value: string) {
       this.value = value;
-      const items = this.addValueToItems(this.items, value, index);
+
+      const items = [
+        ...this.items,
+        this.value
+      ];
 
       this.toggleError(
         'duplicate',
@@ -324,7 +321,10 @@ export default Vue.extend({
       const value = this.value?.trim();
 
       if (value) {
-        const items = this.addValueToItems(this.items, value);
+        const items = [
+          ...this.items,
+          value,
+        ];
 
         if (!hasDuplicatedStrings(items, this.caseSensitive)) {
           this.updateItems(items);
@@ -343,8 +343,12 @@ export default Vue.extend({
       const value = this.value?.trim();
 
       if (value) {
-        const index = findStringIndex(this.items, item, false);
-        const items = index !== -1 ? this.addValueToItems(this.items, value, index) : this.items;
+        const items = [...this.items];
+        const index = findStringIndex(items, item, false);
+
+        if (index !== -1) {
+          items[index] = value;
+        }
 
         if (!hasDuplicatedStrings(items, this.caseSensitive)) {
           this.updateItems(items);
@@ -356,49 +360,6 @@ export default Vue.extend({
       }
     },
 
-    /**
-     * Add a new or update an exiting item in the items list.
-     *
-     * @param items The current items list.
-     * @param value The new value to be added.
-     * @param index The list index of the item to be updated (optional).
-     * @returns Updated items list.
-     */
-    addValueToItems(items: string[], value: string, index?: number): string[] {
-      const updatedItems = [...items];
-
-      // Add new item
-      if (index === undefined) {
-        if (this.bulkAdditionDelimiter && value.search(this.bulkAdditionDelimiter) >= 0) {
-          updatedItems.push(...this.splitBulkValue(value));
-        } else {
-          updatedItems.push(value);
-        }
-      } else { // Update existing item
-        if (this.bulkAdditionDelimiter && value.search(this.bulkAdditionDelimiter) >= 0) {
-          updatedItems.splice(index, 1, ...this.splitBulkValue(value));
-        } else {
-          updatedItems[index] = value;
-        }
-      }
-
-      return updatedItems;
-    },
-
-    /**
-     * Split the value by the defined delimiter and remove empty strings.
-     *
-     * @param value The value to be split.
-     * @returns Array containing split values.
-     */
-    splitBulkValue(value: string): string[] {
-      return value
-        .split(this.bulkAdditionDelimiter)
-        .filter((item) => {
-          return item.trim().length > 0;
-        });
-    },
-
     /**
      * Remove an item from items list
      */
@@ -432,7 +393,7 @@ export default Vue.extend({
       @dblclick="onClickEmptyBody()"
     >
       <div
-        v-for="(item, index) in items"
+        v-for="item in items"
         :key="item"
         :ref="item"
         :class="{
@@ -460,7 +421,7 @@ export default Vue.extend({
           :data-testid="`item-edit-${item}`"
           class="edit-input static"
           :value="value != null ? value : item"
-          @input="onChange($event, index)"
+          @input="onChange($event)"
           @blur.prevent="updateItem(item)"
           @keydown.native.enter="updateItem(item, !errors.duplicate)"
         />

package/scripts/extension/bundle

@@ -16,7 +16,6 @@ REGISTRY="${3}"
 REGISTRY_ORG="${4}"
 IMAGE_PREFIX="${5}"
 PUSH="${6}"
-PODMAN_CONTAINER="${7}"
 
 PKG_NAME="${PKG}-${PKG_VERSION}"
 
@@ -49,15 +48,12 @@ for d in ${BASE_DIR}/dist-pkg/*; do
   cp -R ${BASE_DIR}/dist-pkg/${pkg} ${TMP}/container/plugin
 done
 
-package() {
-  if [ "${PODMAN_CONTAINER}" == "true" ]; then
-    RUNTIME="podman"
-  else
-    RUNTIME="docker"
-  fi
-  echo -e "Container build: ${RUNTIME}"
+# Build the docker image
+pushd ${TMP}/container > /dev/null
+echo -e "${CYAN}Building container image ...${RESET}"
 
-  REGISTRY=${REGISTRY} ORG=${REGISTRY_ORG} REPO=${IMAGE_PREFIX}${PKG} TAG=${PKG_VERSION} RUNTIME=${RUNTIME} ./scripts/package
+if [ ! -z "${REGISTRY}" ]; then
+  REGISTRY=${REGISTRY} ORG=${REGISTRY_ORG} REPO=${IMAGE_PREFIX}${PKG} TAG=${PKG_VERSION} ./scripts/package
 
   if [ "${PUSH}" == "--push" ]; then
     echo -e "${CYAN}Pushing container image ...${RESET}"
@@ -65,22 +61,14 @@ package() {
     # Ensure that you do not overwrite production images
     if [[ "${REGISTRY_ORG}" == "rancher" ]]; then
       IMAGE=${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${PKG}:${PKG_VERSION}
-      if ${RUNTIME} manifest inspect ${IMAGE} 2>&1 1>/dev/null; then
+      if docker manifest inspect 2>&1 1>/dev/null; then
         echo -e "${RED}${BOLD}Cannot overwrite production image ${IMAGE_PREFIX}${PKG} since it already exists${RESET}"
         exit 1
       fi
     fi
 
-    ${RUNTIME} push ${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${PKG}:${PKG_VERSION}
+    docker push ${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${PKG}:${PKG_VERSION}
   fi
-}
-
-# Build the container image
-pushd ${TMP}/container > /dev/null
-echo -e "${CYAN}Building container image ...${RESET}"
-
-if [ ! -z "${REGISTRY}" ]; then
-  package
 fi
 
 popd > /dev/null

package/scripts/extension/helm/scripts/package

@@ -5,8 +5,8 @@ source $(dirname $0)/version
 
 cd $(dirname $0)/..
 
-if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]] || [[ -z ${RUNTIME} ]]; then
-    echo "Usage: [REGISTRY=] ORG= REPO= TAG= RUNTIME= ./scripts/package"
+if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]]; then
+    echo "Usage: [REGISTRY=] ORG= REPO= TAG= ./scripts/package"
     exit 1
 fi
 
@@ -19,13 +19,5 @@ if [ -e ${DOCKERFILE}.${ARCH} ]; then
     DOCKERFILE=${DOCKERFILE}.${ARCH}
 fi
 
-BUILD="${RUNTIME} build -f ${DOCKERFILE} -t ${IMAGE}"
-
-if [[ ${RUNTIME} == "podman" ]]; then
-    BUILD="$BUILD -v /var/lib/containers:/var/lib/containers ."
-else
-    BUILD="$BUILD ."
-fi
-
-$BUILD
+docker build -f ${DOCKERFILE} -t ${IMAGE} .
 echo Built ${IMAGE}

package/scripts/extension/parse-tag-name

@@ -4,8 +4,8 @@ GITHUB_RELEASE_TAG=$1
 GITHUB_RUN_ID=$2
 GITHUB_WORKFLOW_TYPE=$3
 
-# Ensure "catalog" workflow release tag name does not match a pkg/<pkg-name>
-if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
+# Check packages for released tag name
+if [[ "${GITHUB_WORKFLOW_TYPE}" == "container" ]]; then
   for d in pkg/*/ ; do
     pkg=$(basename $d)
 
@@ -19,7 +19,7 @@ if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
     fi
   done
 else
-  # Ensure "charts" workflow release tag name does not match the root <pkg-name>
+  # Check base extension name for tag name
   BASE_EXT=$(jq -r .name package.json)
   EXT_VERSION=$(jq -r .version package.json)
 
@@ -27,4 +27,4 @@ else
     echo -e "tag: ${GITHUB_RELEASE_TAG}"
     gh run cancel ${GITHUB_RUN_ID}
   fi
-fi
+fi

package/scripts/extension/publish

@@ -17,7 +17,6 @@ IMAGE_PREFIX="ui-extension-"
 FORCE="false"
 GITHUB_BUILD="true"
 GITHUB_RELEASE_TAG=""
-PODMAN_CONTAINER="false"
 
 GITHUB_SOURCE=$(git config --get remote.origin.url | sed -e 's/^git@.*:\([[:graph:]]*\).git/\1/')
 GITHUB_BRANCH="main"
@@ -34,11 +33,10 @@ usage() {
   echo "  -r <name>    Specify destination container registry for built images"
   echo "  -o <name>    Specify destination container registry organization for built images"
   echo "  -i <prefix>  Specify prefix for the built container image (default: 'ui-extension-')"
-  echo "  -l           Specify Podman container build"
   exit 1
 }
 
-while getopts "hvr:o:pi:fcb:t:s:l" opt; do
+while getopts "hvr:o:pi:fcb:t:s:" opt; do
   case $opt in
     h)
       usage
@@ -72,9 +70,6 @@ while getopts "hvr:o:pi:fcb:t:s:l" opt; do
     t)
       GITHUB_RELEASE_TAG="${OPTARG}"
       ;;
-    l)
-      PODMAN_CONTAINER="true"
-      ;;
     *)
       usage
       ;;
@@ -131,11 +126,7 @@ fi
 
 COMMANDS=("node" "jq" "yq" "git" "helm" "yarn")
 if [ "${GITHUB_BUILD}" == "false" ]; then
-  if [ "${PODMAN_CONTAINER}" == "true" ]; then
-    COMMANDS+=("podman")
-  else
-    COMMANDS+=("docker")
-  fi
+  COMMANDS+=("docker")
 fi
 
 HAVE_COMMANDS="true"
@@ -181,12 +172,10 @@ if [ "${GITHUB_BUILD}" == "false" ]; then
     exit 1
   fi
 
-  if [ "${PODMAN_CONTAINER}" == "false" ]; then
-    docker images > /dev/null
-    if [ $? -ne 0 ]; then
-      echo "docker is not running - this is required to build container images for the UI Plugins"
-      exit 1
-    fi
+  docker images > /dev/null
+  if [ $? -ne 0 ]; then
+    echo "docker is not running - this is required to build container images for the UI Plugins"
+    exit 1
   fi
 fi
 
@@ -365,8 +354,8 @@ if [ "${GITHUB_BUILD}" == "false" ]; then
   echo -e "${CYAN}Base extension: ${BASE_EXT}${RESET}"
   echo -e "${CYAN}Extension version: ${EXT_VERSION}${RESET}"
 
-  # Build the container image
-  ${SCRIPT_DIR}/bundle "${BASE_EXT}" "${EXT_VERSION}" "${REGISTRY}" "${REGISTRY_ORG}" "${IMAGE_PREFIX}" "${PUSH}" "${PODMAN_CONTAINER}"
+  # Build the docker image
+  ${SCRIPT_DIR}/bundle ${BASE_EXT} ${EXT_VERSION} ${REGISTRY} ${REGISTRY_ORG} ${IMAGE_PREFIX} ${PUSH}
 else
   rm -rf ${CHART_TEMPLATE}
 fi
@@ -397,5 +386,5 @@ fi
 rm -rf ${CHART_TMP}
 
 if [ "${GITHUB_BUILD}" == "false" ]; then
-  rm -rf ${TMP} ${ASSETS} ${CHARTS} ${BASE_DIR}/extensions ${BASE_DIR}/dist-pkg ${ROOT_INDEX}
+  rm -rf ${TMP}
 fi

package/scripts/publish-shell.sh

@@ -8,8 +8,6 @@ BASE_DIR="$(
 SHELL_DIR=$BASE_DIR/shell/
 TMP_DIR=$BASE_DIR/tmp
 PUBLISH_ARGS="--no-git-tag-version --access public $PUBLISH_ARGS"
-FORCE_PUBLISH_TO_NPM="false"
-DEFAULT_YARN_REGISTRY="https://registry.npmjs.org"
 
 if [ ! -d "${BASE_DIR}/node_modules" ]; then
   echo "You need to run 'yarn install' first"
@@ -18,14 +16,6 @@ fi
 
 echo "Publishing Shell Packages"
 
-if [ "$1" == "--npm" ]; then
-  FORCE_PUBLISH_TO_NPM="true"
-fi
-
-if [ "$FORCE_PUBLISH_TO_NPM" == "true" ]; then
-  export YARN_REGISTRY=$DEFAULT_YARN_REGISTRY
-fi
-
 # We use the version from the shell package for the creator packages
 # Need to copy them to a temporary location, so we can patch the version number
 # before publishing
@@ -88,7 +78,7 @@ function publish() {
   # Make a note of dependency versions, if required
   node ${SCRIPT_DIR}/record-deps.js
 
-  yarn publish . --new-version ${PKG_VERSION} ${PUBLISH_ARGS}
+  yarn publish . --new-version ${PKG_VERSION} ${PUBLISH_ARGS} --tag v1.2
   RET=$?
 
   popd >/dev/null

package/scripts/test-plugins-build.sh

@@ -7,9 +7,6 @@ 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/
-SHELL_VERSION="99.99.99"
-DEFAULT_YARN_REGISTRY="https://registry.npmjs.org"
-VERDACCIO_YARN_REGISTRY="http://localhost:4873"
 
 echo ${SCRIPT_DIR}
 
@@ -69,24 +66,21 @@ else
   rm -rf ~/.config/verdaccio/storage/@rancher/*
 fi
 
-export YARN_REGISTRY=$VERDACCIO_YARN_REGISTRY
+export YARN_REGISTRY=http://localhost:4873
 export NUXT_TELEMETRY_DISABLED=1
 
 # Remove test package from previous run, if present
-if [ $TEST_PERSIST_BUILD != "true" ]; then
-  echo "Removing folder ${BASE_DIR}/pkg/test-pkg"
-  rm -rf ${BASE_DIR}/pkg/test-pkg
-fi
+rm -rf ${BASE_DIR}/pkg/test-pkg
 
 # We need to patch the version number of the shell, otherwise if we are running
 # with the currently published version, things will fail as those versions
 # are already published and Verdaccio will check, since it is a read-through cache
-sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\(-alpha\.[0-9]*\|-release[0-9]*.[0-9]*.[0-9]*\|-rc\.[0-9]*\)\{0,1\}\",/\"version\": \"${SHELL_VERSION}\",/g" ${SHELL_DIR}/package.json
+sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\",/\"version\": \"7.7.7\",/g" ${SHELL_DIR}/package.json
 rm ${SHELL_DIR}/package.json.bak
 
 # Same as above for Rancher Components
 # We might have bumped the version number but its not published yet, so this will fail
-sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\(-alpha\.[0-9]*\|-release[0-9]*.[0-9]*.[0-9]*\|-rc\.[0-9]*\)\{0,1\}\",/\"version\": \"${SHELL_VERSION}\",/g" ${BASE_DIR}/pkg/rancher-components/package.json
+sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\",/\"version\": \"7.7.7\",/g" ${BASE_DIR}/pkg/rancher-components/package.json
 
 # Publish shell
 echo "Publishing shell packages to local registry"
@@ -114,7 +108,6 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   yarn install
 
   echo "Building skeleton app"
-
   FORCE_COLOR=true yarn build | cat
 
   # Package creator
@@ -134,91 +127,22 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   echo "Cleaning temporary dir"
   popd > /dev/null
 
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
-    echo "Removing folder ${DIR}"
-    rm -rf ${DIR}
-  fi
+  rm -rf ${DIR}
 fi
 
 pushd $BASE_DIR
+pwd
+ls
 
 # Now try a plugin within the dashboard codebase
 echo "Validating in-tree package"
 
 yarn install
 
-if [ $TEST_PERSIST_BUILD != "true" ]; then
-  echo "Removing folder ./pkg/test-pkg"
-  rm -rf ./pkg/test-pkg
-fi
-
+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
 FORCE_COLOR=true yarn build-pkg test-pkg | cat
-if [ $TEST_PERSIST_BUILD != "true" ]; then
-  echo "Removing folder ./pkg/test-pkg"
-  rm -rf ./pkg/test-pkg
-fi
-
-# function to clone repos and install dependencies (including the newly published shell version)
-function clone_repo_test_extension_build() {
-  REPO_NAME=$1
-  PKG_NAME=$2
-
-  echo -e "\nSetting up $REPO_NAME repository locally\n"
-
-  # set registry to default (to install all of the other dependencies)
-  yarn config set registry ${DEFAULT_YARN_REGISTRY}
-
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
-    echo "Removing folder ${BASE_DIR}/$REPO_NAME"
-    rm -rf ${BASE_DIR}/$REPO_NAME
-  fi
-
-  # cloning repo
-  git clone https://github.com/rancher/$REPO_NAME.git
-  pushd ${BASE_DIR}/$REPO_NAME
-
-  echo -e "\nInstalling dependencies for $REPO_NAME\n"
-  yarn install
-
-  # set registry to local verdaccio (to install new shell)
-  yarn config set registry ${VERDACCIO_YARN_REGISTRY}
-
-  # update package.json to use a specific version of shell
-  sed -i.bak -e "s/\"\@rancher\/shell\": \"[0-9]*.[0-9]*.[0-9]*\",/\"\@rancher\/shell\": \"${SHELL_VERSION}\",/g" package.json
-  rm package.json.bak
-
-  # we need to remove yarn.lock, otherwise it would install a version that we don't want
-  rm yarn.lock
-
-  echo -e "\nInstalling newly built shell version\n"
-
-  # installing new version of shell
-  yarn add @rancher/shell@${SHELL_VERSION}
-
-  # test build-pkg
-  FORCE_COLOR=true yarn build-pkg $PKG_NAME | cat
-
-  # kubewarden has some unit tests and they should be quick to run... Let's check them as well
-  if [ "${REPO_NAME}" == "kubewarden-ui" ]; then
-    yarn test:ci
-  fi
-
-  # return back to the base path
-  popd
-
-  # delete folder
-  if [ $TEST_PERSIST_BUILD != "true" ]; then
-    echo "Removing folder ${BASE_DIR}/$REPO_NAME"
-    rm -rf ${BASE_DIR}/$REPO_NAME
-  fi
-  yarn config set registry ${DEFAULT_YARN_REGISTRY}
-}
-
-# Here we just add the extension that we want to include as a check (all our official extensions should be included here)
-# Don't forget to add the unit tests exception to clone_repo_test_extension_build function if a new extension has those
-clone_repo_test_extension_build "kubewarden-ui" "kubewarden"
-clone_repo_test_extension_build "elemental-ui" "elemental"
+rm -rf ./pkg/test-pkg
 
 echo "All done"

package/store/catalog.js

@@ -354,7 +354,7 @@ export const actions = {
 
     // As per comment above, when there are no clusters this will be management. Store it such that it can be used for those cases
     commit('setInStore', inStore);
-    hash.cluster = hash.cluster?.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
+    hash.cluster = hash.cluster.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
 
     commit('setRepos', hash);
 

package/store/features.js

@@ -27,7 +27,6 @@ export const mapFeature = function(name) {
 export const MULTI_CLUSTER = create('multi-cluster-management', true);
 export const LEGACY = create('legacy', false);
 export const RKE2 = create('rke2', true);
-export const RKE1_UI = create('rke1-ui', true);
 export const UNSUPPORTED_STORAGE_DRIVERS = create('unsupported-storage-drivers', false);
 export const FLEET = create('continuous-delivery', true);
 export const HARVESTER = create('harvester', true);

package/store/i18n.js

@@ -308,17 +308,6 @@ export const actions = {
           p.push(dispatch('mergeLoad', { locale, module: fn }));
         });
 
-        // load all of the default locales from the plugins for fallback
-        if (locale !== DEFAULT_LOCALE) {
-          const defaultI18nExt = rootState.$plugin?.getDynamic('l10n', DEFAULT_LOCALE);
-
-          if (defaultI18nExt && defaultI18nExt.length) {
-            defaultI18nExt.forEach((fn) => {
-              p.push(dispatch('mergeLoad', { locale: DEFAULT_LOCALE, module: fn }));
-            });
-          }
-        }
-
         try {
           await Promise.all(p);
         } catch (e) {

package/store/index.js

@@ -604,7 +604,7 @@ export const mutations = {
     state.isRancherInHarvester = neu;
   },
 
-  updateNamespaces(state, { filters, all, getters }) {
+  updateNamespaces(state, { filters, all }) {
     state.namespaceFilters = filters.filter((x) => !!x);
 
     if ( all ) {
@@ -801,14 +801,14 @@ export const actions = {
     commit('targetRoute', targetRoute);
     const sameCluster = state.clusterId && state.clusterId === id;
     const samePackage = oldPkg?.name === newPkg?.name;
-    const sameProduct = oldProduct === product;
     const isMultiCluster = getters['isMultiCluster'];
 
-    // Are we in the same cluster and package or product?
-    if ( sameCluster && (samePackage || sameProduct)) {
+    // Are we in the same cluster and package?
+    if ( sameCluster && samePackage) {
       // Do nothing, we're already connected/connecting to this cluster
       return;
     }
+
     const oldPkgClusterStore = oldPkg?.stores.find(
       (s) => getters[`${ s.storeName }/isClusterStore`]
     )?.storeName;
@@ -829,6 +829,7 @@ export const actions = {
       // so that the nav and header stay the same when going to things like prefs
       commit('clusterReady', false);
       commit('clusterId', undefined);
+
       await dispatch('cluster/unsubscribe');
       commit('cluster/reset');
 
@@ -957,7 +958,6 @@ export const actions = {
     commit('updateNamespaces', {
       filters: filters || [ALL_USER],
       all:     allNamespaces,
-      getters
     });
 
     if (getters['currentCluster'] && getters['currentCluster'].isHarvester) {
@@ -980,7 +980,7 @@ export const actions = {
       }
     });
 
-    commit('updateNamespaces', { filters: ids, getters });
+    commit('updateNamespaces', { filters: ids });
   },
 
   async cleanNamespaces({ getters, dispatch }) {
@@ -1048,13 +1048,15 @@ export const actions = {
     if ( route.name === 'index' ) {
       router.replace('/auth/login');
     } else {
-      const backTo = window.localStorage.getItem(BACK_TO);
+      if (!process.server) {
+        const backTo = window.localStorage.getItem(BACK_TO);
 
-      const isLogin = route.name === 'auth-login' || route.path === '/login'; // Cover dashboard and case of log out from ember;
-      const isLogout = route.name === 'auth-logout';
+        const isLogin = route.name === 'auth-login' || route.path === '/login'; // Cover dashboard and case of log out from ember;
+        const isLogout = route.name === 'auth-logout';
 
-      if (!backTo && !isLogin && !isLogout) {
-        window.localStorage.setItem(BACK_TO, window.location.href);
+        if (!backTo && !isLogin && !isLogout) {
+          window.localStorage.setItem(BACK_TO, window.location.href);
+        }
       }
 
       const QUERY = (LOGGED_OUT in route.query) ? LOGGED_OUT : TIMED_OUT;