Add userid to html meta

django-daiquiri · Jul 2, 2024 · fd08108 · fd08108
1 parent f5ad894
commit fd08108
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git 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 → daiquiri/core/assets/js/utils/meta.js b/daiquiri/core/assets/js/utils/location.js → daiquiri/core/assets/js/utils/meta.js
@@ -1,4 +1,5 @@
 // take the baseurl from the <head> 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
@@ -8,7 +8,8 @@
 <meta property="og:title" content="{{ request.site.name }}" />
 <meta property="og:url" content="{{ request.site.domain }}" />
 
-<meta name='baseurl' content="{% url 'home' %}" />
-<meta name='staticurl' content="{% static '' %}" />
+<meta name="baseurl" content="{% url 'home' %}" />
+<meta name="staticurl" content="{% static '' %}" />
+<meta name="userid" content="{{ request.user.id|default_if_none:'' }}" />
 
 <link rel="shortcut icon" href="{% static 'core/img/favicon.png' %}" type="image/png" />
diff --git 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 }) => {
           </ul>
         )
       }
-      <div className="card-footer">
-        <a href={`${baseUrl}/query/jobs/new/`} target="_blank" rel="noreferrer">
-          {gettext('View verbose job list')}
-        </a>
-      </div>
+      {
+        userId && (
+          <div className="card-footer">
+            <a href={`${baseUrl}/query/jobs/new/`} target="_blank" rel="noreferrer">
+              {gettext('View verbose job list')}
+            </a>
+          </div>
+        )
+      }
     </div>
   )
 }

diff --git 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
@@ -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/`