@atlaskit/jql-editor 4.11.2 → 4.12.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/jql-editor
 
+## 4.12.0
+
+### Minor Changes
+
+- [#175241](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/175241)
+  [`7815c3852aecc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7815c3852aecc) -
+  Cleanup FF to enable custom components in JQL editor [GRAVITYAI-1983]
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.11.2
 
 ### Patch Changes

package/dist/cjs/analytics/util.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
 exports.useJqlEditorAnalytics = void 0;
 var _jqlEditorCommon = require("@atlaskit/jql-editor-common");
 var useJqlEditorAnalytics = exports.useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
-  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "4.11.2", _jqlEditorCommon.ANALYTICS_CHANNEL);
+  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "4.12.0", _jqlEditorCommon.ANALYTICS_CHANNEL);
 };

package/dist/cjs/state/index.js

@@ -18,7 +18,6 @@ var _uuid = require("uuid");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _jqlAst = require("@atlaskit/jql-ast");
 var _jqlAutocomplete = require("@atlaskit/jql-autocomplete");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _selectErrorCommand = require("../commands/select-error-command");
 var _constants = require("../common/constants");
@@ -958,7 +957,7 @@ var EditorStateContainer = exports.EditorStateContainer = (0, _reactSweetState.c
         }) : undefined,
         onDebugUnsafeMessage: onDebugUnsafeMessage,
         onSyntaxHelp: onSyntaxHelp,
-        customComponents: (0, _platformFeatureFlags.fg)('custom_components_for_jql_editor') ? customComponents : undefined
+        customComponents: customComponents
       });
       dispatch(actions.initialiseEditorState());
     };
@@ -999,7 +998,7 @@ var EditorStateContainer = exports.EditorStateContainer = (0, _reactSweetState.c
         enableRichInlineNodes: enableRichInlineNodes,
         onDebugUnsafeMessage: onDebugUnsafeMessage,
         onSyntaxHelp: onSyntaxHelp,
-        customComponents: (0, _platformFeatureFlags.fg)('custom_components_for_jql_editor') ? customComponents : undefined
+        customComponents: customComponents
       });
     };
   }

package/dist/cjs/ui/jql-editor/index.js

@@ -9,7 +9,6 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _reactMagneticDi = require("react-magnetic-di");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../analytics");
 var _useEditorTheme = require("../../hooks/use-editor-theme");
 var _state = require("../../state");
@@ -68,7 +67,7 @@ var JQLEditorInner = function JQLEditorInner(_ref) {
     enableRichInlineNodes: enableRichInlineNodes,
     onSyntaxHelp: onSyntaxHelp,
     onFocus: onFocus,
-    customComponents: (0, _platformFeatureFlags.fg)('custom_components_for_jql_editor') ? customComponents : undefined
+    customComponents: customComponents
   }, /*#__PURE__*/_react.default.createElement(_useEditorTheme.EditorThemeContext.Provider, {
     value: editorTheme
   }, /*#__PURE__*/_react.default.createElement(_jqlEditorPortalProvider.JQLEditorPortalRenderer, null, /*#__PURE__*/_react.default.createElement(_jqlEditorView.default, {

package/dist/cjs/ui/jql-editor-footer-content/jql-messages/errors/index.js

@@ -13,7 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactMagneticDi = require("react-magnetic-di");
 var _form = require("@atlaskit/form");
 var _jqlAst = require("@atlaskit/jql-ast");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("../../../../common/constants");
 var _messages = require("../../../../common/messages");
 var _useEditorTheme = require("../../../../hooks/use-editor-theme");
@@ -85,32 +84,23 @@ var ErrorMessages = exports.ErrorMessages = function ErrorMessages() {
     editorId = _useScopedId2[0];
   var errorMessage = useFormattedErrorMessage();
   var testId = 'jql-editor-validation';
-  if ((0, _platformFeatureFlags.fg)('custom_components_for_jql_editor')) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    var _useCustomErrorCompon = (0, _state.useCustomErrorComponent)(),
-      _useCustomErrorCompon2 = (0, _slicedToArray2.default)(_useCustomErrorCompon, 1),
-      CustomErrorComponent = _useCustomErrorCompon2[0];
-    var childrenToRender = errorMessage != null ? /*#__PURE__*/_react.default.createElement(_format.MessageContainer, null, /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, {
-      testId: testId
-    }, /*#__PURE__*/_react.default.createElement("span", {
-      role: "alert",
-      "aria-describedby": editorId
-    }, errorMessage))) : null;
-
-    // Only render CustomErrorComponent if there is an errorMessage
-    if (errorMessage != null && CustomErrorComponent) {
-      return /*#__PURE__*/_react.default.createElement(CustomComponentDecoratedWithEditorTheme, {
-        testId: testId,
-        editorId: editorId,
-        Component: CustomErrorComponent
-      }, childrenToRender);
-    }
-    return childrenToRender;
-  }
-  return errorMessage != null ? /*#__PURE__*/_react.default.createElement(_format.MessageContainer, null, /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, {
+  var _useCustomErrorCompon = (0, _state.useCustomErrorComponent)(),
+    _useCustomErrorCompon2 = (0, _slicedToArray2.default)(_useCustomErrorCompon, 1),
+    CustomErrorComponent = _useCustomErrorCompon2[0];
+  var childrenToRender = errorMessage != null ? /*#__PURE__*/_react.default.createElement(_format.MessageContainer, null, /*#__PURE__*/_react.default.createElement(_form.ErrorMessage, {
     testId: testId
   }, /*#__PURE__*/_react.default.createElement("span", {
     role: "alert",
     "aria-describedby": editorId
   }, errorMessage))) : null;
+
+  // Only render CustomErrorComponent if there is an errorMessage
+  if (errorMessage != null && CustomErrorComponent) {
+    return /*#__PURE__*/_react.default.createElement(CustomComponentDecoratedWithEditorTheme, {
+      testId: testId,
+      editorId: editorId,
+      Component: CustomErrorComponent
+    }, childrenToRender);
+  }
+  return childrenToRender;
 };

package/dist/es2019/analytics/util.js

@@ -1,4 +1,4 @@
 import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
 export const useJqlEditorAnalytics = analyticsSource => {
-  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.11.2", ANALYTICS_CHANNEL);
+  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.12.0", ANALYTICS_CHANNEL);
 };

package/dist/es2019/state/index.js

@@ -8,7 +8,6 @@ import { v4 as uuidv4 } from 'uuid';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { computeJqlInsights, isListOperator } from '@atlaskit/jql-ast';
 import { JQLAutocomplete } from '@atlaskit/jql-autocomplete';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ActionSubject, ActionSubjectId, Action as AnalyticsAction, EventType } from '../analytics';
 import { selectErrorCommand } from '../commands/select-error-command';
 import { JQL_EDITOR_MAIN_ID } from '../common/constants';
@@ -928,7 +927,7 @@ export const EditorStateContainer = createContainer(Store, {
       }) : undefined,
       onDebugUnsafeMessage,
       onSyntaxHelp,
-      customComponents: fg('custom_components_for_jql_editor') ? customComponents : undefined
+      customComponents
     });
     dispatch(actions.initialiseEditorState());
   },
@@ -970,7 +969,7 @@ export const EditorStateContainer = createContainer(Store, {
       enableRichInlineNodes,
       onDebugUnsafeMessage,
       onSyntaxHelp,
-      customComponents: fg('custom_components_for_jql_editor') ? customComponents : undefined
+      customComponents
     });
   }
 });

package/dist/es2019/ui/jql-editor/index.js

@@ -1,7 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { di } from 'react-magnetic-di';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useJqlEditorAnalytics } from '../../analytics';
 import { EditorThemeContext, useEditorTheme } from '../../hooks/use-editor-theme';
 import { EditorStateContainer } from '../../state';
@@ -56,7 +55,7 @@ const JQLEditorInner = ({
     enableRichInlineNodes: enableRichInlineNodes,
     onSyntaxHelp: onSyntaxHelp,
     onFocus: onFocus,
-    customComponents: fg('custom_components_for_jql_editor') ? customComponents : undefined
+    customComponents: customComponents
   }, /*#__PURE__*/React.createElement(EditorThemeContext.Provider, {
     value: editorTheme
   }, /*#__PURE__*/React.createElement(JQLEditorPortalRenderer, null, /*#__PURE__*/React.createElement(JQLEditorView, {

package/dist/es2019/ui/jql-editor-footer-content/jql-messages/errors/index.js

@@ -3,7 +3,6 @@ import React, { useEffect } from 'react';
 import { di } from 'react-magnetic-di';
 import { ErrorMessage } from '@atlaskit/form';
 import { JQLSyntaxError } from '@atlaskit/jql-ast';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { JQL_EDITOR_INPUT_ID } from '../../../../common/constants';
 import { commonMessages } from '../../../../common/messages';
 import { useEditorThemeContext } from '../../../../hooks/use-editor-theme';
@@ -70,30 +69,21 @@ export const ErrorMessages = () => {
   const [editorId] = useScopedId(JQL_EDITOR_INPUT_ID);
   const errorMessage = useFormattedErrorMessage();
   const testId = 'jql-editor-validation';
-  if (fg('custom_components_for_jql_editor')) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const [CustomErrorComponent] = useCustomErrorComponent();
-    const childrenToRender = errorMessage != null ? /*#__PURE__*/React.createElement(MessageContainer, null, /*#__PURE__*/React.createElement(ErrorMessage, {
-      testId: testId
-    }, /*#__PURE__*/React.createElement("span", {
-      role: "alert",
-      "aria-describedby": editorId
-    }, errorMessage))) : null;
-
-    // Only render CustomErrorComponent if there is an errorMessage
-    if (errorMessage != null && CustomErrorComponent) {
-      return /*#__PURE__*/React.createElement(CustomComponentDecoratedWithEditorTheme, {
-        testId: testId,
-        editorId: editorId,
-        Component: CustomErrorComponent
-      }, childrenToRender);
-    }
-    return childrenToRender;
-  }
-  return errorMessage != null ? /*#__PURE__*/React.createElement(MessageContainer, null, /*#__PURE__*/React.createElement(ErrorMessage, {
+  const [CustomErrorComponent] = useCustomErrorComponent();
+  const childrenToRender = errorMessage != null ? /*#__PURE__*/React.createElement(MessageContainer, null, /*#__PURE__*/React.createElement(ErrorMessage, {
     testId: testId
   }, /*#__PURE__*/React.createElement("span", {
     role: "alert",
     "aria-describedby": editorId
   }, errorMessage))) : null;
+
+  // Only render CustomErrorComponent if there is an errorMessage
+  if (errorMessage != null && CustomErrorComponent) {
+    return /*#__PURE__*/React.createElement(CustomComponentDecoratedWithEditorTheme, {
+      testId: testId,
+      editorId: editorId,
+      Component: CustomErrorComponent
+    }, childrenToRender);
+  }
+  return childrenToRender;
 };

package/dist/esm/analytics/util.js

@@ -1,4 +1,4 @@
 import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
 export var useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
-  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.11.2", ANALYTICS_CHANNEL);
+  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.12.0", ANALYTICS_CHANNEL);
 };

package/dist/esm/state/index.js

@@ -13,7 +13,6 @@ import { v4 as uuidv4 } from 'uuid';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { computeJqlInsights, isListOperator } from '@atlaskit/jql-ast';
 import { JQLAutocomplete } from '@atlaskit/jql-autocomplete';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ActionSubject, ActionSubjectId, Action as AnalyticsAction, EventType } from '../analytics';
 import { selectErrorCommand } from '../commands/select-error-command';
 import { JQL_EDITOR_MAIN_ID } from '../common/constants';
@@ -951,7 +950,7 @@ export var EditorStateContainer = createContainer(Store, {
         }) : undefined,
         onDebugUnsafeMessage: onDebugUnsafeMessage,
         onSyntaxHelp: onSyntaxHelp,
-        customComponents: fg('custom_components_for_jql_editor') ? customComponents : undefined
+        customComponents: customComponents
       });
       dispatch(actions.initialiseEditorState());
     };
@@ -992,7 +991,7 @@ export var EditorStateContainer = createContainer(Store, {
         enableRichInlineNodes: enableRichInlineNodes,
         onDebugUnsafeMessage: onDebugUnsafeMessage,
         onSyntaxHelp: onSyntaxHelp,
-        customComponents: fg('custom_components_for_jql_editor') ? customComponents : undefined
+        customComponents: customComponents
       });
     };
   }

package/dist/esm/ui/jql-editor/index.js

@@ -1,7 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { di } from 'react-magnetic-di';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useJqlEditorAnalytics } from '../../analytics';
 import { EditorThemeContext, useEditorTheme } from '../../hooks/use-editor-theme';
 import { EditorStateContainer } from '../../state';
@@ -56,7 +55,7 @@ var JQLEditorInner = function JQLEditorInner(_ref) {
     enableRichInlineNodes: enableRichInlineNodes,
     onSyntaxHelp: onSyntaxHelp,
     onFocus: onFocus,
-    customComponents: fg('custom_components_for_jql_editor') ? customComponents : undefined
+    customComponents: customComponents
   }, /*#__PURE__*/React.createElement(EditorThemeContext.Provider, {
     value: editorTheme
   }, /*#__PURE__*/React.createElement(JQLEditorPortalRenderer, null, /*#__PURE__*/React.createElement(JQLEditorView, {

package/dist/esm/ui/jql-editor-footer-content/jql-messages/errors/index.js

@@ -6,7 +6,6 @@ import React, { useEffect } from 'react';
 import { di } from 'react-magnetic-di';
 import { ErrorMessage } from '@atlaskit/form';
 import { JQLSyntaxError } from '@atlaskit/jql-ast';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { JQL_EDITOR_INPUT_ID } from '../../../../common/constants';
 import { commonMessages } from '../../../../common/messages';
 import { useEditorThemeContext } from '../../../../hooks/use-editor-theme';
@@ -75,32 +74,23 @@ export var ErrorMessages = function ErrorMessages() {
     editorId = _useScopedId2[0];
   var errorMessage = useFormattedErrorMessage();
   var testId = 'jql-editor-validation';
-  if (fg('custom_components_for_jql_editor')) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    var _useCustomErrorCompon = useCustomErrorComponent(),
-      _useCustomErrorCompon2 = _slicedToArray(_useCustomErrorCompon, 1),
-      CustomErrorComponent = _useCustomErrorCompon2[0];
-    var childrenToRender = errorMessage != null ? /*#__PURE__*/React.createElement(MessageContainer, null, /*#__PURE__*/React.createElement(ErrorMessage, {
-      testId: testId
-    }, /*#__PURE__*/React.createElement("span", {
-      role: "alert",
-      "aria-describedby": editorId
-    }, errorMessage))) : null;
-
-    // Only render CustomErrorComponent if there is an errorMessage
-    if (errorMessage != null && CustomErrorComponent) {
-      return /*#__PURE__*/React.createElement(CustomComponentDecoratedWithEditorTheme, {
-        testId: testId,
-        editorId: editorId,
-        Component: CustomErrorComponent
-      }, childrenToRender);
-    }
-    return childrenToRender;
-  }
-  return errorMessage != null ? /*#__PURE__*/React.createElement(MessageContainer, null, /*#__PURE__*/React.createElement(ErrorMessage, {
+  var _useCustomErrorCompon = useCustomErrorComponent(),
+    _useCustomErrorCompon2 = _slicedToArray(_useCustomErrorCompon, 1),
+    CustomErrorComponent = _useCustomErrorCompon2[0];
+  var childrenToRender = errorMessage != null ? /*#__PURE__*/React.createElement(MessageContainer, null, /*#__PURE__*/React.createElement(ErrorMessage, {
     testId: testId
   }, /*#__PURE__*/React.createElement("span", {
     role: "alert",
     "aria-describedby": editorId
   }, errorMessage))) : null;
+
+  // Only render CustomErrorComponent if there is an errorMessage
+  if (errorMessage != null && CustomErrorComponent) {
+    return /*#__PURE__*/React.createElement(CustomComponentDecoratedWithEditorTheme, {
+      testId: testId,
+      editorId: editorId,
+      Component: CustomErrorComponent
+    }, childrenToRender);
+  }
+  return childrenToRender;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/jql-editor",
-	"version": "4.11.2",
+	"version": "4.12.0",
 	"description": "This package allows consumers to render an advanced JQL editor component to enable autocomplete-assisted authoring and validation of JQL queries.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/form": "^10.6.0",
-		"@atlaskit/icon": "^23.0.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/jql-ast": "^3.3.0",
 		"@atlaskit/jql-autocomplete": "^2.0.0",
 		"@atlaskit/jql-editor-common": "^2.1.0",
@@ -129,9 +129,6 @@
 		"platform-component-visual-refresh": {
 			"type": "boolean"
 		},
-		"custom_components_for_jql_editor": {
-			"type": "boolean"
-		},
 		"add_nin_press_interactions": {
 			"type": "boolean"
 		}