From 15855c140d21073f9c3d0929bf3345d1893157ce Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Fri, 4 Dec 2020 16:47:17 +0000
Subject: [PATCH 01/29] WBSTACK MODIFICATIONS

Initial modifications
---
 .dockerignore                   |   4 +
 Dockerfile                      |  18 ++++
 docker-compose.yaml             |  10 ++
 docker/default.conf             |  35 ++++++
 index.html                      |   9 ++
 style.less                      | 183 +++++++++++++++++++++++++++++++-
 wikibase/config.js              |  58 +++++++++-
 wikibase/init.js                |   8 +-
 wikibase/queryService/ui/App.js |   4 +-
 9 files changed, 323 insertions(+), 6 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yaml
 create mode 100644 docker/default.conf

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..471d35d8
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+# We only want to ignore these for the docker build
+# I hope they are included in docker-compose...
+/src/node_modules
+/src/build
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..82c73277
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+FROM node:12 as builder
+
+WORKDIR /src/app
+
+COPY package.json package-lock.json ./
+
+# TODO remove the --force from the install...
+RUN npm install --force && npm cache clean --force
+
+COPY . .
+
+RUN npm run-script build
+
+
+FROM nginx:1-alpine
+
+ADD ./nginx/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=builder --chown=nginx:nginx /src/app/build /usr/share/nginx/html
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..c50cdb17
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,10 @@
+version: "3.7"
+services:
+  debug:
+    image: node:12-alpine
+    working_dir: /home/node/app
+    command: npm start
+    volumes:
+       - ./src:/home/node/app
+    expose:
+      - "8080"
diff --git a/docker/default.conf b/docker/default.conf
new file mode 100644
index 00000000..15a58229
--- /dev/null
+++ b/docker/default.conf
@@ -0,0 +1,35 @@
+server {
+  listen 80 default_server;
+  listen [::]:80 default_server;
+  server_name localhost;
+  charset utf-8;
+
+  # files transfer
+  client_body_in_file_only clean;
+  client_body_buffer_size 32K;
+  client_max_body_size 1026g;
+  sendfile on;
+  send_timeout 300s;
+
+  # redirect server error pages / and set response status to 200 / ok
+  #error_page 404 =200 /;
+
+  root /usr/share/nginx/html;
+  index index.html index.html;
+
+  # Always serve index.html for any request
+#  location / {
+#      root /usr/share/nginx/html;
+#      try_files $uri /index.html;
+#  }
+
+  # deny access to .htaccess files, if Apache's document root concurs with nginx's one
+  location ~ /\.ht {
+    deny all;
+  }
+
+  # deny access to hidden files (beginning with a period)
+  location ~ /\. {
+      access_log off; log_not_found off; deny all;
+  }
+}
diff --git a/index.html b/index.html
index e84e7c48..787e3d1b 100644
--- a/index.html
+++ b/index.html
@@ -429,6 +429,14 @@ <h5 class="modal-title" id="keyboardShortcutHelpModalLabel" data-i18n="wdqs-dial
 		</div>
 	</div>
 
+	<!-- Query Builder Discovery feedback banner -->
+	<div id="query-builder-discovery-feedback">
+		We want to make querying Wikidata easier.
+		<a href="https://www.wikidata.org/wiki/Wikidata:Improve_the_workflows_for_queries_and_lists/Simple_query_Builder" target="_blank">Give us your feedback on our suggestions</a>
+		(Opens in new tab)
+		<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+	</div>
+
 	<!-- JS files -->
 	<!-- build:js js/vendor.min.js -->
 	<script src="node_modules/jquery/dist/jquery.js"></script>
@@ -538,6 +546,7 @@ <h5 class="modal-title" id="keyboardShortcutHelpModalLabel" data-i18n="wdqs-dial
 	<script src="wikibase/queryService/api/UrlShortener.js"></script>
 	<script src="wikibase/queryService/RdfNamespaces.js"></script>
 	<script src="wikibase/init.js"></script>
+	<script src="wikibase/feedbackBannerInit.js"></script>
 	<!-- endbuild -->
 
 </body>
diff --git a/style.less b/style.less
index 96143e84..f6796636 100644
--- a/style.less
+++ b/style.less
@@ -1,5 +1,32 @@
 // Query Service style.less file
 
+/* START WbStack Customizations... */
+
+/* Logo */
+.navbar-brand img {
+	display: none;
+}
+
+/* Toolbar -> More Tools */
+#left-navbar > li:nth-child(3) {
+	display: none;
+}
+
+/* Toolbar -> Help -> Help Portal */
+.open > ul:nth-child(3) > li:nth-child(1) {
+	display: none;
+}
+/* Toolbar -> Help -> Request a Query */
+.open > ul:nth-child(3) > li:nth-child(9) {
+	display: none;
+}
+/* Toolbar -> Help -> Licencing */
+.open > ul:nth-child(3) > li:nth-child(11) {
+	display: none;
+}
+
+/* END WbStack Customizations... */
+
 // == Colors =================================================================
 // WikimediaUI (WMUI) color palette
 // Don't use those variables directly, instead define your vars
