@rancher/shell 0.3.29 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.DS_Store +0 -0
- package/assets/translations/en-us.yaml +1 -1
- package/assets/translations/zh-hans.yaml +1 -1
- package/components/CopyCode.vue +6 -2
- package/components/CopyToClipboard.vue +2 -1
- package/components/CopyToClipboardText.vue +14 -9
- package/components/EtcdInfoBanner.vue +4 -4
- package/components/Markdown.vue +16 -12
- package/components/ResourceDetail/Masthead.vue +9 -6
- package/components/StatusTable.vue +5 -1
- package/components/__tests__/CopyCode.test.ts +5 -4
- package/components/fleet/FleetBundles.vue +5 -11
- package/components/fleet/FleetSummary.vue +3 -3
- package/components/fleet/__tests__/FleetSummary.test.ts +316 -0
- package/components/form/Password.vue +3 -1
- package/components/nav/Header.vue +1 -1
- package/config/home-links.js +1 -1
- package/core/plugin-helpers.js +3 -5
- package/creators/app/files/.gitlab-ci.yml +14 -0
- package/creators/app/init +19 -0
- package/edit/monitoring.coreos.com.prometheusrule/AlertingRule.vue +12 -3
- package/edit/monitoring.coreos.com.prometheusrule/GroupRules.vue +2 -1
- package/edit/provisioning.cattle.io.cluster/__tests__/CustomCommand.tests.ts +3 -1
- package/edit/workload/Upgrading.vue +3 -2
- package/edit/workload/storage/persistentVolumeClaim/persistentvolumeclaim.vue +2 -1
- package/initialize/index.js +24 -5
- package/models/__tests__/management.cattle.io.cluster.test.ts +4 -0
- package/models/management.cattle.io.cluster.js +7 -3
- package/models/provisioning.cattle.io.cluster.js +19 -1
- package/package.json +2 -2
- package/pages/c/_cluster/apps/charts/index.vue +64 -43
- package/plugins/clean-html-directive.js +1 -19
- package/plugins/clean-html.js +53 -0
- package/plugins/clean-tooltip-directive.js +1 -1
- package/plugins/index.js +11 -0
- package/scripts/.DS_Store +0 -0
- package/scripts/extension/bundle +19 -7
- package/scripts/extension/helm/scripts/package +11 -3
- package/scripts/extension/publish +20 -9
- package/scripts/verdaccio.log +205 -0
- package/store/index.js +3 -4
- package/types/shell/index.d.ts +6 -0
- package/utils/clipboard.js +5 -0
- package/plugins/vue-clipboard2.js +0 -4
package/plugins/index.js
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Load the directives
|
|
3
|
+
*
|
|
4
|
+
* These are included in a function that can be explictly called, so that we can be sure
|
|
5
|
+
* of the execution order, rather than importing them at the top of a file.
|
|
6
|
+
*/
|
|
7
|
+
export function loadDirectives() {
|
|
8
|
+
import('./clean-html-directive');
|
|
9
|
+
import('./clean-tooltip-directive');
|
|
10
|
+
import('./directives');
|
|
11
|
+
}
|
|
Binary file
|
package/scripts/extension/bundle
CHANGED
|
@@ -16,6 +16,7 @@ REGISTRY="${3}"
|
|
|
16
16
|
REGISTRY_ORG="${4}"
|
|
17
17
|
IMAGE_PREFIX="${5}"
|
|
18
18
|
PUSH="${6}"
|
|
19
|
+
PODMAN_CONTAINER="${7}"
|
|
19
20
|
|
|
20
21
|
PKG_NAME="${PKG}-${PKG_VERSION}"
|
|
21
22
|
|
|
@@ -48,12 +49,15 @@ for d in ${BASE_DIR}/dist-pkg/*; do
|
|
|
48
49
|
cp -R ${BASE_DIR}/dist-pkg/${pkg} ${TMP}/container/plugin
|
|
49
50
|
done
|
|
50
51
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
package() {
|
|
53
|
+
if [ "${PODMAN_CONTAINER}" == "true" ]; then
|
|
54
|
+
RUNTIME="podman"
|
|
55
|
+
else
|
|
56
|
+
RUNTIME="docker"
|
|
57
|
+
fi
|
|
58
|
+
echo -e "Container build: ${RUNTIME}"
|
|
54
59
|
|
|
55
|
-
|
|
56
|
-
REGISTRY=${REGISTRY} ORG=${REGISTRY_ORG} REPO=${IMAGE_PREFIX}${PKG} TAG=${PKG_VERSION} ./scripts/package
|
|
60
|
+
REGISTRY=${REGISTRY} ORG=${REGISTRY_ORG} REPO=${IMAGE_PREFIX}${PKG} TAG=${PKG_VERSION} RUNTIME=${RUNTIME} ./scripts/package
|
|
57
61
|
|
|
58
62
|
if [ "${PUSH}" == "--push" ]; then
|
|
59
63
|
echo -e "${CYAN}Pushing container image ...${RESET}"
|
|
@@ -61,14 +65,22 @@ if [ ! -z "${REGISTRY}" ]; then
|
|
|
61
65
|
# Ensure that you do not overwrite production images
|
|
62
66
|
if [[ "${REGISTRY_ORG}" == "rancher" ]]; then
|
|
63
67
|
IMAGE=${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${PKG}:${PKG_VERSION}
|
|
64
|
-
if
|
|
68
|
+
if ${RUNTIME} manifest inspect ${IMAGE} 2>&1 1>/dev/null; then
|
|
65
69
|
echo -e "${RED}${BOLD}Cannot overwrite production image ${IMAGE_PREFIX}${PKG} since it already exists${RESET}"
|
|
66
70
|
exit 1
|
|
67
71
|
fi
|
|
68
72
|
fi
|
|
69
73
|
|
|
70
|
-
|
|
74
|
+
${RUNTIME} push ${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${PKG}:${PKG_VERSION}
|
|
71
75
|
fi
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
# Build the container image
|
|
79
|
+
pushd ${TMP}/container > /dev/null
|
|
80
|
+
echo -e "${CYAN}Building container image ...${RESET}"
|
|
81
|
+
|
|
82
|
+
if [ ! -z "${REGISTRY}" ]; then
|
|
83
|
+
package
|
|
72
84
|
fi
|
|
73
85
|
|
|
74
86
|
popd > /dev/null
|
|
@@ -5,8 +5,8 @@ source $(dirname $0)/version
|
|
|
5
5
|
|
|
6
6
|
cd $(dirname $0)/..
|
|
7
7
|
|
|
8
|
-
if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]]; then
|
|
9
|
-
echo "Usage: [REGISTRY=] ORG= REPO= TAG= ./scripts/package"
|
|
8
|
+
if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]] || [[ -z ${RUNTIME} ]]; then
|
|
9
|
+
echo "Usage: [REGISTRY=] ORG= REPO= TAG= RUNTIME= ./scripts/package"
|
|
10
10
|
exit 1
|
|
11
11
|
fi
|
|
12
12
|
|
|
@@ -19,5 +19,13 @@ if [ -e ${DOCKERFILE}.${ARCH} ]; then
|
|
|
19
19
|
DOCKERFILE=${DOCKERFILE}.${ARCH}
|
|
20
20
|
fi
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
BUILD="${RUNTIME} build -f ${DOCKERFILE} -t ${IMAGE}"
|
|
23
|
+
|
|
24
|
+
if [[ ${RUNTIME} == "podman" ]]; then
|
|
25
|
+
BUILD="$BUILD -v /var/lib/containers:/var/lib/containers ."
|
|
26
|
+
else
|
|
27
|
+
BUILD="$BUILD ."
|
|
28
|
+
fi
|
|
29
|
+
|
|
30
|
+
$BUILD
|
|
23
31
|
echo Built ${IMAGE}
|
|
@@ -17,6 +17,7 @@ IMAGE_PREFIX="ui-extension-"
|
|
|
17
17
|
FORCE="false"
|
|
18
18
|
GITHUB_BUILD="true"
|
|
19
19
|
GITHUB_RELEASE_TAG=""
|
|
20
|
+
PODMAN_CONTAINER="false"
|
|
20
21
|
|
|
21
22
|
GITHUB_SOURCE=$(git config --get remote.origin.url | sed -e 's/^git@.*:\([[:graph:]]*\).git/\1/')
|
|
22
23
|
GITHUB_BRANCH="main"
|
|
@@ -33,10 +34,11 @@ usage() {
|
|
|
33
34
|
echo " -r <name> Specify destination container registry for built images"
|
|
34
35
|
echo " -o <name> Specify destination container registry organization for built images"
|
|
35
36
|
echo " -i <prefix> Specify prefix for the built container image (default: 'ui-extension-')"
|
|
37
|
+
echo " -l Specify Podman container build"
|
|
36
38
|
exit 1
|
|
37
39
|
}
|
|
38
40
|
|
|
39
|
-
while getopts "hvr:o:pi:fcb:t:s:" opt; do
|
|
41
|
+
while getopts "hvr:o:pi:fcb:t:s:l" opt; do
|
|
40
42
|
case $opt in
|
|
41
43
|
h)
|
|
42
44
|
usage
|
|
@@ -70,6 +72,9 @@ while getopts "hvr:o:pi:fcb:t:s:" opt; do
|
|
|
70
72
|
t)
|
|
71
73
|
GITHUB_RELEASE_TAG="${OPTARG}"
|
|
72
74
|
;;
|
|
75
|
+
l)
|
|
76
|
+
PODMAN_CONTAINER="true"
|
|
77
|
+
;;
|
|
73
78
|
*)
|
|
74
79
|
usage
|
|
75
80
|
;;
|
|
@@ -126,7 +131,11 @@ fi
|
|
|
126
131
|
|
|
127
132
|
COMMANDS=("node" "jq" "yq" "git" "helm" "yarn")
|
|
128
133
|
if [ "${GITHUB_BUILD}" == "false" ]; then
|
|
129
|
-
|
|
134
|
+
if [ "${PODMAN_CONTAINER}" == "true" ]; then
|
|
135
|
+
COMMANDS+=("podman")
|
|
136
|
+
else
|
|
137
|
+
COMMANDS+=("docker")
|
|
138
|
+
fi
|
|
130
139
|
fi
|
|
131
140
|
|
|
132
141
|
HAVE_COMMANDS="true"
|
|
@@ -172,10 +181,12 @@ if [ "${GITHUB_BUILD}" == "false" ]; then
|
|
|
172
181
|
exit 1
|
|
173
182
|
fi
|
|
174
183
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
184
|
+
if [ "${PODMAN_CONTAINER}" == "false" ]; then
|
|
185
|
+
docker images > /dev/null
|
|
186
|
+
if [ $? -ne 0 ]; then
|
|
187
|
+
echo "docker is not running - this is required to build container images for the UI Plugins"
|
|
188
|
+
exit 1
|
|
189
|
+
fi
|
|
179
190
|
fi
|
|
180
191
|
fi
|
|
181
192
|
|
|
@@ -354,8 +365,8 @@ if [ "${GITHUB_BUILD}" == "false" ]; then
|
|
|
354
365
|
echo -e "${CYAN}Base extension: ${BASE_EXT}${RESET}"
|
|
355
366
|
echo -e "${CYAN}Extension version: ${EXT_VERSION}${RESET}"
|
|
356
367
|
|
|
357
|
-
# Build the
|
|
358
|
-
${SCRIPT_DIR}/bundle ${BASE_EXT} ${EXT_VERSION} ${REGISTRY} ${REGISTRY_ORG} ${IMAGE_PREFIX} ${PUSH}
|
|
368
|
+
# Build the container image
|
|
369
|
+
${SCRIPT_DIR}/bundle "${BASE_EXT}" "${EXT_VERSION}" "${REGISTRY}" "${REGISTRY_ORG}" "${IMAGE_PREFIX}" "${PUSH}" "${PODMAN_CONTAINER}"
|
|
359
370
|
else
|
|
360
371
|
rm -rf ${CHART_TEMPLATE}
|
|
361
372
|
fi
|
|
@@ -386,5 +397,5 @@ fi
|
|
|
386
397
|
rm -rf ${CHART_TMP}
|
|
387
398
|
|
|
388
399
|
if [ "${GITHUB_BUILD}" == "false" ]; then
|
|
389
|
-
rm -rf ${TMP}
|
|
400
|
+
rm -rf ${TMP} ${ASSETS} ${CHARTS} ${BASE_DIR}/extensions ${BASE_DIR}/dist-pkg ${ROOT_INDEX}
|
|
390
401
|
fi
|
|
@@ -0,0 +1,205 @@
|
|
|
1
|
+
info --- config file - /Users/aalves/.config/verdaccio/config.yaml
|
|
2
|
+
info --- the "crypt" algorithm is deprecated consider switch to "bcrypt" in the configuration file. Read the documentation for additional details
|
|
3
|
+
info --- using htpasswd file: /Users/aalves/.config/verdaccio/htpasswd
|
|
4
|
+
info --- plugin successfully loaded: verdaccio-htpasswd
|
|
5
|
+
info --- plugin successfully loaded: verdaccio-audit
|
|
6
|
+
warn --- http address - http://localhost:4873/ - verdaccio/5.27.0
|
|
7
|
+
info <-- 127.0.0.1 requested 'PUT /-/user/admin'
|
|
8
|
+
http <-- 200, user: null(127.0.0.1), req: 'PUT /-/user/admin', bytes: 40/0
|
|
9
|
+
info --- the user admin has been added
|
|
10
|
+
http <-- 201, user: admin(127.0.0.1), req: 'PUT /-/user/admin', bytes: 40/74
|
|
11
|
+
info <-- 127.0.0.1 requested 'GET /'
|
|
12
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
13
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /', bytes: 0/550
|
|
14
|
+
info <-- 127.0.0.1 requested 'GET /-/static/runtime.fed125035fcb8864cc73.js'
|
|
15
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
16
|
+
info <-- 127.0.0.1 requested 'GET /-/static/vendors.fed125035fcb8864cc73.js'
|
|
17
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
18
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/1867
|
|
19
|
+
info <-- 127.0.0.1 requested 'GET /-/static/main.fed125035fcb8864cc73.js'
|
|
20
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
21
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/101727
|
|
22
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/903279
|
|
23
|
+
info <-- 127.0.0.1 requested 'GET /-/static/Home.fed125035fcb8864cc73.js'
|
|
24
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
25
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/1009
|
|
26
|
+
info <-- 127.0.0.1 requested 'GET /-/verdaccio/data/packages'
|
|
27
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
28
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/3
|
|
29
|
+
info <-- 127.0.0.1 requested 'GET /-/static/favicon.ico'
|
|
30
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/0
|
|
31
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/2054
|
|
32
|
+
info <-- 127.0.0.1 requested 'GET /'
|
|
33
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
34
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
35
|
+
info <-- 127.0.0.1 requested 'GET /-/static/runtime.fed125035fcb8864cc73.js'
|
|
36
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
37
|
+
info <-- 127.0.0.1 requested 'GET /-/static/vendors.fed125035fcb8864cc73.js'
|
|
38
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
39
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
40
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
41
|
+
info <-- 127.0.0.1 requested 'GET /-/static/main.fed125035fcb8864cc73.js'
|
|
42
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
43
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
44
|
+
info <-- 127.0.0.1 requested 'GET /-/static/Home.fed125035fcb8864cc73.js'
|
|
45
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
46
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
47
|
+
info <-- 127.0.0.1 requested 'GET /-/verdaccio/data/packages'
|
|
48
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
49
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
50
|
+
info <-- 127.0.0.1 requested 'GET /-/static/favicon.ico'
|
|
51
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/0
|
|
52
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/2054
|
|
53
|
+
info <-- 127.0.0.1 requested 'GET /'
|
|
54
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
55
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
56
|
+
info <-- 127.0.0.1 requested 'GET /-/static/runtime.fed125035fcb8864cc73.js'
|
|
57
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
58
|
+
info <-- 127.0.0.1 requested 'GET /-/static/vendors.fed125035fcb8864cc73.js'
|
|
59
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
60
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
61
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
62
|
+
info <-- 127.0.0.1 requested 'GET /-/static/main.fed125035fcb8864cc73.js'
|
|
63
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
64
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
65
|
+
info <-- 127.0.0.1 requested 'GET /-/static/Home.fed125035fcb8864cc73.js'
|
|
66
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
67
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
68
|
+
info <-- 127.0.0.1 requested 'GET /-/verdaccio/data/packages'
|
|
69
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
70
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
71
|
+
info <-- 127.0.0.1 requested 'GET /-/static/favicon.ico'
|
|
72
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/0
|
|
73
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/2054
|
|
74
|
+
info <-- 127.0.0.1 requested 'GET /'
|
|
75
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
76
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
77
|
+
info <-- 127.0.0.1 requested 'GET /-/static/runtime.fed125035fcb8864cc73.js'
|
|
78
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
79
|
+
info <-- 127.0.0.1 requested 'GET /-/static/vendors.fed125035fcb8864cc73.js'
|
|
80
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
81
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
82
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
83
|
+
info <-- 127.0.0.1 requested 'GET /-/static/main.fed125035fcb8864cc73.js'
|
|
84
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
85
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
86
|
+
info <-- 127.0.0.1 requested 'GET /-/static/Home.fed125035fcb8864cc73.js'
|
|
87
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
88
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
89
|
+
info <-- 127.0.0.1 requested 'GET /-/verdaccio/data/packages'
|
|
90
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
91
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
92
|
+
info <-- 127.0.0.1 requested 'GET /-/static/favicon.ico'
|
|
93
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/0
|
|
94
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/2054
|
|
95
|
+
info <-- 127.0.0.1 requested 'GET /'
|
|
96
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
97
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
98
|
+
info <-- 127.0.0.1 requested 'GET /-/static/runtime.fed125035fcb8864cc73.js'
|
|
99
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
100
|
+
info <-- 127.0.0.1 requested 'GET /-/static/vendors.fed125035fcb8864cc73.js'
|
|
101
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
102
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
103
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
104
|
+
info <-- 127.0.0.1 requested 'GET /-/static/main.fed125035fcb8864cc73.js'
|
|
105
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
106
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
107
|
+
info <-- 127.0.0.1 requested 'GET /-/static/Home.fed125035fcb8864cc73.js'
|
|
108
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
109
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
110
|
+
info <-- 127.0.0.1 requested 'GET /-/verdaccio/data/packages'
|
|
111
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
112
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
113
|
+
info <-- 127.0.0.1 requested 'GET /-/static/favicon.ico'
|
|
114
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/0
|
|
115
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/2054
|
|
116
|
+
info <-- 127.0.0.1 requested 'PUT /@rancher%2fshell'
|
|
117
|
+
info --- auth/allow_action: access granted to: admin
|
|
118
|
+
info --- admin is allowed publish for @rancher/shell
|
|
119
|
+
http <-- 200, user: admin(127.0.0.1), req: 'PUT /@rancher%2fshell', bytes: 2696205/0
|
|
120
|
+
info --- making request: 'GET https://registry.npmjs.org/@rancher%2Fshell'
|
|
121
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fshell' (streaming)
|
|
122
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fshell', bytes: 0/233704
|
|
123
|
+
http <-- 201, user: admin(127.0.0.1), req: 'PUT /@rancher%2fshell', bytes: 2696205/53
|
|
124
|
+
info <-- 127.0.0.1 requested 'PUT /@rancher%2fcreate-app'
|
|
125
|
+
info --- auth/allow_action: access granted to: admin
|
|
126
|
+
info --- admin is allowed publish for @rancher/create-app
|
|
127
|
+
http <-- 200, user: admin(127.0.0.1), req: 'PUT /@rancher%2fcreate-app', bytes: 6879/0
|
|
128
|
+
info --- making request: 'GET https://registry.npmjs.org/@rancher%2Fcreate-app'
|
|
129
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fcreate-app' (streaming)
|
|
130
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fcreate-app', bytes: 0/70025
|
|
131
|
+
http <-- 201, user: admin(127.0.0.1), req: 'PUT /@rancher%2fcreate-app', bytes: 6879/53
|
|
132
|
+
info <-- 127.0.0.1 requested 'PUT /@rancher%2fcreate-pkg'
|
|
133
|
+
info --- auth/allow_action: access granted to: admin
|
|
134
|
+
info --- admin is allowed publish for @rancher/create-pkg
|
|
135
|
+
http <-- 200, user: admin(127.0.0.1), req: 'PUT /@rancher%2fcreate-pkg', bytes: 5771/0
|
|
136
|
+
info --- making request: 'GET https://registry.npmjs.org/@rancher%2Fcreate-pkg'
|
|
137
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fcreate-pkg' (streaming)
|
|
138
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fcreate-pkg', bytes: 0/66370
|
|
139
|
+
http <-- 201, user: admin(127.0.0.1), req: 'PUT /@rancher%2fcreate-pkg', bytes: 5771/53
|
|
140
|
+
info <-- 127.0.0.1 requested 'PUT /@rancher%2fcreate-update'
|
|
141
|
+
info --- auth/allow_action: access granted to: admin
|
|
142
|
+
info --- admin is allowed publish for @rancher/create-update
|
|
143
|
+
http <-- 200, user: admin(127.0.0.1), req: 'PUT /@rancher%2fcreate-update', bytes: 8569/0
|
|
144
|
+
info --- making request: 'GET https://registry.npmjs.org/@rancher%2Fcreate-update'
|
|
145
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fcreate-update' (streaming)
|
|
146
|
+
http --- 200, req: 'GET https://registry.npmjs.org/@rancher%2Fcreate-update', bytes: 0/51582
|
|
147
|
+
http <-- 201, user: admin(127.0.0.1), req: 'PUT /@rancher%2fcreate-update', bytes: 8569/53
|
|
148
|
+
info <-- 127.0.0.1 requested 'GET /'
|
|
149
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
150
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
151
|
+
info <-- 127.0.0.1 requested 'GET /-/static/runtime.fed125035fcb8864cc73.js'
|
|
152
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
153
|
+
info <-- 127.0.0.1 requested 'GET /-/static/vendors.fed125035fcb8864cc73.js'
|
|
154
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
155
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
156
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
157
|
+
info <-- 127.0.0.1 requested 'GET /-/static/main.fed125035fcb8864cc73.js'
|
|
158
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
159
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
160
|
+
info <-- 127.0.0.1 requested 'GET /-/static/Home.fed125035fcb8864cc73.js'
|
|
161
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
162
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
163
|
+
info <-- 127.0.0.1 requested 'GET /-/verdaccio/data/packages'
|
|
164
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
165
|
+
info <-- 127.0.0.1 requested 'GET /-/static/favicon.ico'
|
|
166
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/0
|
|
167
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/2054
|
|
168
|
+
info --- auth/allow_action: access granted to: undefined
|
|
169
|
+
info --- allowed access for @rancher/shell
|
|
170
|
+
info --- auth/allow_action: access granted to: undefined
|
|
171
|
+
info --- allowed access for @rancher/create-app
|
|
172
|
+
info --- auth/allow_action: access granted to: undefined
|
|
173
|
+
info --- allowed access for @rancher/create-pkg
|
|
174
|
+
info --- auth/allow_action: access granted to: undefined
|
|
175
|
+
info --- allowed access for @rancher/create-update
|
|
176
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/3350
|
|
177
|
+
info <-- 127.0.0.1 requested 'GET /'
|
|
178
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
179
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /', bytes: 0/0
|
|
180
|
+
info <-- 127.0.0.1 requested 'GET /-/static/runtime.fed125035fcb8864cc73.js'
|
|
181
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
182
|
+
info <-- 127.0.0.1 requested 'GET /-/static/vendors.fed125035fcb8864cc73.js'
|
|
183
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
184
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/runtime.fed125035fcb8864cc73.js', bytes: 0/0
|
|
185
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/vendors.fed125035fcb8864cc73.js', bytes: 0/0
|
|
186
|
+
info <-- 127.0.0.1 requested 'GET /-/static/main.fed125035fcb8864cc73.js'
|
|
187
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
188
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/main.fed125035fcb8864cc73.js', bytes: 0/0
|
|
189
|
+
info <-- 127.0.0.1 requested 'GET /-/static/Home.fed125035fcb8864cc73.js'
|
|
190
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
191
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/static/Home.fed125035fcb8864cc73.js', bytes: 0/0
|
|
192
|
+
info <-- 127.0.0.1 requested 'GET /-/verdaccio/data/packages'
|
|
193
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
|
194
|
+
info <-- 127.0.0.1 requested 'GET /-/static/favicon.ico'
|
|
195
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/0
|
|
196
|
+
http <-- 200, user: null(127.0.0.1), req: 'GET /-/static/favicon.ico', bytes: 0/2054
|
|
197
|
+
info --- auth/allow_action: access granted to: undefined
|
|
198
|
+
info --- allowed access for @rancher/shell
|
|
199
|
+
info --- auth/allow_action: access granted to: undefined
|
|
200
|
+
info --- allowed access for @rancher/create-app
|
|
201
|
+
info --- auth/allow_action: access granted to: undefined
|
|
202
|
+
info --- allowed access for @rancher/create-pkg
|
|
203
|
+
info --- auth/allow_action: access granted to: undefined
|
|
204
|
+
info --- allowed access for @rancher/create-update
|
|
205
|
+
http <-- 304, user: null(127.0.0.1), req: 'GET /-/verdaccio/data/packages', bytes: 0/0
|
package/store/index.js
CHANGED
|
@@ -804,14 +804,14 @@ export const actions = {
|
|
|
804
804
|
commit('targetRoute', targetRoute);
|
|
805
805
|
const sameCluster = state.clusterId && state.clusterId === id;
|
|
806
806
|
const samePackage = oldPkg?.name === newPkg?.name;
|
|
807
|
+
const sameProduct = oldProduct === product;
|
|
807
808
|
const isMultiCluster = getters['isMultiCluster'];
|
|
808
809
|
|
|
809
|
-
// Are we in the same cluster and package?
|
|
810
|
-
if ( sameCluster && samePackage) {
|
|
810
|
+
// Are we in the same cluster and package or product?
|
|
811
|
+
if ( sameCluster && (samePackage || sameProduct)) {
|
|
811
812
|
// Do nothing, we're already connected/connecting to this cluster
|
|
812
813
|
return;
|
|
813
814
|
}
|
|
814
|
-
|
|
815
815
|
const oldPkgClusterStore = oldPkg?.stores.find(
|
|
816
816
|
(s) => getters[`${ s.storeName }/isClusterStore`]
|
|
817
817
|
)?.storeName;
|
|
@@ -832,7 +832,6 @@ export const actions = {
|
|
|
832
832
|
// so that the nav and header stay the same when going to things like prefs
|
|
833
833
|
commit('clusterReady', false);
|
|
834
834
|
commit('clusterId', undefined);
|
|
835
|
-
|
|
836
835
|
await dispatch('cluster/unsubscribe');
|
|
837
836
|
commit('cluster/reset');
|
|
838
837
|
|
package/types/shell/index.d.ts
CHANGED
|
@@ -3042,6 +3042,12 @@ declare function _default(ctx: any, inject: any): void;
|
|
|
3042
3042
|
export default _default;
|
|
3043
3043
|
}
|
|
3044
3044
|
|
|
3045
|
+
// @shell/utils/clipboard
|
|
3046
|
+
|
|
3047
|
+
declare module '@shell/utils/clipboard' {
|
|
3048
|
+
export function copyTextToClipboard(text: any): Promise<void>;
|
|
3049
|
+
}
|
|
3050
|
+
|
|
3045
3051
|
// @shell/utils/cluster
|
|
3046
3052
|
|
|
3047
3053
|
declare module '@shell/utils/cluster' {
|