From 5bb00069191ad4f9db81808755c9e62f9165384b Mon Sep 17 00:00:00 2001 From: rosalinep Date: Fri, 5 Jan 2024 14:43:28 -0800 Subject: [PATCH 1/3] Implement + bump version --- core/package-lock.json | 14 +++++++------- core/package.json | 2 +- .../org/labkey/list/model/ListManagerTable.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index 0b28012d186..98d633a4a99 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -8,7 +8,7 @@ "name": "labkey-core", "version": "0.0.0", "dependencies": { - "@labkey/components": "3.2.3", + "@labkey/components": "3.3.0-fb-languageconsistency.0", "@labkey/themes": "1.3.3" }, "devDependencies": { @@ -3339,9 +3339,9 @@ } }, "node_modules/@labkey/components": { - "version": "3.2.3", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.2.3.tgz", - "integrity": "sha512-OfjoxdmVdkpclcG1+LDk/vScPfeB30ygoxMwqy7hg4rxJ/Gp8gxCI2MTmygQKlAHRBFVdJduDFAWq0ZJKNR39A==", + "version": "3.3.0-fb-languageconsistency.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.3.0-fb-languageconsistency.0.tgz", + "integrity": "sha512-hvHuHCXVwF17qToHnV7uJe1aIUJe1Ox8VoyaVNe9YpJNzvKgpP744z0B+xAr1wIk9KrzFkzFjtCw12a8KsQtoQ==", "dependencies": { "@labkey/api": "1.28.0", "@testing-library/jest-dom": "~5.17.0", @@ -19555,9 +19555,9 @@ } }, "@labkey/components": { - "version": "3.2.3", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.2.3.tgz", - "integrity": "sha512-OfjoxdmVdkpclcG1+LDk/vScPfeB30ygoxMwqy7hg4rxJ/Gp8gxCI2MTmygQKlAHRBFVdJduDFAWq0ZJKNR39A==", + "version": "3.3.0-fb-languageconsistency.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.3.0-fb-languageconsistency.0.tgz", + "integrity": "sha512-hvHuHCXVwF17qToHnV7uJe1aIUJe1Ox8VoyaVNe9YpJNzvKgpP744z0B+xAr1wIk9KrzFkzFjtCw12a8KsQtoQ==", "requires": { "@labkey/api": "1.28.0", "@testing-library/jest-dom": "~5.17.0", diff --git a/core/package.json b/core/package.json index 53e3f95388d..64dc9cc6f8b 100644 --- a/core/package.json +++ b/core/package.json @@ -54,7 +54,7 @@ } }, "dependencies": { - "@labkey/components": "3.2.3", + "@labkey/components": "3.3.0-fb-languageconsistency.0", "@labkey/themes": "1.3.3" }, "devDependencies": { diff --git a/list/src/org/labkey/list/model/ListManagerTable.java b/list/src/org/labkey/list/model/ListManagerTable.java index b2921eb1433..611156862f0 100644 --- a/list/src/org/labkey/list/model/ListManagerTable.java +++ b/list/src/org/labkey/list/model/ListManagerTable.java @@ -89,9 +89,9 @@ public Object getValue(RenderContext ctx) String category = (String) super.getValue(ctx); if (ListDefinition.Category.PublicPicklist.toString().equals(category)) - return "public"; + return "Yes"; else if (ListDefinition.Category.PrivatePicklist.toString().equals(category)) - return "private"; + return "No"; return null; } From 4a451050384d211cca15dca13bc06ab5cc61b9a2 Mon Sep 17 00:00:00 2001 From: rosalinep Date: Mon, 8 Jan 2024 14:41:48 -0800 Subject: [PATCH 2/3] Bump package --- core/package-lock.json | 14 +++++++------- core/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index 98d633a4a99..fd8975e6ad8 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -8,7 +8,7 @@ "name": "labkey-core", "version": "0.0.0", "dependencies": { - "@labkey/components": "3.3.0-fb-languageconsistency.0", + "@labkey/components": "3.4.0-fb-languageconsistency.0", "@labkey/themes": "1.3.3" }, "devDependencies": { @@ -3339,9 +3339,9 @@ } }, "node_modules/@labkey/components": { - "version": "3.3.0-fb-languageconsistency.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.3.0-fb-languageconsistency.0.tgz", - "integrity": "sha512-hvHuHCXVwF17qToHnV7uJe1aIUJe1Ox8VoyaVNe9YpJNzvKgpP744z0B+xAr1wIk9KrzFkzFjtCw12a8KsQtoQ==", + "version": "3.4.0-fb-languageconsistency.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.4.0-fb-languageconsistency.0.tgz", + "integrity": "sha512-pTmo6f3LNaFnypPQtuIAqDMezJ69Z3QsxhHqx6lgxtbq/huCrgkH8ZS9FxQlqVa6iZx+O73trskCWkn3J06Hjg==", "dependencies": { "@labkey/api": "1.28.0", "@testing-library/jest-dom": "~5.17.0", @@ -19555,9 +19555,9 @@ } }, "@labkey/components": { - "version": "3.3.0-fb-languageconsistency.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.3.0-fb-languageconsistency.0.tgz", - "integrity": "sha512-hvHuHCXVwF17qToHnV7uJe1aIUJe1Ox8VoyaVNe9YpJNzvKgpP744z0B+xAr1wIk9KrzFkzFjtCw12a8KsQtoQ==", + "version": "3.4.0-fb-languageconsistency.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.4.0-fb-languageconsistency.0.tgz", + "integrity": "sha512-pTmo6f3LNaFnypPQtuIAqDMezJ69Z3QsxhHqx6lgxtbq/huCrgkH8ZS9FxQlqVa6iZx+O73trskCWkn3J06Hjg==", "requires": { "@labkey/api": "1.28.0", "@testing-library/jest-dom": "~5.17.0", diff --git a/core/package.json b/core/package.json index 64dc9cc6f8b..9a4ed336ac7 100644 --- a/core/package.json +++ b/core/package.json @@ -54,7 +54,7 @@ } }, "dependencies": { - "@labkey/components": "3.3.0-fb-languageconsistency.0", + "@labkey/components": "3.4.0-fb-languageconsistency.0", "@labkey/themes": "1.3.3" }, "devDependencies": { From bc60ac03e58a5b774368a18999fa44e3bbb7a1bd Mon Sep 17 00:00:00 2001 From: rosalinep Date: Thu, 11 Jan 2024 15:04:57 -0800 Subject: [PATCH 3/3] Final bump --- core/package-lock.json | 14 +++++++------- core/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index 02639a15273..974d4e943a4 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -8,7 +8,7 @@ "name": "labkey-core", "version": "0.0.0", "dependencies": { - "@labkey/components": "3.5.0", + "@labkey/components": "3.5.3", "@labkey/themes": "1.3.3" }, "devDependencies": { @@ -3339,9 +3339,9 @@ } }, "node_modules/@labkey/components": { - "version": "3.5.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.5.0.tgz", - "integrity": "sha512-CZ5G8dRyhTiEn5mDVtnkQlopsz1RAAG1h9c1wg/5Tfbrybz+BOOIQSbIGKW+hBoTEhfjkKOHlZQo7LLfiUVmWw==", + "version": "3.5.3", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.5.3.tgz", + "integrity": "sha512-FL51evz8lo5eQ9Hul+IS0hN7MTU1xbR9TDVjkJq5W/8CV+iscxcDTfqB9YmV/3JW3nJ4LCwOVXGuwPGiUMZF7A==", "dependencies": { "@labkey/api": "1.28.0", "@testing-library/jest-dom": "~5.17.0", @@ -19555,9 +19555,9 @@ } }, "@labkey/components": { - "version": "3.5.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.5.0.tgz", - "integrity": "sha512-CZ5G8dRyhTiEn5mDVtnkQlopsz1RAAG1h9c1wg/5Tfbrybz+BOOIQSbIGKW+hBoTEhfjkKOHlZQo7LLfiUVmWw==", + "version": "3.5.3", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-3.5.3.tgz", + "integrity": "sha512-FL51evz8lo5eQ9Hul+IS0hN7MTU1xbR9TDVjkJq5W/8CV+iscxcDTfqB9YmV/3JW3nJ4LCwOVXGuwPGiUMZF7A==", "requires": { "@labkey/api": "1.28.0", "@testing-library/jest-dom": "~5.17.0", diff --git a/core/package.json b/core/package.json index 222cec9edbd..477ba8e6c89 100644 --- a/core/package.json +++ b/core/package.json @@ -54,7 +54,7 @@ } }, "dependencies": { - "@labkey/components": "3.5.0", + "@labkey/components": "3.5.3", "@labkey/themes": "1.3.3" }, "devDependencies": {