Merge branch 'version-2-dev' of https://github.com/ThaumRystra/DiceCloud into version-2-dev

2021-10-01 13:41:41 +02:00
parent feffa45cf7 7dac0cf3f3
commit d30184434c
3 changed files with 2 additions and 3 deletions
--- a/app/imports/api/properties/Actions.js
+++ b/app/imports/api/properties/Actions.js
@@ -175,7 +175,7 @@ const ComputedOnlyActionSchema = createPropertySchema({
  'resources.itemsConsumed.$.itemColor': {
    type: String,
    optional: true,
-    max: STORAGE_LIMITS.color,
+    regEx: /^#([a-f0-9]{3}){1,2}\b$/i,
    removeBeforeCompute: true,
  },
  'resources.attributesConsumed': {
--- a/app/imports/api/properties/subSchemas/ItemConsumedSchema.js
+++ b/app/imports/api/properties/subSchemas/ItemConsumedSchema.js
@@ -49,7 +49,7 @@ const ComputedOnlyItemConsumedSchema = new SimpleSchema({
  itemColor: {
    type: String,
    optional: true,
-    max: STORAGE_LIMITS.color,
+    regEx: /^#([a-f0-9]{3}){1,2}\b$/i,
  },
 });

--- a/app/imports/constants/STORAGE_LIMITS.js
+++ b/app/imports/constants/STORAGE_LIMITS.js
@@ -2,7 +2,6 @@ const STORAGE_LIMITS = Object.freeze({
  // String lengths
  calculation: 1024,
  collectionName: 64,
-  color: 10000,
  description: 49473, //the length of the Bee Movie script
  inlineCalculationField: 49473,
  errorMessage: 256,