From 8c50a7403e6ed6f0fc0413f5cf7fbf53719aa129 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Sat, 20 Nov 2021 09:09:23 -0600 Subject: [PATCH 01/16] copy assets script --- app/routes.tsx | 2 +- tools/copy_assets.sh | 10 ++++++++++ tools/start_api.sh | 14 +++++++------- 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100755 tools/copy_assets.sh diff --git a/app/routes.tsx b/app/routes.tsx index 75931e03a8..b08c0e54cf 100644 --- a/app/routes.tsx +++ b/app/routes.tsx @@ -68,7 +68,7 @@ export const routes = ( element={} /> - + } crumb={orgCrumb}> } /> diff --git a/tools/copy_assets.sh b/tools/copy_assets.sh new file mode 100755 index 0000000000..8af908da44 --- /dev/null +++ b/tools/copy_assets.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -o errexit # exit if anything fails +set -o pipefail +set -o xtrace + +API_URL=http://127.0.0.1:12220 yarn build +rm -rf ~/oxide/omicron/nexus/assets +cp -R dist/assets ~/oxide/omicron/nexus/assets +cp dist/index.html ~/oxide/omicron/nexus/assets \ No newline at end of file diff --git a/tools/start_api.sh b/tools/start_api.sh index 0fb674090b..b41a842c0b 100755 --- a/tools/start_api.sh +++ b/tools/start_api.sh @@ -22,13 +22,13 @@ run_in_pane() { PINNED_API_VERSION=$(awk '/API_VERSION/ {print $2}' ../console/.github/workflows/packer.yaml) CURRENT_API_VERSION=$(git rev-parse HEAD) -if [ "$CURRENT_API_VERSION" != "$PINNED_API_VERSION" ]; then - echo -e "\nERROR: Omicron version pinned in console does not match HEAD\n" >&2 - echo -e " pinned: $PINNED_API_VERSION" >&2 - echo -e " HEAD: $CURRENT_API_VERSION\n" >&2 - echo -e "Check out the pinned commit and try again.\n" >&2 - exit 1 -fi +# if [ "$CURRENT_API_VERSION" != "$PINNED_API_VERSION" ]; then +# echo -e "\nERROR: Omicron version pinned in console does not match HEAD\n" >&2 +# echo -e " pinned: $PINNED_API_VERSION" >&2 +# echo -e " HEAD: $CURRENT_API_VERSION\n" >&2 +# echo -e "Check out the pinned commit and try again.\n" >&2 +# exit 1 +# fi tmux new -d -s omicron-console tmux set -t omicron-console pane-border-status top From 7b0f5f8892f8d56609d21bc3baa062be76149020 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Mon, 22 Nov 2021 12:44:27 -0600 Subject: [PATCH 02/16] update some (but not all) routes for /c/ prefix --- app/components/InstancesTable.tsx | 2 +- app/layouts/OrgLayout.tsx | 4 ++-- app/pages/OrgPage.tsx | 2 +- app/pages/ProjectsPage.tsx | 10 ++-------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/components/InstancesTable.tsx b/app/components/InstancesTable.tsx index 35c570b2b9..a32874d120 100644 --- a/app/components/InstancesTable.tsx +++ b/app/components/InstancesTable.tsx @@ -28,7 +28,7 @@ const columns = [ return ( {value} diff --git a/app/layouts/OrgLayout.tsx b/app/layouts/OrgLayout.tsx index 249fe9a391..fb4fc2e268 100644 --- a/app/layouts/OrgLayout.tsx +++ b/app/layouts/OrgLayout.tsx @@ -24,7 +24,7 @@ const ProjectList = (props: { className?: string }) => {
  • {p.name} @@ -35,7 +35,7 @@ const ProjectList = (props: { className?: string }) => {