@truedat/dq 4.58.4 → 4.58.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.58.5] 2022-12-23
+
+### Added
+
+- [TD-5368] IsModification for editable templates
+
 ## [4.58.4] 2022-12-22
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.58.4",
+  "version": "4.58.6",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.58.4",
+    "@truedat/test": "4.58.6",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/core": "4.58.4",
-    "@truedat/df": "4.58.4",
+    "@truedat/core": "4.58.6",
+    "@truedat/df": "4.58.6",
     "decode-uri-component": "^0.2.2",
     "graphql": "^15.5.3",
     "moment": "^2.29.4",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "852f36764d42a458272b3d5a5d204d928d5243c4"
+  "gitHead": "6d62fbef2dea9d23cb1f3908bdc48ba36f4fd55d"
 }

package/src/components/NewBasicRuleImplementation.js

@@ -104,12 +104,13 @@ export const NewBasicRuleImplementation = ({
         </Grid.Row>
         <Grid.Row stretched>
           <RuleImplementationBasicForm
-            mode={clone ? "clone" : edition ? "edition" : ""}
             implementationKey={ruleImplementation.implementationKey}
-            setImplementationKey={setImplementationKey}
-            ruleImplementation={ruleImplementation}
+            isModification={edition}
+            mode={clone ? "clone" : edition ? "edition" : ""}
             onChange={onChange}
             onSubmit={doSubmit}
+            ruleImplementation={ruleImplementation}
+            setImplementationKey={setImplementationKey}
           />
         </Grid.Row>
       </Grid.Column>

package/src/components/NewRuleImplementation.js

@@ -579,26 +579,28 @@ export const NewRuleImplementation = ({
         <Grid.Row stretched>
           {ruleImplementation.implementationType == "raw" ? (
             <RuleImplementationRawForm
-              mode={clone ? "clone" : edition ? "edition" : ""}
-              implementationKey={ruleImplementation.implementationKey}
               conceptDomainId={conceptDomainId}
               domainIds={conceptDomainIds}
+              implementationKey={ruleImplementation.implementationKey}
+              isModification={edition}
+              mode={clone ? "clone" : edition ? "edition" : ""}
+              onChange={onChange}
+              onSubmit={doSubmit}
               rawContent={ruleImplementation.rawContent}
+              ruleImplementation={ruleImplementation}
               setImplementationKey={setImplementationKey}
               setImplementationRawContent={setImplementationRawContent}
-              ruleImplementation={ruleImplementation}
-              onChange={onChange}
-              onSubmit={doSubmit}
             />
           ) : (
             <RuleImplementationForm
               addPopulation={addPopulation}
-              addValidation={addValidation}
               addSegment={addSegment}
+              addValidation={addValidation}
               conceptDomainId={conceptDomainId}
               domainIds={conceptDomainIds}
-              onSubmit={doSubmit}
+              isModification={edition}
               onChange={onChange}
+              onSubmit={doSubmit}
               operators={operators}
               ruleImplementation={ruleImplementation}
               setImplementationKey={setImplementationKey}

package/src/components/RuleForm.js

@@ -325,6 +325,7 @@ export class RuleForm extends React.Component {
             required
             content={rule.df_content}
             name={rule.df_name}
+            isModification={this.props.editMode}
             onChange={this.handleContentChange}
             onNameChange={(df_name) => this.setState({ df_name })}
           />

package/src/components/ruleImplementationForm/InformationForm.js

@@ -22,13 +22,14 @@ const DomainActionsLoader = ({ id, actions, onLoad }) => {
 };
 
 export const InformationForm = ({
-  setImplementationKey,
+  conceptDomainId,
+  domainIds,
+  isModification,
   onChange,
+  onDomainsLoad,
   ruleImplementation,
+  setImplementationKey,
   setIsValid,
-  onDomainsLoad,
-  conceptDomainId,
-  domainIds,
 }) => {
   const { formatMessage } = useIntl();
 
@@ -106,25 +107,27 @@ export const InformationForm = ({
       <LimitsForm onChange={onChange} ruleImplementation={ruleImplementation} />
       <SelectableDynamicForm
         scope="ri"
-        domainIds={_.isNil(domainId) ? null : [domainId]}
-        required
         content={ruleImplementation?.dfContent}
+        domainIds={_.isNil(domainId) ? null : [domainId]}
+        isModification={isModification}
         name={ruleImplementation?.dfName}
         onChange={handleContentChange}
         onNameChange={(dfName) => onChange("dfName", dfName)}
+        required
       />
     </>
   );
 };
 
 InformationForm.propTypes = {
+  conceptDomainId: PropTypes.array,
+  domainIds: PropTypes.array,
+  isModification: PropTypes.bool,
   onChange: PropTypes.func,
+  onDomainsLoad: PropTypes.func,
   ruleImplementation: PropTypes.object,
   setImplementationKey: PropTypes.func,
   setIsValid: PropTypes.func,
-  onDomainsLoad: PropTypes.func,
-  conceptDomainId: PropTypes.array,
-  domainIds: PropTypes.array,
 };
 
 export default InformationForm;

package/src/components/ruleImplementationForm/RuleImplementationBasicForm.js

@@ -50,6 +50,7 @@ Help.propTypes = {
 
 export const RuleImplementationBasicForm = ({
   implementationKey,
+  isModification,
   isSubmitting,
   onChange,
   onSubmit,
@@ -148,12 +149,13 @@ export const RuleImplementationBasicForm = ({
       <LimitsForm onChange={onChange} ruleImplementation={ruleImplementation} />
       <SelectableDynamicForm
         scope="ri"
-        domainIds={_.isNil(domainId) ? null : [domainId]}
-        required
         content={ruleImplementation?.dfContent}
+        domainIds={_.isNil(domainId) ? null : [domainId]}
+        isModification={isModification}
         name={ruleImplementation?.dfName}
         onChange={handleContentChange}
         onNameChange={(dfName) => onChange("dfName", dfName)}
+        required
       />
       {canPublish ? (
         <Button
@@ -187,6 +189,7 @@ export const RuleImplementationBasicForm = ({
 
 RuleImplementationBasicForm.propTypes = {
   implementationKey: PropTypes.string,
+  isModification: PropTypes.bool,
   isSubmitting: PropTypes.bool,
   onChange: PropTypes.func,
   onSubmit: PropTypes.func.isRequired,

package/src/components/ruleImplementationForm/RuleImplementationForm.js

@@ -50,6 +50,7 @@ export const RuleImplementationForm = ({
   addValidation,
   conceptDomainId,
   domainIds,
+  isModification,
   isSubmitting,
   onChange,
   onSubmit,
@@ -342,16 +343,17 @@ export const RuleImplementationForm = ({
             {activeStep == "information" && (
               <InformationForm
                 {...{
-                  onChange,
-                  ruleImplementation,
-                  setImplementationKey,
                   conceptDomainId,
                   domainIds,
-                  setIsValid: setContentIsValid,
+                  isModification,
+                  onChange,
                   onDomainsLoad: (domains) => {
                     setDomains(domains);
                     setIsLoadingDomains(false);
                   },
+                  ruleImplementation,
+                  setImplementationKey,
+                  setIsValid: setContentIsValid,
                 }}
               />
             )}
@@ -507,12 +509,13 @@ export const RuleImplementationForm = ({
 
 RuleImplementationForm.propTypes = {
   addPopulation: PropTypes.func,
-  addValidation: PropTypes.func,
   addSegment: PropTypes.func,
+  addValidation: PropTypes.func,
   authManageSegments: PropTypes.bool,
   conceptDomainId: PropTypes.number,
   domainIds: PropTypes.array,
   isAdmin: PropTypes.bool,
+  isModification: PropTypes.bool,
   isSubmitting: PropTypes.bool,
   onChange: PropTypes.func,
   onSubmit: PropTypes.func.isRequired,

package/src/components/ruleImplementationForm/RuleImplementationRawForm.js

@@ -54,6 +54,7 @@ export const RuleImplementationRawForm = ({
   conceptDomainId,
   domainIds,
   implementationKey,
+  isModification,
   isSubmitting,
   onChange,
   onSubmit,
@@ -235,12 +236,13 @@ export const RuleImplementationRawForm = ({
       <LimitsForm onChange={onChange} ruleImplementation={ruleImplementation} />
       <SelectableDynamicForm
         scope="ri"
-        domainIds={_.isNil(domainId) ? null : [domainId]}
-        required
         content={ruleImplementation?.dfContent}
+        domainIds={_.isNil(domainId) ? null : [domainId]}
+        isModification={isModification}
         name={ruleImplementation?.dfName}
         onChange={handleContentChange}
         onNameChange={(dfName) => onChange("dfName", dfName)}
+        required
       />
       <Form.Dropdown
         label={
@@ -386,6 +388,7 @@ RuleImplementationRawForm.propTypes = {
   conceptDomainId: PropTypes.number,
   domainIds: PropTypes.array,
   implementationKey: PropTypes.string,
+  isModification: PropTypes.bool,
   isSubmitting: PropTypes.bool,
   onChange: PropTypes.func,
   onSubmit: PropTypes.func.isRequired,