Fix stuff

faebeee · faebeee · commit 5d3ee48d2f6a · 2021-06-22T09:42:01.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 out
 react-component-creator-plugin.jar
 react-component-creator-plugin.zip
+.DS_Store
diff --git a/CHANGE-NOTES.md b/CHANGE-NOTES.md
@@ -1,3 +1,4 @@
+- v1.0.0 Use component-creator-lib
 - v0.6.0 Use component-creator-lib
     - Fix windows paths
     - Update documentation
diff --git a/README.md b/README.md
@@ -5,9 +5,7 @@
 ![Rating](https://img.shields.io/jetbrains/plugin/r/rating/13965-react-component-creator?style=for-the-badge)
 
 
-An Brainstorm Plugin to create a new react functional component with all additional files like
-SCSS, Spec, Storybook. Add Redux reducer module with actions, mutations, state and types. 
-Add custom templates to match your coding style and your needs.
+w
 
 
 ![Settings](https://github.com/component-creator-plugin/react-component-creator-plugin/blob/master/doc/settings.png?raw=true "")
diff --git a/lib/component-creator-lib.jar b/lib/component-creator-lib.jar
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,10 +1,10 @@
 <idea-plugin>
     <id>com.faebeee.reactcomponentcreator</id>
     <name>React Component Creator</name>
-    <version>0.6.0</version>
+    <version>1.0.0</version>
     <vendor email="faebeee@gmail.com" url="http://fabs.io">Fabio Gianini</vendor>
 
-    <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
+    <!-- please see http://www.jetbrains.org/int6llij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
     <idea-version since-build="173.0"/>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
diff --git a/resources/templates/component/{{componentName}}.md.mustache b/resources/templates/component/{{componentName}}.md.mustache
@@ -1,5 +1,5 @@
-# {{ componentNameCamelCase }}
+# {{ componentName }}
 
 Description of component
 
-    <{{ componentName }}/>
+    <{{ componentNamePascalCase }}/>
diff --git a/resources/templates/component/{{componentName}}.story.tsx.mustache b/resources/templates/component/{{componentName}}.story.tsx.mustache
@@ -3,5 +3,5 @@ import {{ componentNamePascalCase }} from './{{componentName}}';
 
 export default {
     title: "{{ componentNamePascalCase }}",
-    component: componentNamePascalCase
-};
+    component: {{ componentNamePascalCase }}
+};
diff --git a/resources/templates/component/{{componentName}}.tsx.mustache b/resources/templates/component/{{componentName}}.tsx.mustache
@@ -2,6 +2,6 @@ import React from 'react';
 
 type Props = {}
 
-export default function {{ componentNameCamelCase }}({}: Props) {
+export default function {{ componentNamePascalCase }}({}: Props) {
     return (<div className="{{ componentName }}"/>);
 }
diff --git a/src/io/fabs/react/component/data/ComponentCreateOptions.java b/src/io/fabs/react/component/data/ComponentCreateOptions.java
@@ -15,11 +15,11 @@ public class ComponentCreateOptions extends AbstractOptions {
     private final String STORY_TEMPLATE_KEY = "STORY_TEMPLATE_KEY";
     private final String MD_TEMPLATE_KEY = "MD_TEMPLATE_KEY";
 
-    private final String defaultComponentTemplateFile = "templates/component/{{componentName}}.tsx.mustache";
-    private final String defaultSassTemplateFile = "templates/component/_{{componentName}}.scss.mustache";
-    private final String defaultSpecTemplateFile = "templates/component/{{componentName}}.spec.tsx.mustache";
-    private final String defaultStoryTemplateFile = "templates/component/{{componentName}}.story.tsx.mustache";
-    private final String defaultMarkdownTemplateFile = "templates/component/{{componentName}}.md.mustache";
+    private final String defaultComponentTemplateFile = "/templates/component/{{componentName}}.tsx.mustache";
+    private final String defaultSassTemplateFile = "/templates/component/_{{componentName}}.scss.mustache";
+    private final String defaultSpecTemplateFile = "/templates/component/{{componentName}}.spec.tsx.mustache";
+    private final String defaultStoryTemplateFile = "/templates/component/{{componentName}}.story.tsx.mustache";
+    private final String defaultMarkdownTemplateFile = "/templates/component/{{componentName}}.md.mustache";
 
     private String componentTemplateFile = defaultComponentTemplateFile;
     private String sassTemplateFile = defaultSassTemplateFile;
@@ -68,10 +68,10 @@ public void deserialize(Element element) {
         setStoryTemplateFile(element.getAttributeValue(STORY_TEMPLATE_KEY));
         setMarkdownTemplateFile(element.getAttributeValue(MD_TEMPLATE_KEY));
 
-        setCreateMarkdownDefaultChecked(Boolean.valueOf(element.getAttributeValue(MD_TEMPLATE_KEY)));
-        setCreateStorybookDefaultChecked(Boolean.valueOf(element.getAttributeValue(STORY_CHECKBOX_KEY)));
-        setCreateScssDefaultChecked(Boolean.valueOf(element.getAttributeValue(SCSS_CHECKBOX_KEY)));
-        setCreateSpecDefaultChecked(Boolean.valueOf(element.getAttributeValue(SPEC_CHECKBOX_KEY)));
+        setCreateMarkdownDefaultChecked(Boolean.parseBoolean(element.getAttributeValue(MD_CHECKBOX_KEY)));
+        setCreateStorybookDefaultChecked(Boolean.parseBoolean(element.getAttributeValue(STORY_CHECKBOX_KEY)));
+        setCreateScssDefaultChecked(Boolean.parseBoolean(element.getAttributeValue(SCSS_CHECKBOX_KEY)));
+        setCreateSpecDefaultChecked(Boolean.parseBoolean(element.getAttributeValue(SPEC_CHECKBOX_KEY)));
     }
 
     @Override
@@ -98,7 +98,7 @@ public ArrayList<String> getFiles() {
     }
 
     @Override
-    public Map<String, Object> getTemplateVariables() {
+    public Map<String, String> getTemplateVariables() {
         return TemplateUtils.createVariableMap(componentName);
     }
 
diff --git a/src/io/fabs/react/component/data/ComponentSettingsState.java b/src/io/fabs/react/component/data/ComponentSettingsState.java
@@ -4,7 +4,7 @@
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.Project;
-import io.fabs.util.AbstractPersistentState;
+import io.fabs.util.settings.AbstractPersistentState;
 
 @State(
         name = "ComponentSettings",
diff --git a/src/io/fabs/react/component/settings/ComponentSettings.java b/src/io/fabs/react/component/settings/ComponentSettings.java
@@ -4,8 +4,8 @@
 import io.fabs.react.component.data.ComponentCreateOptions;
 import io.fabs.react.component.ui.SettingsForm;
 import io.fabs.react.component.data.ComponentSettingsState;
-import io.fabs.util.AbstractSettingsForm;
-import io.fabs.util.AbstractSettingsUI;
+import io.fabs.util.settings.AbstractSettingsForm;
+import io.fabs.util.settings.AbstractSettingsUI;
 
 public class ComponentSettings extends AbstractSettingsUI<ComponentCreateOptions> {
 
diff --git a/src/io/fabs/react/component/ui/SettingsForm.java b/src/io/fabs/react/component/ui/SettingsForm.java
@@ -1,7 +1,7 @@
 package io.fabs.react.component.ui;
 
 import io.fabs.react.component.data.ComponentCreateOptions;
-import io.fabs.util.AbstractSettingsForm;
+import io.fabs.util.settings.AbstractSettingsForm;
 
 import javax.swing.*;
 
diff --git a/src/io/fabs/react/reducer/data/ReducerCreateOptions.java b/src/io/fabs/react/reducer/data/ReducerCreateOptions.java
@@ -16,10 +16,10 @@ public class ReducerCreateOptions extends AbstractOptions {
     private final static String INDEX_TEMPLATE = "INDEX_TEMPLATE";
     private final static String TYPES_TEMPLATE = "TYPES_TEMPLATE";
 
-    private String defaultActionTemplateFile = "templates/reducer/actions.ts.mustache";
-    private String defaultModuleIndexTemplateFile = "templates/reducer/index.ts.mustache";
-    private String defaultTypesTemplateFile = "templates/reducer/types.ts.mustache";
-    private String defaultActionTypesTemplateFile = "templates/reducer/action-types.ts.mustache";
+    private final String defaultActionTemplateFile = "/templates/reducer/actions.ts.mustache";
+    private final String defaultModuleIndexTemplateFile = "/templates/reducer/index.ts.mustache";
+    private final String defaultTypesTemplateFile = "/templates/reducer/types.ts.mustache";
+    private final String defaultActionTypesTemplateFile = "/templates/reducer/action-types.ts.mustache";
 
     private String actionTemplateFile = defaultActionTemplateFile;
     private String moduleIndexTemplateFile = defaultModuleIndexTemplateFile;
@@ -57,8 +57,8 @@ public ArrayList<String> getFiles() {
     }
 
     @Override
-    public Map<String, Object> getTemplateVariables() {
-        Map<String, Object> templateModel = TemplateUtils.createVariableMap(moduleName);
+    public Map<String, String> getTemplateVariables() {
+        Map<String, String> templateModel = TemplateUtils.createVariableMap(moduleName);
 
         templateModel.put("actionFunctionName", actionFunctionName);
         templateModel.put("mutationType", mutationType);
diff --git a/src/io/fabs/react/reducer/data/ReducerSettingsState.java b/src/io/fabs/react/reducer/data/ReducerSettingsState.java
@@ -4,12 +4,12 @@
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.Project;
-import io.fabs.util.AbstractPersistentState;
+import io.fabs.util.settings.AbstractPersistentState;
 
 @State(
         name = "ReducerSettings",
         storages = {
-                @Storage("/rcc.xml")
+                @Storage("/rcc0.6.xml")
         }
 )
 public class ReducerSettingsState extends AbstractPersistentState<ReducerCreateOptions> {
diff --git a/src/io/fabs/react/reducer/settings/ReducerSettings.java b/src/io/fabs/react/reducer/settings/ReducerSettings.java
@@ -4,8 +4,8 @@
 import io.fabs.react.reducer.data.ReducerCreateOptions;
 import io.fabs.react.reducer.data.ReducerSettingsState;
 import io.fabs.react.reducer.ui.SettingsForm;
-import io.fabs.util.AbstractSettingsForm;
-import io.fabs.util.AbstractSettingsUI;
+import io.fabs.util.settings.AbstractSettingsForm;
+import io.fabs.util.settings.AbstractSettingsUI;
 
 public class ReducerSettings extends AbstractSettingsUI<ReducerCreateOptions> {
     public ReducerSettings(Project project) {
diff --git a/src/io/fabs/react/reducer/ui/CreateReducerForm.form b/src/io/fabs/react/reducer/ui/CreateReducerForm.form
@@ -72,7 +72,7 @@
             <properties/>
             <border type="none"/>
             <children>
-              <component id="e9fbc" class="javax.swing.JTextField" binding="mutationNametextField">
+              <component id="e9fbc" class="javax.swing.JTextField" binding="mutationNameTextField">
                 <constraints>
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                     <preferred-size width="150" height="-1"/>
diff --git a/src/io/fabs/react/reducer/ui/CreateReducerForm.java b/src/io/fabs/react/reducer/ui/CreateReducerForm.java
@@ -14,7 +14,7 @@ public class CreateReducerForm extends AbstractDialog<ReducerCreateOptions> {
     private JButton createButton;
     private JTextField moduleNameTextField;
     private JTextField actionNameTextField;
-    private JTextField mutationNametextField;
+    private JTextField mutationNameTextField;
 
     public CreateReducerForm(ReducerCreateOptions options) {
         super(options);
@@ -46,7 +46,7 @@ public String getDirectoryName() {
     public ReducerCreateOptions setOptions(ReducerCreateOptions reducerCreateOptions) {
         options.setActionFunctionName(actionNameTextField.getText());
         options.setModuleName(moduleNameTextField.getText());
-        options.setMutationType(mutationNametextField.getText());
+        options.setMutationType(mutationNameTextField.getText());
         return options;
     }
 }
diff --git a/src/io/fabs/react/reducer/ui/SettingsForm.java b/src/io/fabs/react/reducer/ui/SettingsForm.java
@@ -1,7 +1,7 @@
 package io.fabs.react.reducer.ui;
 
 import io.fabs.react.reducer.data.ReducerCreateOptions;
-import io.fabs.util.AbstractSettingsForm;
+import io.fabs.util.settings.AbstractSettingsForm;
 
 import javax.swing.*;
 
diff --git a/src/io/fabs/util/AbstractCreatorAction.java b/src/io/fabs/util/AbstractCreatorAction.java
@@ -0,0 +1,56 @@
+package io.fabs.util;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.pom.Navigatable;
+
+import java.awt.*;
+
+public abstract class AbstractCreatorAction extends AnAction {
+
+    protected abstract AbstractDialog createDialog(Project project);
+
+    @Override
+    public void update(AnActionEvent anActionEvent) {
+        Project project = anActionEvent.getProject();
+
+        Navigatable navigatable = anActionEvent.getData(CommonDataKeys.NAVIGATABLE);
+        anActionEvent.getPresentation().setEnabledAndVisible(project != null && navigatable != null);
+    }
+
+    protected VirtualFile getLocation(VirtualFile file) {
+        if (file.isDirectory()) {
+            return file;
+        }
+        return file.getParent();
+    }
+
+    @Override
+    public void actionPerformed(AnActionEvent e) {
+        AbstractDialog dialog = this.createDialog(e.getProject());
+        VirtualFile selectedLocation = e.getData(CommonDataKeys.VIRTUAL_FILE);
+        VirtualFile targetLocation = getLocation(selectedLocation);
+
+        final int width = dialog.getWidth();
+        final int height = dialog.getHeight();
+        final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        int x = (screenSize.width / 2) - (width / 2);
+        int y = (screenSize.height / 2) - (height / 2);
+        dialog.setLocation(x, y);
+
+        dialog.pack();
+        dialog.setVisible(true);
+
+        if (dialog.isCanceled()) {
+            return;
+        }
+
+        ApplicationManager.getApplication().runWriteAction(
+                new Creator(targetLocation, dialog.getDirectoryName(), dialog.getComponentName(), dialog.getOptions())
+        );
+    }
+}
diff --git a/src/io/fabs/util/AbstractDialog.java b/src/io/fabs/util/AbstractDialog.java
@@ -0,0 +1,49 @@
+package io.fabs.util;
+
+import javax.swing.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+public abstract class AbstractDialog<T extends AbstractOptions> extends JDialog {
+    protected T options;
+
+    public AbstractDialog(T options) {
+        super();
+        this.options = options;
+
+        setModal(true);
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent e) {
+                onCancel();
+            }
+        });
+    }
+
+    public abstract String getComponentName();
+
+    public abstract String getDirectoryName();
+
+    public abstract T setOptions(T options);
+
+    protected boolean hasCanceled = false;
+
+    public boolean isCanceled() {
+        return hasCanceled;
+    }
+
+    protected void onOK() {
+        hasCanceled = false;
+        dispose();
+        this.options = setOptions(this.options);
+    }
+
+    protected void onCancel() {
+        hasCanceled = true;
+        dispose();
+    }
+
+    public T getOptions() {
+        return options;
+    }
+}
diff --git a/src/io/fabs/util/AbstractOptions.java b/src/io/fabs/util/AbstractOptions.java
@@ -0,0 +1,16 @@
+package io.fabs.util;
+
+import io.fabs.util.settings.SerializableOptions;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public abstract class AbstractOptions implements SerializableOptions {
+    abstract public ArrayList<String> getFiles();
+
+    abstract public Map<String, String> getTemplateVariables();
+
+    public String[] getFileList() {
+        return getFiles().toArray(new String[getFiles().size()]);
+    }
+}
diff --git a/src/io/fabs/util/Creator.java b/src/io/fabs/util/Creator.java
diff --git a/src/io/fabs/util/FileUtils.java b/src/io/fabs/util/FileUtils.java
diff --git a/src/io/fabs/util/StringFormatter.java b/src/io/fabs/util/StringFormatter.java
diff --git a/src/io/fabs/util/TemplateRenderer.java b/src/io/fabs/util/TemplateRenderer.java
diff --git a/src/io/fabs/util/TemplateUtils.java b/src/io/fabs/util/TemplateUtils.java
diff --git a/src/io/fabs/util/settings/AbstractPersistentState.java b/src/io/fabs/util/settings/AbstractPersistentState.java
diff --git a/src/io/fabs/util/settings/AbstractSettingsForm.java b/src/io/fabs/util/settings/AbstractSettingsForm.java
diff --git a/src/io/fabs/util/settings/AbstractSettingsUI.java b/src/io/fabs/util/settings/AbstractSettingsUI.java
diff --git a/src/io/fabs/util/settings/SerializableOptions.java b/src/io/fabs/util/settings/SerializableOptions.java

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+- v1.0.0 Use component-creator-lib`
`1`	`2`	`- v0.6.0 Use component-creator-lib`
`2`	`3`	`- Fix windows paths`
`3`	`4`	`- Update documentation`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ import React from 'react';`
`2`	`2`
`3`	`3`	`type Props = {}`
`4`	`4`
`5`		`-export default function {{ componentNameCamelCase }}({}: Props) {`
	`5`	`+export default function {{ componentNamePascalCase }}({}: Props) {`
`6`	`6`	`return (<div className="{{ componentName }}"/>);`
`7`	`7`	`}`