diff --git a/daiquiri/core/assets/js/api/BaseApi.js b/daiquiri/core/assets/js/api/BaseApi.js index 6c95dddb..b8b61021 100644 --- a/daiquiri/core/assets/js/api/BaseApi.js +++ b/daiquiri/core/assets/js/api/BaseApi.js @@ -1,7 +1,7 @@ import Cookies from 'js-cookie' import isUndefined from 'lodash/isUndefined' -import { baseUrl } from '../utils/location' +import { baseUrl } from '../utils/meta' function ApiError(statusText, status) { this.status = status diff --git a/daiquiri/core/assets/js/utils/location.js b/daiquiri/core/assets/js/utils/meta.js similarity index 56% rename from daiquiri/core/assets/js/utils/location.js rename to daiquiri/core/assets/js/utils/meta.js index c80755d4..9fcc144b 100644 --- a/daiquiri/core/assets/js/utils/location.js +++ b/daiquiri/core/assets/js/utils/meta.js @@ -1,4 +1,5 @@ // take the baseurl from the of the django template const baseUrl = document.querySelector('meta[name="baseurl"]').content.replace(/\/+$/, '') +const userId = document.querySelector('meta[name="userid"]').content.replace(/\/+$/, '') -export { baseUrl } +export { baseUrl, userId } diff --git a/daiquiri/core/templates/core/new/base_head.html b/daiquiri/core/templates/core/new/base_head.html index bb362d57..6e159709 100644 --- a/daiquiri/core/templates/core/new/base_head.html +++ b/daiquiri/core/templates/core/new/base_head.html @@ -8,7 +8,8 @@ - - + + + diff --git a/daiquiri/query/assets/js/query/components/Jobs.js b/daiquiri/query/assets/js/query/components/Jobs.js index 8e9a17d3..e6196bff 100644 --- a/daiquiri/query/assets/js/query/components/Jobs.js +++ b/daiquiri/query/assets/js/query/components/Jobs.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' import classNames from 'classnames' import { isEmpty, isNil } from 'lodash' -import { baseUrl } from '../../../../../core/assets/js/utils/location' +import { baseUrl, userId } from '../../../../../core/assets/js/utils/meta' import { useLsState } from '../../../../../core/assets/js/hooks/ls' import { useJobsQuery } from '../hooks/query' @@ -116,11 +116,15 @@ const Jobs = ({ jobId, loadJob }) => { ) } -
- - {gettext('View verbose job list')} - -
+ { + userId && ( +
+ + {gettext('View verbose job list')} + +
+ ) + } ) } diff --git a/daiquiri/query/assets/js/query/components/Status.js b/daiquiri/query/assets/js/query/components/Status.js index 3a554d37..5fcc15e2 100644 --- a/daiquiri/query/assets/js/query/components/Status.js +++ b/daiquiri/query/assets/js/query/components/Status.js @@ -1,7 +1,7 @@ import React from 'react' import { isNil } from 'lodash' -import { baseUrl } from '../../../../../core/assets/js/utils/location' +import { baseUrl } from '../../../../../core/assets/js/utils/meta' import { useStatusQuery } from '../hooks/query' diff --git a/daiquiri/query/assets/js/query/utils/location.js b/daiquiri/query/assets/js/query/utils/location.js index 2f64fc21..57f91678 100644 --- a/daiquiri/query/assets/js/query/utils/location.js +++ b/daiquiri/query/assets/js/query/utils/location.js @@ -1,6 +1,6 @@ import { isEmpty, isNil, trim } from 'lodash' -import { baseUrl } from '../../../../../core/assets/js/utils/location' +import { baseUrl } from '../../../../../core/assets/js/utils/meta' const basePath = `${baseUrl}/query/new/`