Always show custom objects in the extension editor (#6974)

4ian · Sep 18, 2024 · 6d597a4 · 6d597a4
1 parent 27b71b0
commit 6d597a4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 65 deletions.
diff --git a/newIDE/app/src/EventsFunctionsList/index.js b/newIDE/app/src/EventsFunctionsList/index.js
@@ -557,7 +557,6 @@ const EventsFunctionsList = React.forwardRef<
 
     const preferences = React.useContext(PreferencesContext);
     const gdevelopTheme = React.useContext(GDevelopThemeContext);
-    const { getShowEventBasedObjectsEditor } = preferences;
     const { currentlyRunningInAppTutorial } = React.useContext(
       InAppTutorialContext
     );
@@ -1089,30 +1088,28 @@ const EventsFunctionsList = React.forwardRef<
               ];
             },
           },
-          getShowEventBasedObjectsEditor()
-            ? {
-                isRoot: true,
-                content: new LabelTreeViewItemContent(
-                  extensionObjectsRootFolderId,
-                  i18n._(t`Objects`),
-                  {
-                    icon: <Add />,
-                    label: i18n._(t`Add an object`),
-                    click: addNewEventsBasedObject,
-                  }
-                ),
-                getChildren(i18n: I18nType): ?Array<TreeViewItem> {
-                  return objectTreeViewItems.length === 0
-                    ? [
-                        new PlaceHolderTreeViewItem(
-                          extensionObjectsEmptyPlaceholderId,
-                          i18n._(t`Start by adding a new object.`)
-                        ),
-                      ]
-                    : objectTreeViewItems;
-                },
+          {
+            isRoot: true,
+            content: new LabelTreeViewItemContent(
+              extensionObjectsRootFolderId,
+              i18n._(t`Objects`),
+              {
+                icon: <Add />,
+                label: i18n._(t`Add an object`),
+                click: addNewEventsBasedObject,
               }
-            : null,
+            ),
+            getChildren(i18n: I18nType): ?Array<TreeViewItem> {
+              return objectTreeViewItems.length === 0
+                ? [
+                    new PlaceHolderTreeViewItem(
+                      extensionObjectsEmptyPlaceholderId,
+                      i18n._(t`Start by adding a new object.`)
+                    ),
+                  ]
+                : objectTreeViewItems;
+            },
+          },
           {
             isRoot: true,
             content: new LabelTreeViewItemContent(
@@ -1190,7 +1187,6 @@ const EventsFunctionsList = React.forwardRef<
         ].filter(Boolean);
       },
       [
-        getShowEventBasedObjectsEditor,
         addNewEventsBasedObject,
         addNewEventsBehavior,
         onSelectExtensionProperties,

diff --git a/newIDE/app/src/MainFrame/Preferences/PreferencesContext.js b/newIDE/app/src/MainFrame/Preferences/PreferencesContext.js
@@ -212,7 +212,6 @@ export type PreferencesValues = {|
   eventsSheetCancelInlineParameter: 'cancel' | 'apply',
   showCommunityExtensions: boolean,
   showGetStartedSectionByDefault: boolean,
-  showEventBasedObjectsEditor: boolean,
   showInAppTutorialDeveloperMode: boolean,
   showDeprecatedInstructionWarning: boolean,
   openDiagnosticReportAutomatically: boolean,
@@ -293,8 +292,6 @@ export type Preferences = {|
   setEventsSheetCancelInlineParameter: (value: string) => void,
   setShowCommunityExtensions: (enabled: boolean) => void,
   setShowGetStartedSectionByDefault: (enabled: boolean) => void,
-  setShowEventBasedObjectsEditor: (enabled: boolean) => void,
-  getShowEventBasedObjectsEditor: () => boolean,
   setShowInAppTutorialDeveloperMode: (enabled: boolean) => void,
   setOpenDiagnosticReportAutomatically: (enabled: boolean) => void,
   getOpenDiagnosticReportAutomatically: () => boolean,
@@ -368,7 +365,6 @@ export const initialPreferences = {
     eventsSheetCancelInlineParameter: 'apply',
     showCommunityExtensions: false,
     showGetStartedSectionByDefault: true,
-    showEventBasedObjectsEditor: false,
     showInAppTutorialDeveloperMode: false,
     openDiagnosticReportAutomatically: true,
     showDeprecatedInstructionWarning: false,
@@ -433,8 +429,6 @@ export const initialPreferences = {
   setEventsSheetCancelInlineParameter: () => {},
   setShowCommunityExtensions: () => {},
   setShowGetStartedSectionByDefault: (enabled: boolean) => {},
-  setShowEventBasedObjectsEditor: (enabled: boolean) => {},
-  getShowEventBasedObjectsEditor: () => false,
   setShowInAppTutorialDeveloperMode: (enabled: boolean) => {},
   setShowDeprecatedInstructionWarning: (enabled: boolean) => {},
   getOpenDiagnosticReportAutomatically: () => true,

diff --git a/newIDE/app/src/MainFrame/Preferences/PreferencesDialog.js b/newIDE/app/src/MainFrame/Preferences/PreferencesDialog.js
@@ -71,7 +71,6 @@ const PreferencesDialog = ({
     setIsAlwaysOnTopInPreview,
     setEventsSheetCancelInlineParameter,
     setShowCommunityExtensions,
-    setShowEventBasedObjectsEditor,
     setShowInAppTutorialDeveloperMode,
     setOpenDiagnosticReportAutomatically,
     setShowDeprecatedInstructionWarning,
@@ -507,16 +506,6 @@ const PreferencesDialog = ({
           <Text size="block-title">
             <Trans>Contributor options</Trans>
           </Text>
-          <Toggle
-            onToggle={(e, check) => setShowEventBasedObjectsEditor(check)}
-            toggled={values.showEventBasedObjectsEditor}
-            labelPosition="right"
-            label={
-              <Trans>
-                Show custom objects in the extension editor (experimental)
-              </Trans>
-            }
-          />
           <Toggle
             onToggle={(e, check) => setShowInAppTutorialDeveloperMode(check)}
             toggled={values.showInAppTutorialDeveloperMode}

diff --git a/newIDE/app/src/MainFrame/Preferences/PreferencesProvider.js b/newIDE/app/src/MainFrame/Preferences/PreferencesProvider.js
@@ -152,12 +152,6 @@ export default class PreferencesProvider extends React.Component<Props, State> {
     setShowGetStartedSectionByDefault: this._setShowGetStartedSection.bind(
       this
     ),
-    setShowEventBasedObjectsEditor: this._setShowEventBasedObjectsEditor.bind(
-      this
-    ),
-    getShowEventBasedObjectsEditor: this._getShowEventBasedObjectsEditor.bind(
-      this
-    ),
     setShowInAppTutorialDeveloperMode: this._setShowInAppTutorialDeveloperMode.bind(
       this
     ),
@@ -453,22 +447,6 @@ export default class PreferencesProvider extends React.Component<Props, State> {
     );
   }
 
-  _setShowEventBasedObjectsEditor(showEventBasedObjectsEditor: boolean) {
-    this.setState(
-      state => ({
-        values: {
-          ...state.values,
-          showEventBasedObjectsEditor,
-        },
-      }),
-      () => this._persistValuesToLocalStorage(this.state)
-    );
-  }
-
-  _getShowEventBasedObjectsEditor() {
-    return this.state.values.showEventBasedObjectsEditor;
-  }
-
   _setShowInAppTutorialDeveloperMode(showInAppTutorialDeveloperMode: boolean) {
     this.setState(
       state => ({

diff --git a/...componentStories/EventsFunctionsExtensionEditor/EventsFunctionsExtensionEditor.stories.js b/...componentStories/EventsFunctionsExtensionEditor/EventsFunctionsExtensionEditor.stories.js
@@ -47,7 +47,6 @@ export const Default = () => (
 export const WithObjectEditor = () => {
   const preferences: Preferences = {
     ...initialPreferences,
-    getShowEventBasedObjectsEditor: () => true,
   };
 
   return (