From 9e89e0d27c0d20994d31e050d49934a28c7cae99 Mon Sep 17 00:00:00 2001
From: Joost De Cock
Date: Fri, 10 May 2019 10:53:34 +0200
Subject: [PATCH] :construction: Added noDocs option to DraftConfigurator for
workbench
---
.../DraftSettingLanguage/index.js | 3 ++-
.../DraftSettingMargin/index.js | 1 +
.../DraftSettingOnly/index.js | 1 +
.../DraftConfigurator/DraftSettingSa/index.js | 1 +
.../DraftSettingUnits/index.js | 1 +
.../DraftConfigurator/DraftSettings/index.js | 3 ++-
.../DraftConfigurator/OptionGroup/index.js | 3 ++-
.../DraftConfigurator/OptionPreamble/index.js | 20 ++++++++++---------
.../PatternOptionBool/index.js | 1 +
.../PatternOptionList/index.js | 1 +
.../PatternOptionMillimeter/index.js | 1 +
.../PatternOptionPctDegCount/index.js | 1 +
.../DraftConfigurator/PatternOptions/index.js | 1 +
.../components/src/DraftConfigurator/index.js | 8 ++++++--
.../src/Workbench/DraftPattern/index.js | 1 +
15 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js b/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js
index e0b59471c1c..c521cf66823 100644
--- a/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js
+++ b/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js
@@ -40,7 +40,7 @@ const DraftSettingLanguage = props => {
desc={props.desc}
title={props.title}
id={"po-list-" + props.name}
- displayValue={languages[props.intl.locale][value]}
+ displayValue={languages[value]}
reset={reset}
toggleExpanded={toggleExpanded}
expanded={expanded}
@@ -51,6 +51,7 @@ const DraftSettingLanguage = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js b/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js
index 1e6e1fed4e4..787a6691c3b 100644
--- a/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js
+++ b/packages/components/src/DraftConfigurator/DraftSettingMargin/index.js
@@ -62,6 +62,7 @@ const DraftSettingMargin = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/DraftSettingOnly/index.js b/packages/components/src/DraftConfigurator/DraftSettingOnly/index.js
index 383a2866408..128b55790eb 100644
--- a/packages/components/src/DraftConfigurator/DraftSettingOnly/index.js
+++ b/packages/components/src/DraftConfigurator/DraftSettingOnly/index.js
@@ -81,6 +81,7 @@ const DraftSettingOnly = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/DraftSettingSa/index.js b/packages/components/src/DraftConfigurator/DraftSettingSa/index.js
index e8907653b82..64812a688f7 100644
--- a/packages/components/src/DraftConfigurator/DraftSettingSa/index.js
+++ b/packages/components/src/DraftConfigurator/DraftSettingSa/index.js
@@ -107,6 +107,7 @@ const DraftSettingSa = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/DraftSettingUnits/index.js b/packages/components/src/DraftConfigurator/DraftSettingUnits/index.js
index 1ee0724c99c..fa7464a09c1 100644
--- a/packages/components/src/DraftConfigurator/DraftSettingUnits/index.js
+++ b/packages/components/src/DraftConfigurator/DraftSettingUnits/index.js
@@ -49,6 +49,7 @@ const DraftSettingUnits = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/DraftSettings/index.js b/packages/components/src/DraftConfigurator/DraftSettings/index.js
index 7a6074cbb88..99d8683a297 100644
--- a/packages/components/src/DraftConfigurator/DraftSettings/index.js
+++ b/packages/components/src/DraftConfigurator/DraftSettings/index.js
@@ -49,7 +49,8 @@ const DraftSettings = props => {
units: props.units,
key: setting,
name: setting,
- labels: labels[setting]
+ labels: labels[setting],
+ noDocs: props.noDocs
};
childProps.title = (
diff --git a/packages/components/src/DraftConfigurator/OptionGroup/index.js b/packages/components/src/DraftConfigurator/OptionGroup/index.js
index 2e43fbc10a9..0d97f7fe697 100644
--- a/packages/components/src/DraftConfigurator/OptionGroup/index.js
+++ b/packages/components/src/DraftConfigurator/OptionGroup/index.js
@@ -25,7 +25,8 @@ const OptionGroup = props => {
desc: ,
intl: props.intl,
pattern: props.config.name,
- key: name
+ key: name,
+ noDocs: props.noDocs
};
let noyes = [
,
diff --git a/packages/components/src/DraftConfigurator/OptionPreamble/index.js b/packages/components/src/DraftConfigurator/OptionPreamble/index.js
index a00360d5fdf..3bae78bf1b6 100644
--- a/packages/components/src/DraftConfigurator/OptionPreamble/index.js
+++ b/packages/components/src/DraftConfigurator/OptionPreamble/index.js
@@ -72,15 +72,17 @@ const OptionPreamble = props => {
>
-
-
-
+ {props.noDocs ? null : (
+
+
+
+ )}
{props.option}
diff --git a/packages/components/src/DraftConfigurator/PatternOptionBool/index.js b/packages/components/src/DraftConfigurator/PatternOptionBool/index.js
index a7cfb26c72b..30ab1798161 100644
--- a/packages/components/src/DraftConfigurator/PatternOptionBool/index.js
+++ b/packages/components/src/DraftConfigurator/PatternOptionBool/index.js
@@ -49,6 +49,7 @@ const PatternOptionBool = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/PatternOptionList/index.js b/packages/components/src/DraftConfigurator/PatternOptionList/index.js
index 08194a2a974..95ab8c8caaf 100644
--- a/packages/components/src/DraftConfigurator/PatternOptionList/index.js
+++ b/packages/components/src/DraftConfigurator/PatternOptionList/index.js
@@ -70,6 +70,7 @@ const PatternOptionList = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/PatternOptionMillimeter/index.js b/packages/components/src/DraftConfigurator/PatternOptionMillimeter/index.js
index cf6281756c1..e3b5bd9d27b 100644
--- a/packages/components/src/DraftConfigurator/PatternOptionMillimeter/index.js
+++ b/packages/components/src/DraftConfigurator/PatternOptionMillimeter/index.js
@@ -82,6 +82,7 @@ const PatternOptionMillimeter = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js b/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js
index 4178f71904d..933414d2e37 100644
--- a/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js
+++ b/packages/components/src/DraftConfigurator/PatternOptionPctDegCount/index.js
@@ -71,6 +71,7 @@ const PatternOptionPctDegCount = props => {
})
}
option={option}
+ noDocs={props.noDocs}
/>
);
diff --git a/packages/components/src/DraftConfigurator/PatternOptions/index.js b/packages/components/src/DraftConfigurator/PatternOptions/index.js
index 730f4d3b8d8..459b035c3f7 100644
--- a/packages/components/src/DraftConfigurator/PatternOptions/index.js
+++ b/packages/components/src/DraftConfigurator/PatternOptions/index.js
@@ -28,6 +28,7 @@ const PatternOptions = props => {
children = (
{
else shown.splice(index, 1);
setExpanded(shown);
};
-
+ console.log("dc props", props);
return (
-
@@ -28,6 +28,7 @@ const DraftConfigurator = props => {
@@ -42,6 +43,7 @@ const DraftConfigurator = props => {
@@ -59,6 +61,8 @@ DraftConfigurator.propTypes = {
units: PropTypes.oneOf(["metric", "imperial"]).isRequired
};
-DraftConfigurator.defaultProps = {};
+DraftConfigurator.defaultProps = {
+ noDocs: false
+};
export default DraftConfigurator;
diff --git a/packages/components/src/Workbench/DraftPattern/index.js b/packages/components/src/Workbench/DraftPattern/index.js
index a83b4c4cf60..31d31912c56 100644
--- a/packages/components/src/Workbench/DraftPattern/index.js
+++ b/packages/components/src/Workbench/DraftPattern/index.js
@@ -115,6 +115,7 @@ const DraftPattern = props => {
)}