Add show timestamp/seconds and fullscreen options to action page

options/locale/locale_en-US.ini

@@ -3447,6 +3447,10 @@ runs.no_matching_runner_helper = No matching runner: %s
 
 need_approval_desc = Need approval to run workflows for fork pull request.
 
+options.show_timestamp = Show timestamps
+options.show_full_screen = Show full screen
+options.show_log_seconds = Show seconds
+
 [projects]
 type-1.display_name = Individual Project
 type-2.display_name = Repository Project

templates/repo/actions/view.tmpl

@@ -19,6 +19,9 @@
 		data-locale-status-skipped="{{.locale.Tr "actions.status.skipped"}}"
 		data-locale-status-blocked="{{.locale.Tr "actions.status.blocked"}}"
 		data-locale-artifacts-title="{{$.locale.Tr "artifacts"}}"
+		data-locale-show-timestamp="{{.locale.Tr "actions.options.show_timestamp"}}"
+		data-locale-show-full-screen="{{.locale.Tr "actions.options.show_full_screen"}}"
+		data-locale-show-log-seconds="{{.locale.Tr "actions.options.show_log_seconds"}}"
 	>
 	</div>
 </div>

web_src/js/components/RepoActionView.vue

@@ -60,14 +60,36 @@
 
       <div class="action-view-right">
         <div class="job-info-header">
-          <h3 class="job-info-header-title">
-            {{ currentJob.title }}
-          </h3>
-          <p class="job-info-header-detail">
-            {{ currentJob.detail }}
-          </p>
+          <div class="job-info-header-left">
+            <h3 class="job-info-header-title">
+              {{ currentJob.title }}
+            </h3>
+            <p class="job-info-header-detail">
+              {{ currentJob.detail }}
+            </p>
+          </div>
+          <div class="job-info-header-right">
+            <div class="ui top right pointing dropdown custom jump item" @click.stop="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
+              <SvgIcon name="octicon-gear" :size="18"/>
+              <div class="menu transition action-job-menu" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
+                <a class="item" @click="toggleTimeDisplay('seconds')">
+                  <span><SvgIcon v-show="timeVisible['log-time-seconds']" name="octicon-check"/></span>
+                  {{ locale.jobOptions.showLogSeconds }}
+                </a>
+                <a class="item" @click="toggleTimeDisplay('stamp')">
+                  <span><SvgIcon v-show="timeVisible['log-time-stamp']" name="octicon-check"/></span>
+                  {{ locale.jobOptions.showTimeStamp }}
+                </a>
+                <div class="divider"/>
+                <a class="item" @click="toggleFullScreen()">
+                  <span><SvgIcon v-show="isFullScreen" name="octicon-check"/></span>
+                  {{ locale.jobOptions.showFullScreen }}
+                </a>
+              </div>
+            </div>
+          </div>
         </div>
-        <div class="job-step-container">
+        <div class="job-step-container" ref="steps">
           <div class="job-step-section" v-for="(jobStep, i) in currentJob.steps" :key="i">
             <div class="job-step-summary" @click.stop="toggleStepLogs(i)" :class="currentJobStepsStates[i].expanded ? 'selected' : ''">
               <!-- If the job is done and the job step log is loaded for the first time, show the loading icon
@@ -81,7 +103,8 @@
               <span class="step-summary-duration">{{ jobStep.duration }}</span>
             </div>
 
-            <!-- the log elements could be a lot, do not use v-if to destroy/reconstruct the DOM -->
+            <!-- the log elements could be a lot, do not use v-if to destroy/reconstruct the DOM,
+            use native DOM elements for "log line" to improve performance, Vue is not suitable for managing so many reactive elements. -->
             <div class="job-step-logs" ref="logs" v-show="currentJobStepsStates[i].expanded"/>
           </div>
         </div>
@@ -95,6 +118,8 @@ import {SvgIcon} from '../svg.js';
 import ActionRunStatus from './ActionRunStatus.vue';
 import {createApp} from 'vue';
 import AnsiToHTML from 'ansi-to-html';
+import {toggleElem} from '../utils/dom.js';
+import {getCurrentLocale} from '../utils.js';
 
 const {csrfToken} = window.config;
 