@@ -135,9 +162,11 @@ pre {
 
 a {
 	color: @color-primary;
+
 	&:hover {
 		color: @color-primary--hover;
 	}
+
 	&:active {
 		color: @color-primary--active;
 	}
@@ -164,6 +193,7 @@ a {
 
 .navbar {
 	margin-bottom: 0;
+
 	.dropdown-menu {
 		background: @background-color-framed;
 		z-index: 1001; /* above the Leaflet control containers */
@@ -171,36 +201,45 @@ a {
 			border-radius: 2px;
 			padding: 5px 20px;
 		}
+
 		& > li > a:hover {
 			background: @background-color-framed--hover;
 		}
 	}
+
 	.help {
 		padding-left: 0;
 	}
+
 	&-brand {
 		line-height: 35px;
 		padding: 5px 15px;
 		vertical-align: middle;
+
 		a {
 			text-decoration: none;
 		}
+
 		img {
 			margin-left: 2px;
 			margin-right: 10px;
 		}
 	}
+
 	&-btn {
 		margin-left: 15px;
 	}
+
 	&-default {
 		background: @background-color-heading;
 		border-bottom: 1px solid @border-color-heading;
 		border-radius: 2px;
 	}
+
 	&-right {
 		margin-right: 0;
 	}
+
 	&-toggle {
 		z-index: 100;
 	}
@@ -221,9 +260,11 @@ a.disabled {
 	border: 1px solid @border-color-heading;
 	box-shadow: none;
 	text-shadow: none;
+
 	&:active {
 		background: @background-color-framed--active;
 	}
+
 	&:hover {
 		background: @background-color-framed--hover;
 	}
@@ -242,11 +283,13 @@ a.disabled {
 		font-size: 30px;
 		height: 30px;
 	}
+
 	.progress-bar {
 		font-size: 16px;
 		font-weight: bold;
 		line-height: 30px;
 	}
+
 	.label {
 		display: block;
 		font-size: 16px;
@@ -307,10 +350,12 @@ a.disabled {
 	padding-bottom: 7px;
 	padding-top: 7px;
 	width: 46px;
+
 	&:hover {
 		background: @color-primary--hover;
 		border-color: @color-primary--hover;
 	}
+
 	&:active {
 		background: @color-primary--active;
 		border-color: @color-primary--active;
@@ -319,6 +364,7 @@ a.disabled {
 
 #query-result {
 	width: 100%;
+
 	pre {
 		background-color: inherit;
 		border: none;
@@ -346,6 +392,7 @@ a.disabled {
 			stroke-width: 1px;
 			stroke: #000;
 		}
+
 		.title {
 			font-size: 8px;
 			font-weight: bold;
@@ -362,18 +409,21 @@ a.disabled {
 	/* Tree */
 	.jstree {
 		padding: 1em;
+
 		&-default .jstree-wholerow {
 			&-hovered {
 				background: @color-primary--hover;
 				border-radius: 2px;
 				color: @color-base--inverted;
 			}
+
 			&-clicked {
 				background: @color-primary;
 				border-radius: 2px;
 				color: @color-base--inverted;
 			}
 		}
+
 		a.jstree-anchor.jstree-clicked {
 			color: @color-base--inverted;
 		}
@@ -421,36 +471,47 @@ a.disabled {
 	border-left: 1px solid @border-color-heading;
 	border: none;
 	height: 100%;
+
 	.cm-atom {
 		color: @codemirror-color-atom;
 	}
+
 	.cm-bracket {
 		color: inherit;
 	}
+
 	.cm-builtin {
 		color: @codemirror-color-builtin;
 	}
+
 	.cm-comment {
 		color: @codemirror-color-comment;
 	}
+
 	.cm-keyword {
 		color: @codemirror-color-keyword;
 	}
+
 	.cm-operator {
 		color: inherit;
 	}
+
 	.cm-string {
 		color: @codemirror-color-string;
 	}
+
 	.cm-variable-2 {
 		color: @codemirror-color-variable-2;
 	}
+
 	&-scroll {
 		min-height: 320px;
 	}
+
 	&-hints {
 		direction: ltr;
 	}
+
 	&-hint {
 		max-width: 19em;
 	}
@@ -495,10 +556,12 @@ div.shortUrl {
 	display: flex;
 	flex-direction: row;
 	max-width: 100%;
+
 	& > .toolbar {
 		display: flex;
 		flex-direction: column;
 		flex: 0 0 55px;
+
 		.dropdown-menu {
 			padding-left: 0.8em;
 			padding-right: 0.8em;
@@ -514,49 +577,60 @@ div.shortUrl {
 
 #query-box {
 	position: relative;
+
 	.status {
 		color: @color-base--subtle;
 		font-size: 12px;
 		margin-bottom: 5px;
 		min-height: 25px;
 		padding: 3px;
+
 		.badge {
 			border-radius: 2px;
 			border: 1px solid @border-color-soft;
 		}
+
 		.list-group-item-danger {
 			background-color: @update-background-color-danger;
 			color: @update-foreground-color-danger;
 			text-decoration-color: @update-foreground-color-danger;
 		}
+
 		.list-group-item-success {
 			background-color: @update-background-color-success;
 			color: @update-foreground-color-success;
 			text-decoration-color: @update-foreground-color-success;
 		}
+
 		.list-group-item-warning {
 			background-color: @update-background-color-warning;
 			color: @update-foreground-color-warning;
 			text-decoration-color: @update-foreground-color-warning;
 		}
 	}
+
 	.nav {
 		margin-left: 0;
 	}
+
 	.toolbar {
 		border-right: 1px solid @border-color-heading;
+
 		.fa {
 			font-size: 1.5em;
 		}
+
 		&-bottom {
 			flex-grow: 0;
 			padding-bottom: 0.2em;
 			padding-top: 1em;
 			text-align: center;
+
 			.fa {
 				font-size: 1.8em;
 			}
 		}
+
 		&-top {
 			flex-grow: 1;
 			opacity: 0.5;
@@ -564,6 +638,7 @@ div.shortUrl {
 			text-align: center;
 			visibility: hidden;
 			margin-right: 4px;
+
 			&:hover {
 				opacity: 1;
 			}
@@ -633,9 +708,11 @@ div.shortUrl {
 			float: left !important;
 			margin: 0;
 		}
+
 		&-right {
 			float: right !important;
 		}
+
 		&-nav .open .dropdown-menu {
 			-webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.175 );
 			background-color: @background-color-base;
@@ -644,10 +721,12 @@ div.shortUrl {
 			position: absolute;
 			width: auto;
 		}
+
 		&-collapse.in {
 			overflow-y: visible;
 		}
 	}
+
 	.panel-body .table td {
 		display: inline-block;
 	}
@@ -677,38 +756,47 @@ div.shortUrl {
 	.modal-content {
 		border-radius: 2px;
 		padding: 20px 15px;
+
 		.tag {
 			background-color: @color-primary;
 			background-image: none;
 			padding: 0.4em 0.6em;
 			text-shadow: none;
+
 			&:hover,
 			&:active {
 				background: @color-primary;
 			}
 		}
+
 		.tagCloud {
 			height: 200px;
 			width: 100%;
 		}
+
 		input.tags-input {
 			visibility: hidden;
 		}
+
 		.tagFilter {
 			padding-bottom: 5px !important;
 		}
+
 		.exampleTable {
 			border: 1px solid @border-color-base;
 			max-height: 500px;
 			overflow-x: hidden;
 			overflow-y: auto;
+
 			td {
 				padding: 8px 10px;
 			}
+
 			.glyphicon-pencil {
 				margin-left: 0.3em;
 			}
 		}
+
 		.input-group-addon {
 			border-radius: 2px;
 			border: 1px solid @border-color-base;
@@ -750,7 +838,7 @@ div.shortUrl {
 	font-size: 1.3em;
 }
 
-/*Disable resizing from all sides except bottom right corner*/
+/* Disable resizing from all sides except bottom right corner */
 .gj-resizable-e,
 .gj-resizable-n,
 .gj-resizable-w,
@@ -781,43 +869,56 @@ div.shortUrl {
 /* Tag cloud, words are more transparent when less important */
 div.jqcloud {
 	color: @color-primary;
+
 	a {
 		color: inherit;
 	}
+
 	a:hover {
 		color: @color-primary--hover;
 	}
+
 	span.w10 {
 		color: @color-primary;
 	}
+
 	span.w9 {
 		color: @color-primary-90;
 	}
+
 	span.w8 {
 		color: @color-primary-80;
 	}
+
 	span.w7 {
 		color: @color-primary-75;
 	}
+
 	span.w6 {
 		color: @color-primary-70;
 	}
+
 	span.w5 {
 		color: @color-primary-65;
 	}
+
 	span.w4 {
 		color: @color-primary-60;
 	}
+
 	span.w3 {
 		color: @color-primary-55;
 	}
+
 	span.w2 {
 		color: @color-primary-50;
 	}
+
 	span.w1 {
 		color: @color-primary-45;
 	}
 }
+
 .item {
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
@@ -828,28 +929,36 @@ div.jqcloud {
 	margin: 0 0.75em 1.5em;
 	padding: 1em;
 }
+
 .item.hidden {
 	visibility: hidden;
 }
+
 .item-row {
 	width: 100%;
 }
+
 .hidden-row {
 	height: 50px;
 	visibility: hidden;
+
 	& > .item {
 		display: none;
 	}
 }
+
 .item-img {
 	width: 100%;
 }
+
 .summary {
 	.glyphicon {
 		display: inline;
 	}
+
 	& > div {
 		height: 1.5em;
+
 		& > span {
 			display: block;
 			overflow: hidden;
@@ -862,6 +971,7 @@ div.jqcloud {
 /* loading spinner */
 #loading-spinner {
 	color: @color-base--subtle;
+
 	& > .fa-spinner {
 		display: block;
 		margin: 0 auto 20px;
@@ -877,57 +987,71 @@ div.jqcloud {
 	min-width: 300px;
 	width: 30vw;
 	z-index: 100;
+
 	.panel {
 		-webkit-box-shadow: none;
 		border: none;
 		box-shadow: none;
+
 		&-heading {
 			background: @background-color-base;
 			border-bottom: 1px solid @border-color-soft;
 			padding: 8px 10px;
 		}
+
 		&-body {
 			font-size: 11pt;
 			padding: 10px 0;
+
 			& > span {
 				padding: 10px;
 			}
+
 			&-sub {
 				.query-helper-data {
 					margin-bottom: 10px;
 					margin-top: 10px;
 					width: auto;
+
 					tbody > tr > td {
 						padding: 6px;
 					}
+
 					tr {
 						padding: 0.8em;
 					}
+
 					tr:first-child,
 					tr:last-child {
 						border-bottom: none;
 					}
+
 					tr:hover {
 						background: inherit;
 					}
+
 					td {
 						border: none;
 						vertical-align: middle;
 					}
+
 					.fa {
 						font-size: 1.25em;
 						margin: 0 6px 0 0;
 						text-decoration: none;
 					}
 				}
+
 				.query-helper-limit-section {
 					padding: 12px;
 				}
+
 				.query-helper-section {
 					border-bottom: 1px solid @border-color-soft;
 					height: 3em;
 					padding: 10px 0;
 					width: 100%;
+
 					& > tr > td:first-child {
 						min-width: 95px;
 						width: 0;
@@ -935,17 +1059,21 @@ div.jqcloud {
 				}
 			}
 		}
+
 		.close {
 			float: inline-end;
 		}
 	}
+
 	tr:hover > .toolbar {
 		opacity: 1;
 	}
+
 	.popover {
 		min-width: 250px;
 		white-space: nowrap;
 	}
+
 	&-hidden,
 	&-hidden + .splitter {
 		display: none;
@@ -955,19 +1083,24 @@ div.jqcloud {
 .select2-container {
 	min-width: 150px;
 	margin: 2px;
+
 	.select2-dropdown {
 		border-radius: 0 0 2px 2px;
 		background: @background-color-framed;
 	}
-	.select2-results__option[aria-selected='true'] {
+
+	.select2-results__option[ aria-selected='true' ] {
 		background: inherit;
 	}
-	.select2-results__option--highlighted[aria-selected] {
+
+	.select2-results__option--highlighted[ aria-selected ] {
 		background: @background-color-framed--hover;
 		color: @color-base;
 	}
+
 	.select2-selection--single {
 		border-radius: 2px;
+
 		.select2-selection__rendered {
 			color: @color-base;
 		}
@@ -1036,6 +1169,7 @@ div.jqcloud {
 		max-width: none;
 		min-width: 0;
 		width: 100%;
+
 		.panel {
 			margin: 0;
 		}
@@ -1043,6 +1177,7 @@ div.jqcloud {
 
 	.query-helper-and-editor {
 		flex-direction: column;
+
 		& > .splitter {
 			display: none;
 		}
@@ -1052,3 +1187,45 @@ div.jqcloud {
 .ekko-lightbox-nav-overlay a span {
 	padding: 0;
 }
+
+#query-builder-discovery-feedback {
+	display: none;
+	position: fixed;
+	padding: 10px;
+	background: @background-color-base;
+	border: 2px solid #396;
+	width: 99%;
+	margin-left: 1%;
+	bottom: 1px;
+}
+
+@media ( prefers-reduced-motion: reduce ) {
+	#query-builder-discovery-feedback {
+		display: none !important; // !important to override style= attribute
+	}
+}
+
+/* WbStack Customizations... */
+
+/* Logo */
+.navbar-brand > a:nth-child(1) > img:nth-child(1) {
+		display: none;
+}
+
+/* Toolbar -> More Tools */
+#left-navbar > li:nth-child(3) {
+	display: none;
+}
+
+/* Toolbar -> Help -> Help Portal */
+.open > ul:nth-child(3) > li:nth-child(1) {
+	display: none;
+}
+/* Toolbar -> Help -> Request a Query */
+.open > ul:nth-child(3) > li:nth-child(9) {
+	display: none;
+}
+/* Toolbar -> Help -> Licencing */
+.open > ul:nth-child(3) > li:nth-child(11) {
+	display: none;
+}
diff --git a/wikibase/config.js b/wikibase/config.js
index 44f702d4..36b77d50 100644
--- a/wikibase/config.js
+++ b/wikibase/config.js
@@ -2,6 +2,61 @@
 var CONFIG = ( function ( window, $ ) {
 	'use strict';
 
+	var wbstackPresets = getwbstackPresets();
+
+	function getwbstackPresets() {
+		if(window.location.pathname.substring(0,6) == '/query'){
+			return {
+				api: {
+					sparql: {
+						uri: window.location.protocol + '//' + window.location.host + '/query/sparql'
+					},
+					wikibase: {
+						uri: window.location.protocol + '//' + window.location.host + '/w/api.php'
+					},
+					examples: {
+						server: window.location.protocol + '//' + window.location.host + '/',
+						apiPath: 'w/api.php',
+						pageTitle: 'Project:SPARQL/examples',
+						pagePathElement: 'wiki/'
+					}
+				},
+				brand: {
+					"title": "Query Service: " + window.location.host,
+					// TODO fix the logo and favicon and copyright
+					"logo": "logo.svg",
+					"favicon": "favicon.ico",
+					"copyrightUrl": "https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Copyright"
+				}
+			}
+		}
+        if(window.location.host.substring(window.location.host.length-14) == 'localhost:8084'){
+            return {
+                api: {
+                    sparql: {
+                        uri: window.location.protocol + '//' + window.location.host.substring(0,window.location.host.length-5) + ':8085/sparql'
+                    },
+                    wikibase: {
+                        uri: window.location.protocol + '//' + window.location.host.substring(0,window.location.host.length-5) + ':8083/w/api.php'
+                    },
+                    examples: {
+                        server: window.location.protocol + '//' + window.location.host.substring(0,window.location.host.length-5) + ':8083/',
+                        apiPath: 'w/api.php',
+                        pageTitle: 'Project:SPARQL/examples',
+                        pagePathElement: 'wiki/'
+                    }
+                },
+                brand: {
+                    "title": "WbStack Dev " + window.location.host.substring(0,window.location.host.length-5),
+                    // TODO fix the logo and favicon and copyright
+                    "logo": "logo.svg",
+                    "favicon": "favicon.ico",
+                    "copyrightUrl": "https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Copyright"
+                }
+            }
+        }
+	}
+
 	function getUserLanguage() {
 		var lang = ( navigator.languages && navigator.languages[0] ) ||
 			navigator.language ||
@@ -45,7 +100,8 @@ var CONFIG = ( function ( window, $ ) {
 		defaultConfig, customConfig;
 
 	function getEffectiveConfig() {
-		return $.extend( true, {}, presets, defaultConfig, customConfig );
+		//return $.extend( true, {}, presets, defaultConfig, customConfig );
+		return $.extend( true, {}, presets, defaultConfig, customConfig, wbstackPresets );
 	}
 
 	function onDefaultConfigLoad( config ) {
diff --git a/wikibase/init.js b/wikibase/init.js
index 6a1d0ba9..6ce146c7 100644
--- a/wikibase/init.js
+++ b/wikibase/init.js
@@ -44,6 +44,7 @@
 		}
 
 		setBrand();
+		setExamplesHelpLink();
 		wb.ui.resultBrowser.helper.FormatterHelper.initMoment();
 
 		$( '#query-form' ).attr( 'action', config.api.sparql.uri );
@@ -63,7 +64,12 @@
 			shortenApi = new wb.api.UrlShortener( config.api.urlShortener ),
 			languageSelector = new wb.ui.i18n.LanguageSelector( $( '.uls-trigger' ), api, lang );
 
-		setExamplesHelpLink( querySamplesApi.getExamplesPageUrl() );
+		if(window.location.host.substring(0,6) == 'query.'){
+			api = new wb.api.Wikibase( window.location.protocol + '//www.' + window.location.host.substring(6) + '/w/api.php', lang );
+			sparqlApi = new wb.api.Sparql(window.location.protocol + '//' + window.location.host + '/sparql', lang);
+		}
+
+		setExamplesHelpLink( config.api.examples.server + config.api.examples.pagePathElement + config.api.examples.pageTitle );
 
 		var isTopWindow = window.top === window;
 
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 0a94c7b7..8f69022b 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -143,7 +143,9 @@ wikibase.queryService.ui.App = ( function( $, window, _, Cookies, moment ) {
 		this._initApp();
 		this._initEditor();
 		this._initQueryHelper();
-		this._initDataUpdated();
+		// WBStack EDIT START don't try to get last updated time (it won't work)
+		//this._initDataUpdated();
+		// WBStack EDIT END
 		this._initQuery();
 		this._initRdfNamespaces();
 		this._initHandlers();

From c070da44ed00366852dc16a11d061d19a566c545 Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Fri, 4 Dec 2020 16:50:50 +0000
Subject: [PATCH 02/29] Github actions for docker build

---
 .github/workflows/docker.build.main.yml | 46 +++++++++++++++++++++++++
 .github/workflows/docker.build.pr.yml   | 39 +++++++++++++++++++++
 .github/workflows/docker.lint.yml       | 14 ++++++++
 Dockerfile                              |  4 ++-
 4 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/docker.build.main.yml
 create mode 100644 .github/workflows/docker.build.pr.yml
 create mode 100644 .github/workflows/docker.lint.yml

diff --git a/.github/workflows/docker.build.main.yml b/.github/workflows/docker.build.main.yml
new file mode 100644
index 00000000..3369089c
--- /dev/null
+++ b/.github/workflows/docker.build.main.yml
@@ -0,0 +1,46 @@
+name: Docker build & push
+
+on:
+  push:
+    branches: wbstack
+
+jobs:
+  docker-build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache
+          push: true
+          tags: |
+            ghcr.io/wbstack/queryservice-ui:latest
\ No newline at end of file
diff --git a/.github/workflows/docker.build.pr.yml b/.github/workflows/docker.build.pr.yml
new file mode 100644
index 00000000..7dd31356
--- /dev/null
+++ b/.github/workflows/docker.build.pr.yml
@@ -0,0 +1,39 @@
+name: Docker build
+
+on:
+  pull_request:
+    branches: [ wbstack ]
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      -
+        name: Build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache
+          push: false
+          tags: |
+            ghcr.io/wbstack/queryservice-ui:latest
\ No newline at end of file
diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
new file mode 100644
index 00000000..9e24d33a
--- /dev/null
+++ b/.github/workflows/docker.lint.yml
@@ -0,0 +1,14 @@
+name: Docker lint
+on: [push]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps: 
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: lint
+      uses: luke142367/Docker-Lint-Action@v1.0.0
+      with:
+        target: Dockerfile
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 82c73277..8d4a93f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,8 @@ RUN npm run-script build
 
 
 FROM nginx:1-alpine
+LABEL org.opencontainers.image.source="https://github.com/wbstack/queryservice-ui"
 
-ADD ./nginx/default.conf /etc/nginx/conf.d/default.conf
+
+ADD ./docker/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder --chown=nginx:nginx /src/app/build /usr/share/nginx/html

From abb42052ca07469f1d6b58945bb10d11d0f4444d Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Sat, 5 Dec 2020 17:21:15 +0000
Subject: [PATCH 03/29] Standardize docker workflows

---
 .github/workflows/docker.build.pr.yml         | 39 -------------------
 ...docker.build.main.yml => docker.build.yml} | 22 ++++++++---
 .github/workflows/docker.lint.yml             |  8 +++-
 3 files changed, 23 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/docker.build.pr.yml
 rename .github/workflows/{docker.build.main.yml => docker.build.yml} (70%)

diff --git a/.github/workflows/docker.build.pr.yml b/.github/workflows/docker.build.pr.yml
deleted file mode 100644
index 7dd31356..00000000
--- a/.github/workflows/docker.build.pr.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Docker build
-
-on:
-  pull_request:
-    branches: [ wbstack ]
-
-jobs:
-  docker-build:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      -
-        name: Build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache
-          push: false
-          tags: |
-            ghcr.io/wbstack/queryservice-ui:latest
\ No newline at end of file
diff --git a/.github/workflows/docker.build.main.yml b/.github/workflows/docker.build.yml
similarity index 70%
rename from .github/workflows/docker.build.main.yml
rename to .github/workflows/docker.build.yml
index 3369089c..3f4bff3e 100644
--- a/.github/workflows/docker.build.main.yml
+++ b/.github/workflows/docker.build.yml
@@ -1,16 +1,26 @@
-name: Docker build & push
+name: Docker build
 
 on:
   push:
-    branches: wbstack
+    branches:
+      - 'main'
+    tags:
+      - '*'
+  pull_request:
 
 jobs:
-  docker-build-and-push:
+  docker-build:
     runs-on: ubuntu-latest
     steps:
       -
         name: Checkout
         uses: actions/checkout@v2
+      -
+        name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ghcr.io/${{ github.repository }}
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -41,6 +51,6 @@ jobs:
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache
-          push: true
-          tags: |
-            ghcr.io/wbstack/queryservice-ui:latest
\ No newline at end of file
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
index 9e24d33a..30e9f841 100644
--- a/.github/workflows/docker.lint.yml
+++ b/.github/workflows/docker.lint.yml
@@ -1,5 +1,11 @@
 name: Docker lint
-on: [push]
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+
 jobs:
   lint:
     runs-on: ubuntu-latest

From 79cb84f07de9eb8c317dc25906a9d4b67bd790af Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Sat, 5 Dec 2020 17:50:55 +0000
Subject: [PATCH 04/29] ADD CHANGELOG.md

---
 CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..4054c34f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,40 @@
+# queryservice-ui
+
+## December 2020
+
+- 1.0 - Github Build (first)
+
+## May 2020
+
+- 0.26 - Build: remove more non modified files from wbstack git (pt2)
+- 0.25 - git pull, (2 may 2020)
+- 0.21 - Build: without having all code files in wbstack git
+
+## April 2029
+
+- 0.20 - git pull, (17 April 2020)
+- 0.19 - git pull, (5 April 2020)
+
+## December 2019
+
+- 0.18 - git pull, should fix https://github.com/addshore/wbstack/issues/32 ([edit] in examples)
+
+## November 2019
+
+- 0.17 - 2x XSS fixes
+- 0.16 - Help examples link fix / rewrite on load
+- 0.15 - Examples button
+- 0.14 - Tidy up after security fix
+- 0.13 - SECURITY fix - https://phabricator.wikimedia.org/T233213 (XSS in math)
+
+## October 2019
+
+- 0.12 - THURSDAY, tiny fix to title
+- 0.11 - THURSDAY, fix config generation (missing first /)
+- 0.10 - Wednesday before Wikidatacon
+- 0.6 - Better dev localhost stuff
+- 0.5 - Don't try to get last updated time (it wont work)
+- 0.4 - Also allow sparql and wikibase config for localhost development
+- 0.3 - CSS hacks to make the UI smaller and remove wikidata things
+- 0.2 - sparql and wikibase API based on request host
+- 0.1 - Initial version.

From cf4338018e17e9b3efc706427e1a514566671d1a Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Tue, 8 Dec 2020 22:16:45 +0000
Subject: [PATCH 05/29] CHANGELOG for 1.1 image

---
 CHANGELOG.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4054c34f..28790a60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
-# queryservice-ui
+# WBStack queryservice-ui
 
-## December 2020
+## 1.1
 
-- 1.0 - Github Build (first)
+December 2020 updates from upstream. [PR](https://github.com/wbstack/queryservice-ui/pull/1)
+
+## 1.0
+
+Github Build (first)
 
 ## May 2020
 

From d31258f5c62d6ff8cecc36ddaedc4347df9c70ec Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Sun, 31 Jan 2021 13:09:02 +0000
Subject: [PATCH 06/29] CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28790a60..2e8123c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # WBStack queryservice-ui
 
+## 1.2
+
+January 2021 updates from upstream.
+
 ## 1.1
 
 December 2020 updates from upstream. [PR](https://github.com/wbstack/queryservice-ui/pull/1)

From 20255b1b8ca2026d3ca4dfa1c5e01b908f13d1ca Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 22:51:42 +0000
Subject: [PATCH 07/29] Upgrade to GitHub-native Dependabot

---
 .github/dependabot.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..c93a3860
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: docker
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: node
+    versions:
+    - "15"

From 4901a8352a0fc4f8579dbbcd1e851dba25fe58e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 May 2021 16:59:20 +0000
Subject: [PATCH 08/29] Bump luke142367/Docker-Lint-Action from v1.0.0 to
 v1.1.1

Bumps [luke142367/Docker-Lint-Action](https://github.com/luke142367/Docker-Lint-Action) from v1.0.0 to v1.1.1.
- [Release notes](https://github.com/luke142367/Docker-Lint-Action/releases)
- [Commits](https://github.com/luke142367/Docker-Lint-Action/compare/v1.0.0...5c4c86226f39785a66827bbc2e322600c9afa3a9)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
index 30e9f841..047204c7 100644
--- a/.github/workflows/docker.lint.yml
+++ b/.github/workflows/docker.lint.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@master
     - name: lint
-      uses: luke142367/Docker-Lint-Action@v1.0.0
+      uses: luke142367/Docker-Lint-Action@v1.1.1
       with:
         target: Dockerfile
       env:

From 84657aafaec5c297907999e5d5d0da471d223266 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 May 2021 16:59:23 +0000
Subject: [PATCH 09/29] Bump crazy-max/ghaction-docker-meta from v1 to v2.4.0

Bumps [crazy-max/ghaction-docker-meta](https://github.com/crazy-max/ghaction-docker-meta) from v1 to v2.4.0.
- [Release notes](https://github.com/crazy-max/ghaction-docker-meta/releases)
- [Changelog](https://github.com/crazy-max/ghaction-docker-meta/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crazy-max/ghaction-docker-meta/compare/v1...e09df4df3ce0f1198fcfa91b72743b2cb7969430)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index 3f4bff3e..78083fdc 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -18,7 +18,7 @@ jobs:
       -
         name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: crazy-max/ghaction-docker-meta@v2.4.0
         with:
           images: ghcr.io/${{ github.repository }}
       -

From b232f1bd8d9b2ceb2298ab8b258d9deb154ce0e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 May 2021 09:02:07 +0100
Subject: [PATCH 10/29] Bump actions/cache from 2 to 2.1.5 (#18)

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 2.1.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v2.1.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index 78083fdc..d3aaf6c2 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -29,7 +29,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

From a7e79c6750e44de0a6e21fbdc56be3e72cedb062 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 May 2021 09:02:15 +0100
Subject: [PATCH 11/29] Bump docker/setup-qemu-action from 1 to 1.1.0 (#17)

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 1.1.0.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v1.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index d3aaf6c2..ab762340 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -23,7 +23,7 @@ jobs:
           images: ghcr.io/${{ github.repository }}
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v1.1.0
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1

From c8dfd5b0b8df98b9f8e5f4437f9e56329afa19d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 May 2021 09:02:39 +0100
Subject: [PATCH 12/29] Bump docker/build-push-action from 2 to 2.4.0 (#15)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 2.4.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2...v2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index ab762340..88d72a8d 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -44,7 +44,7 @@ jobs:
           password: ${{ secrets.CR_PAT }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v2.4.0
         with:
           context: .
           file: ./Dockerfile

From 0c13d311fa52783e56f9f756a661c3ecce65ab74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 May 2021 09:02:46 +0100
Subject: [PATCH 13/29] Bump crazy-max/ghaction-docker-meta from 2.4.0 to 3.1.0
 (#14)

Bumps [crazy-max/ghaction-docker-meta](https://github.com/crazy-max/ghaction-docker-meta) from 2.4.0 to 3.1.0.
- [Release notes](https://github.com/crazy-max/ghaction-docker-meta/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/crazy-max/ghaction-docker-meta/compare/v2.4.0...v3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index 88d72a8d..e8841164 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -18,7 +18,7 @@ jobs:
       -
         name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v2.4.0
+        uses: crazy-max/ghaction-docker-meta@v3.1.0
         with:
           images: ghcr.io/${{ github.repository }}
       -

From e7f7aa42b6dfc8d6f84191f1fd5da7150ff16b4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 May 2021 09:02:53 +0100
Subject: [PATCH 14/29] Bump docker/login-action from 1 to 1.9.0 (#13)

Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 1.9.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v1.9.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index e8841164..eaf607f7 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -37,7 +37,7 @@ jobs:
             ${{ runner.os }}-buildx-
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1.9.0 
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

From 7068cda9973e9af028ec3eaecd6f0c15535b3335 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 May 2021 09:03:01 +0100
Subject: [PATCH 15/29] Bump actions/checkout from 2 to 2.3.4 (#12)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 2.3.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v2.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 .github/workflows/docker.lint.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index eaf607f7..f1c8f417 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       -
         name: Docker meta
         id: docker_meta
diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
index 047204c7..ee441e2d 100644
--- a/.github/workflows/docker.lint.yml
+++ b/.github/workflows/docker.lint.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps: 
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v2.3.4
     - name: lint
       uses: luke142367/Docker-Lint-Action@v1.1.1
       with:

From 57fe29f629b899c5327fc32e6ecac6d8b2ab4001 Mon Sep 17 00:00:00 2001
From: addshore <addshore@users.noreply.github.com>
Date: Fri, 14 May 2021 13:42:19 +0100
Subject: [PATCH 16/29] Don't require GITHUB_TOKEN in docker related flows
 (#19)

* Don't require GITHUB_TOKEN in docker related flows

* Dockerfile, use ADD instead of COPY
---
 .github/workflows/docker.build.yml | 5 +++--
 .github/workflows/docker.lint.yml  | 6 ++----
 Dockerfile                         | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index f1c8f417..22e252bb 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-qemu-action@v1.1.0
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v1.3.0
       -
         name: Cache Docker layers
         uses: actions/cache@v2.1.5
@@ -37,7 +37,8 @@ jobs:
             ${{ runner.os }}-buildx-
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.9.0 
+        uses: docker/login-action@v1.9.0
+        if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
index ee441e2d..c42420d5 100644
--- a/.github/workflows/docker.lint.yml
+++ b/.github/workflows/docker.lint.yml
@@ -13,8 +13,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2.3.4
     - name: lint
-      uses: luke142367/Docker-Lint-Action@v1.1.1
+      uses: hadolint/hadolint-action@v1.5.0
       with:
-        target: Dockerfile
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        dockerfile: Dockerfile
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 8d4a93f8..c28167b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,5 +16,5 @@ FROM nginx:1-alpine
 LABEL org.opencontainers.image.source="https://github.com/wbstack/queryservice-ui"
 
 
-ADD ./docker/default.conf /etc/nginx/conf.d/default.conf
+COPY ./docker/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder --chown=nginx:nginx /src/app/build /usr/share/nginx/html

From 804095975164e7738d33c32a8bed7f5c3a145d1e Mon Sep 17 00:00:00 2001
From: addshore <addshore@users.noreply.github.com>
Date: Wed, 23 Jun 2021 21:58:12 +0100
Subject: [PATCH 17/29] CHANGELOG 1.3

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e8123c7..4783d432 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # WBStack queryservice-ui
 
+## 1.3
+
+June 2021 updates from upstream.
+
 ## 1.2
 
 January 2021 updates from upstream.

From 073e3910ff552cb927a899cdcc7cdb5abb1c057c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Jun 2021 22:00:18 +0100
Subject: [PATCH 18/29] Bump crazy-max/ghaction-docker-meta from 3.1.0 to 3.3.0
 (#21)

Bumps [crazy-max/ghaction-docker-meta](https://github.com/crazy-max/ghaction-docker-meta) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/crazy-max/ghaction-docker-meta/releases)
- [Commits](https://github.com/crazy-max/ghaction-docker-meta/compare/v3.1.0...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index 22e252bb..f680a005 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -18,7 +18,7 @@ jobs:
       -
         name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v3.1.0
+        uses: crazy-max/ghaction-docker-meta@v3.3.0
         with:
           images: ghcr.io/${{ github.repository }}
       -

From 77b701e3f728a12aa13b798a56fb6319cd95e287 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Jun 2021 22:00:30 +0100
Subject: [PATCH 19/29] Bump docker/build-push-action from 2.4.0 to 2.5.0 (#22)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.4.0...v2.5.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index f680a005..8bec965b 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -45,7 +45,7 @@ jobs:
           password: ${{ secrets.CR_PAT }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2.4.0
+        uses: docker/build-push-action@v2.5.0
         with:
           context: .
           file: ./Dockerfile

From e0e973bd1825a1c6520a4b0cdef2de3b196f5b07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Jun 2021 22:00:39 +0100
Subject: [PATCH 20/29] Bump docker/setup-qemu-action from 1.1.0 to 1.2.0 (#23)

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v1.1.0...v1.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index 8bec965b..13841946 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -23,7 +23,7 @@ jobs:
           images: ghcr.io/${{ github.repository }}
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.1.0
+        uses: docker/setup-qemu-action@v1.2.0
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1.3.0

From d4ff28ff28a291b9ef6838ece8aefe17c4f11991 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Jun 2021 22:00:50 +0100
Subject: [PATCH 21/29] Bump actions/cache from 2.1.5 to 2.1.6 (#24)

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index 13841946..c86c29ba 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -29,7 +29,7 @@ jobs:
         uses: docker/setup-buildx-action@v1.3.0
       -
         name: Cache Docker layers
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

From 7853f0fb9000e87fe50a7fb3a4fb173995fdafcb Mon Sep 17 00:00:00 2001
From: addshore <addshore@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:28:40 +0100
Subject: [PATCH 22/29] Dependapile Github Actions June 30th (#28)

* Bump docker/login-action from 1.9.0 to 1.10.0 (#26)

Bumps [docker/login-action](https://github.com/docker/login-action) from 1.9.0 to 1.10.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1.9.0...v1.10.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/setup-buildx-action from 1.3.0 to 1.4.1 (#27)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1.3.0...v1.4.1)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker.build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index c86c29ba..b4878119 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-qemu-action@v1.2.0
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.3.0
+        uses: docker/setup-buildx-action@v1.4.1
       -
         name: Cache Docker layers
         uses: actions/cache@v2.1.6
@@ -37,7 +37,7 @@ jobs:
             ${{ runner.os }}-buildx-
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v1.10.0
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io

From ac224ef5b1e1f2a0b16761dc6ecc7b60f35dc99e Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Wed, 1 Sep 2021 11:05:14 +0100
Subject: [PATCH 23/29] Add .github/workflows/github.prs.combine.yml

---
 .github/workflows/github.prs.combine.yml | 136 +++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 .github/workflows/github.prs.combine.yml

diff --git a/.github/workflows/github.prs.combine.yml b/.github/workflows/github.prs.combine.yml
new file mode 100644
index 00000000..9172d6d2
--- /dev/null
+++ b/.github/workflows/github.prs.combine.yml
@@ -0,0 +1,136 @@
+# From https://github.com/testcontainers/testcontainers-java/blob/master/.github/workflows/combine-prs.yml
+name: 'Combine PRs'
+
+# Controls when the action will run - in this case triggered manually
+on:
+  workflow_dispatch:
+    inputs:
+      branchPrefix:
+        description: 'Branch prefix to find combinable PRs based on'
+        required: true
+        default: 'dependabot'
+      mustBeGreen:
+        description: 'Only combine PRs that are green (status is success)'
+        required: true
+        default: 'true'
+      combineBranchName:
+        description: 'Name of the branch to combine PRs into'
+        required: true
+        default: 'combine-prs-branch'
+      ignoreLabel:
+        description: 'Exclude PRs with this label'
+        required: true
+        default: 'nocombine'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "combine-prs"
+  combine-prs:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/github-script@v4.1
+        id: fetch-branch-names
+        name: Fetch branch names
+        with:
+          github-token: ${{secrets.GH_TOKEN_PLUSW}}
+          script: |
+            const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', {
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
+            branches = [];
+            prs = [];
+            base_branch = null;
+            for (const pull of pulls) {
+              const branch = pull['head']['ref'];
+              console.log('Pull for branch: ' + branch);
+              if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) {
+                console.log('Branch matched: ' + branch);
+                statusOK = true;
+                if(${{ github.event.inputs.mustBeGreen }}) {
+                  console.log('Checking green status: ' + branch);
+                  const checkRuns = await github.request('GET /repos/{owner}/{repo}/commits/{ref}/check-runs', {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    ref: branch
+                  });
+                  for await (const cr of checkRuns.data.check_runs) {
+                    console.log('Validating check conclusion: ' + cr.conclusion);
+                    if(cr.conclusion != 'success') {
+                      console.log('Discarding ' + branch + ' with check conclusion ' + cr.conclusion);
+                      statusOK = false;
+                    }
+                  }
+                }
+                console.log('Checking labels: ' + branch);
+                const labels = pull['labels'];
+                for(const label of labels) {
+                  const labelName = label['name'];
+                  console.log('Checking label: ' + labelName);
+                  if(labelName == '${{ github.event.inputs.ignoreLabel }}') {
+                    console.log('Discarding ' + branch + ' with label ' + labelName);
+                    statusOK = false;
+                  }
+                }
+                if (statusOK) {
+                  console.log('Adding branch to array: ' + branch);
+                  branches.push(branch);
+                  prs.push('#' + pull['number'] + ' ' + pull['title']);
+                  base_branch = pull['base']['ref'];
+                }
+              }
+            }
+            if (branches.length == 0) {
+              core.setFailed('No PRs/branches matched criteria');
+              return;
+            }
+            core.setOutput('base-branch', base_branch);
+            core.setOutput('prs-string', prs.join('\n'));
+            combined = branches.join(' ')
+            console.log('Combined: ' + combined);
+            return combined
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2.3.3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GH_TOKEN_PLUSW }}
+      # Creates a branch with other PR branches merged together
+      - name: Created combined branch
+        env:
+          BASE_BRANCH: ${{ steps.fetch-branch-names.outputs.base-branch }}
+          BRANCHES_TO_COMBINE: ${{ steps.fetch-branch-names.outputs.result }}
+          COMBINE_BRANCH_NAME: ${{ github.event.inputs.combineBranchName }}
+        run: |
+          echo "$BRANCHES_TO_COMBINE"
+          sourcebranches="${BRANCHES_TO_COMBINE%\"}"
+          sourcebranches="${sourcebranches#\"}"
+          basebranch="${BASE_BRANCH%\"}"
+          basebranch="${basebranch#\"}"
+          git config pull.rebase false
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git branch $COMBINE_BRANCH_NAME $basebranch
+          git checkout $COMBINE_BRANCH_NAME
+          git pull origin $sourcebranches --no-edit
+          git push origin $COMBINE_BRANCH_NAME --force-with-lease
+      # Creates a PR with the new combined branch
+      - uses: actions/github-script@v4.1
+        name: Create Combined Pull Request
+        env:
+          PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }}
+        with:
+          github-token: ${{secrets.GH_TOKEN_PLUSW}}
+          script: |
+            const prString = process.env.PRS_STRING;
+            const body = 'This PR was created by the Combine PRs action by combining the following PRs:\n' + prString;
+            await github.pulls.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: 'Combined PR for prefix: ${{ github.event.inputs.branchPrefix }}',
+              head: '${{ github.event.inputs.combineBranchName }}',
+              base: '${{ steps.fetch-branch-names.outputs.base-branch }}',
+              body: body
+            });

From 183cd1631ac4ed0da6776e61743ac6a693e28173 Mon Sep 17 00:00:00 2001
From: addshore <addshore@users.noreply.github.com>
Date: Wed, 1 Sep 2021 13:20:50 +0100
Subject: [PATCH 24/29] Combined PR for prefix: dependabot/github_actions (#37)

* Bump docker/setup-buildx-action from 1.4.1 to 1.5.1

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.4.1 to 1.5.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1.4.1...v1.5.1)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump docker/build-push-action from 2.5.0 to 2.7.0

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.5.0 to 2.7.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.5.0...v2.7.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump crazy-max/ghaction-docker-meta from 3.3.0 to 3.5.0

Bumps [crazy-max/ghaction-docker-meta](https://github.com/crazy-max/ghaction-docker-meta) from 3.3.0 to 3.5.0.
- [Release notes](https://github.com/crazy-max/ghaction-docker-meta/releases)
- [Commits](https://github.com/crazy-max/ghaction-docker-meta/compare/v3.3.0...v3.5.0)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-docker-meta
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hadolint/hadolint-action from 1.5.0 to 1.6.0

Bumps [hadolint/hadolint-action](https://github.com/hadolint/hadolint-action) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/hadolint/hadolint-action/releases)
- [Changelog](https://github.com/hadolint/hadolint-action/blob/master/.releaserc)
- [Commits](https://github.com/hadolint/hadolint-action/compare/v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: hadolint/hadolint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
---
 .github/workflows/docker.build.yml | 6 +++---
 .github/workflows/docker.lint.yml  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index b4878119..abe4958a 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -18,7 +18,7 @@ jobs:
       -
         name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v3.3.0
+        uses: crazy-max/ghaction-docker-meta@v3.5.0
         with:
           images: ghcr.io/${{ github.repository }}
       -
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-qemu-action@v1.2.0
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.4.1
+        uses: docker/setup-buildx-action@v1.5.1
       -
         name: Cache Docker layers
         uses: actions/cache@v2.1.6
@@ -45,7 +45,7 @@ jobs:
           password: ${{ secrets.CR_PAT }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2.5.0
+        uses: docker/build-push-action@v2.7.0
         with:
           context: .
           file: ./Dockerfile
diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
index c42420d5..429940ac 100644
--- a/.github/workflows/docker.lint.yml
+++ b/.github/workflows/docker.lint.yml
@@ -13,6 +13,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2.3.4
     - name: lint
-      uses: hadolint/hadolint-action@v1.5.0
+      uses: hadolint/hadolint-action@v1.6.0
       with:
         dockerfile: Dockerfile
\ No newline at end of file

From 583adcbca73ae1e7a7a66cf934d59ab7b8e1e7f1 Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Wed, 13 Oct 2021 13:53:37 +0100
Subject: [PATCH 25/29] Blanket ${{ secrets.GITHUB_TOKEN }}

---
 .github/workflows/docker.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index abe4958a..3ddd3d35 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         uses: docker/build-push-action@v2.7.0

From 8cf8ba775f82de678ae1600b128c16344e464298 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Oct 2021 14:19:44 +0100
Subject: [PATCH 26/29] Bump actions/github-script from 4.1 to 5 (#39)

Bumps [actions/github-script](https://github.com/actions/github-script) from 4.1 to 5.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v4.1...v5)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/github.prs.combine.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github.prs.combine.yml b/.github/workflows/github.prs.combine.yml
index 9172d6d2..3a3973a6 100644
--- a/.github/workflows/github.prs.combine.yml
+++ b/.github/workflows/github.prs.combine.yml
@@ -31,7 +31,7 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/github-script@v4.1
+      - uses: actions/github-script@v5
         id: fetch-branch-names
         name: Fetch branch names
         with:
@@ -117,7 +117,7 @@ jobs:
           git pull origin $sourcebranches --no-edit
           git push origin $COMBINE_BRANCH_NAME --force-with-lease
       # Creates a PR with the new combined branch
-      - uses: actions/github-script@v4.1
+      - uses: actions/github-script@v5
         name: Create Combined Pull Request
         env:
           PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }}

From 1b514f172bb7d425fe6a2d1741f61253fdf6a92a Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Thu, 10 Feb 2022 11:22:06 +0000
Subject: [PATCH 27/29] Hide #query-builder-dd on wb.cloud

---
 style.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/style.less b/style.less
index 735bd6bb..0115f5fc 100644
--- a/style.less
+++ b/style.less
@@ -25,6 +25,11 @@
 	display: none;
 }
 
+// https://phabricator.wikimedia.org/T301255
+#query-builder-dd {
+	display: none;
+}
+
 /* END WbStack Customizations... */
 
 // == Colors =================================================================

From ca78c107fdf1f9aaf9ae880afa2876ef55216658 Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomas.arrow_ext@wikimedia.de>
Date: Thu, 10 Feb 2022 16:00:30 +0000
Subject: [PATCH 28/29] CHANGELOG: 1.4

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4783d432..918ffaac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # WBStack queryservice-ui
 
+## 1.4
+
+Feburary 2022 updates from upstream.
+Security patches.
+Includes hotfix until upstream [bug](https://phabricator.wikimedia.org/T301255) is resolved
+
 ## 1.3
 
 June 2021 updates from upstream.

From b357a8fa30a96b65f529abae73634c788bcb8f2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 23:02:42 +0000
Subject: [PATCH 29/29] Bump hadolint/hadolint-action from 1.6.0 to 3.1.0

Bumps [hadolint/hadolint-action](https://github.com/hadolint/hadolint-action) from 1.6.0 to 3.1.0.
- [Release notes](https://github.com/hadolint/hadolint-action/releases)
- [Changelog](https://github.com/hadolint/hadolint-action/blob/master/.releaserc)
- [Commits](https://github.com/hadolint/hadolint-action/compare/v1.6.0...v3.1.0)

---
updated-dependencies:
- dependency-name: hadolint/hadolint-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.lint.yml b/.github/workflows/docker.lint.yml
index 429940ac..66368305 100644
--- a/.github/workflows/docker.lint.yml
+++ b/.github/workflows/docker.lint.yml
@@ -13,6 +13,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2.3.4
     - name: lint
-      uses: hadolint/hadolint-action@v1.6.0
+      uses: hadolint/hadolint-action@v3.1.0
       with:
         dockerfile: Dockerfile
\ No newline at end of file