@@ -121,6 +146,12 @@ const sfc = {
       currentJobStepsStates: [],
       artifacts: [],
       onHoverRerunIndex: -1,
+      menuVisible: false,
+      isFullScreen: false,
+      timeVisible: {
+        'log-time-stamp': false,
+        'log-time-seconds': false,
+      },
 
       // provided by backend
       run: {
@@ -173,6 +204,12 @@ const sfc = {
     // load job data and then auto-reload periodically
     this.loadJob();
     this.intervalID = setInterval(this.loadJob, 1000);
+
+    document.body.addEventListener('click', this.closeDropdown);
+  },
+
+  beforeUnmount() {
+    document.body.removeEventListener('click', this.closeDropdown);
   },
 
   unmounted() {
@@ -240,7 +277,7 @@ const sfc = {
       this.fetchPost(`${this.run.link}/approve`);
     },
 
-    createLogLine(line) {
+    createLogLine(line, startTime) {
       const div = document.createElement('div');
       div.classList.add('job-log-line');
       div._jobLogTime = line.timestamp;
@@ -250,21 +287,35 @@ const sfc = {
       lineNumber.textContent = line.index;
       div.append(lineNumber);
 
-      // TODO: Support displaying time optionally
-
-      const logMessage = document.createElement('div');
+      // for "Show timestamps"
+      const logTimeStamp = document.createElement('span');
+      logTimeStamp.className = 'log-time-stamp';
+      const date = new Date(parseFloat(line.timestamp * 1000));
+      const timeStamp = date.toLocaleString(getCurrentLocale(), {timeZoneName: 'short'});
+      logTimeStamp.textContent = timeStamp;
+      toggleElem(logTimeStamp, this.timeVisible['log-time-stamp']);
+      // for "Show seconds"
+      const logTimeSeconds = document.createElement('span');
+      logTimeSeconds.className = 'log-time-seconds';
+      const seconds = Math.floor(parseFloat(line.timestamp) - parseFloat(startTime));
+      logTimeSeconds.textContent = `${seconds}s`;
+      toggleElem(logTimeSeconds, this.timeVisible['log-time-seconds']);
+
+      const logMessage = document.createElement('span');
       logMessage.className = 'log-msg';
       logMessage.innerHTML = ansiLogToHTML(line.message);
+      div.append(logTimeStamp);
       div.append(logMessage);
+      div.append(logTimeSeconds);
 
       return div;
     },
 
-    appendLogs(stepIndex, logLines) {
+    appendLogs(stepIndex, logLines, startTime) {
       for (const line of logLines) {
         // TODO: group support: ##[group]GroupTitle , ##[endgroup]
         const el = this.getLogsContainer(stepIndex);
-        el.append(this.createLogLine(line));
+        el.append(this.createLogLine(line, startTime));
       }
     },
 
@@ -309,7 +360,7 @@ const sfc = {
         for (const logs of response.logs.stepsLog) {
           // save the cursor, it will be passed to backend next time
           this.currentJobStepsStates[logs.step].cursor = logs.cursor;
-          this.appendLogs(logs.step, logs.lines);
+          this.appendLogs(logs.step, logs.lines, logs.started);
         }
 
         if (this.run.done && this.intervalID) {
@@ -335,6 +386,46 @@ const sfc = {
 
     isDone(status) {
       return ['success', 'skipped', 'failure', 'cancelled'].includes(status);
+    },
+
+    closeDropdown() {
+      if (this.menuVisible) this.menuVisible = false;
+    },
+
+    // show at most one of log seconds and timestamp (can be both invisible)
+    toggleTimeDisplay(type) {
+      const toToggleTypes = [];
+      const other = type === 'seconds' ? 'stamp' : 'seconds';
+      this.timeVisible[`log-time-${type}`] = !this.timeVisible[`log-time-${type}`];
+      toToggleTypes.push(type);
+      if (this.timeVisible[`log-time-${type}`] && this.timeVisible[`log-time-${other}`]) {
+        this.timeVisible[`log-time-${other}`] = false;
+        toToggleTypes.push(other);
+      }
+      for (const toToggle of toToggleTypes) {
+        for (const el of this.$refs.steps.querySelectorAll(`.log-time-${toToggle}`)) {
+          toggleElem(el, this.timeVisible[`log-time-${toToggle}`]);
+        }
+      }
+    },
+
+    toggleFullScreen() {
+      this.isFullScreen = !this.isFullScreen;
+      const fullScreenEl = document.querySelector('.action-view-right');
+      const outerEl = document.querySelector('.full.height');
+      const actionBodyEl = document.querySelector('.action-view-body');
+      const headerEl = document.querySelector('.ui.main.menu');
+      const contentEl = document.querySelector('.page-content.repository');
+      const footerEl = document.querySelector('.page-footer');
+      toggleElem(headerEl, !this.isFullScreen);
+      toggleElem(contentEl, !this.isFullScreen);
+      toggleElem(footerEl, !this.isFullScreen);
+      // move .action-view-right to new parent
+      if (this.isFullScreen) {
+        outerEl.append(fullScreenEl);
+      } else {
+        actionBodyEl.append(fullScreenEl);
+      }
     }
   },
 };
@@ -369,7 +460,12 @@ export function initRepositoryActionView() {
         cancelled: el.getAttribute('data-locale-status-cancelled'),
         skipped: el.getAttribute('data-locale-status-skipped'),
         blocked: el.getAttribute('data-locale-status-blocked'),
-      }
+      },
+      jobOptions: {
+        showTimeStamp: el.getAttribute('data-locale-show-timestamp'),
+        showFullScreen: el.getAttribute('data-locale-show-full-screen'),
+        showLogSeconds: el.getAttribute('data-locale-show-log-seconds'),
+      },
     }
   });
   view.mount(el);
@@ -574,14 +670,28 @@ export function ansiLogToHTML(line) {
   flex-direction: column;
 }
 
+.full.height > .action-view-right {
+  width: 100%;
+  height: 100%;
+  padding: 0;
+}
+
+.full.height > .action-view-right > .job-step-container {
+  height: 100%;
+}
+
 .job-info-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   padding: 10px;
   border-bottom: 1px solid var(--color-console-border);
   background-color: var(--color-console-bg);
   position: sticky;
   top: 0;
   border-radius: var(--border-radius) var(--border-radius) 0 0;
   height: 60px;
+  z-index: 1;
 }
 
 .job-info-header .job-info-header-title {
@@ -595,6 +705,12 @@ export function ansiLogToHTML(line) {
   font-size: 12px;
 }
 
+.action-job-menu .item span {
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+}
+
 .job-step-container {
   background-color: var(--color-console-bg);
   max-height: 100%;
@@ -676,14 +792,16 @@ export function ansiLogToHTML(line) {
   background-color: var(--color-console-hover-bg);
 }
 
-.job-step-section .job-step-logs .job-log-line .line-num {
+/* class names 'log-time-seconds' and 'log-time-stamp' are used in the method toggleTimeDisplay */
+.job-log-line .line-num, .log-time-seconds {
   width: 48px;
   color: var(--color-grey-light);
   text-align: right;
   user-select: none;
 }
 
-.job-step-section .job-step-logs .job-log-line .log-time {
+.job-log-line .log-time,
+.log-time-stamp {
   color: var(--color-grey-light);
   margin-left: 10px;
   white-space: nowrap;

web_src/js/svg.js

@@ -65,6 +65,7 @@ import octiconTag from '../../public/img/svg/octicon-tag.svg';
 import octiconTriangleDown from '../../public/img/svg/octicon-triangle-down.svg';
 import octiconX from '../../public/img/svg/octicon-x.svg';
 import octiconXCircleFill from '../../public/img/svg/octicon-x-circle-fill.svg';
+import octiconGear from '../../public/img/svg/octicon-gear.svg';
 
 const svgs = {
   'gitea-double-chevron-left': giteaDoubleChevronLeft,
@@ -132,7 +133,8 @@ const svgs = {
   'octicon-tag': octiconTag,
   'octicon-triangle-down': octiconTriangleDown,
   'octicon-x': octiconX,
-  'octicon-x-circle-fill': octiconXCircleFill
+  'octicon-x-circle-fill': octiconXCircleFill,
+  'octicon-gear': octiconGear,
 };
 
 // TODO: use a more general approach to access SVG icons.

web_src/js/utils.js

@@ -60,7 +60,7 @@ export function parseUrl(str) {
 }
 
 // return current locale chosen by user
-function getCurrentLocale() {
+export function getCurrentLocale() {
   return document.documentElement.lang;
 }