@orange-soft/strapi-deployment-trigger 1.1.0 → 1.1.2

package/admin/src/pages/HomePage.jsx

@@ -1,7 +1,7 @@
 import {useState, useEffect} from 'react';
 import {useIntl} from 'react-intl';
 import {Layouts, useFetchClient} from '@strapi/strapi/admin';
-import {Link} from 'react-router-dom';
+import {Link, useLocation} from 'react-router-dom';
 import {
   Box,
   Button,
@@ -24,6 +24,7 @@ import {getTranslation} from '../utils/getTranslation';
 const HomePage = () => {
   const {formatMessage} = useIntl();
   const {get, post} = useFetchClient();
+  const location = useLocation();
   const [status, setStatus] = useState(null);
   const [loading, setLoading] = useState(true);
   const [deployingTargetId, setDeployingTargetId] = useState(null);
@@ -31,6 +32,12 @@ const HomePage = () => {
 
   useEffect(() => {
     fetchStatus();
+    // Check for notification from navigation state (e.g., after saving settings)
+    if (location.state?.notification) {
+      setNotification(location.state.notification);
+      // Clear the state so notification doesn't reappear on refresh
+      window.history.replaceState({}, document.title);
+    }
   }, []);
 
   const fetchStatus = async () => {

package/admin/src/pages/SettingsPage.jsx

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { useFetchClient, Layouts, BackButton } from '@strapi/strapi/admin';
 import {
   Box,
@@ -52,6 +53,7 @@ const validateWorkflow = (value) => {
 };
 
 const SettingsPage = () => {
+  const navigate = useNavigate();
   const { get, put, post, del } = useFetchClient();
   const [settings, setSettings] = useState({
     githubToken: '',
@@ -122,17 +124,15 @@ const SettingsPage = () => {
 
       const { data } = await put(`/${PLUGIN_ID}/settings`, { data: dataToSave });
 
-      if (settings.githubToken) {
-        setHasExistingToken(true);
-        setMaskedToken(data.data?.maskedToken);
-      }
-      setSettings(prev => ({ ...prev, githubToken: '' }));
-      setNotification({ type: 'success', message: 'Settings saved successfully' });
+      // Redirect to main page on success with notification
+      navigate(`/plugins/${PLUGIN_ID}`, {
+        state: { notification: { type: 'success', message: 'Settings saved successfully' } }
+      });
     } catch (error) {
       console.error('Error saving settings:', error);
       setNotification({ type: 'danger', message: 'Failed to save settings' });
+      setSaving(false);
     }
-    setSaving(false);
   };
 
   const handleChange = (field) => (e) => {

package/dist/_chunks/{App-CuSCtdH7.js → App-CCbQMMHR.js}

@@ -7,17 +7,22 @@ const react = require("react");
 const reactIntl = require("react-intl");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
-const index = require("./index-DGatQB-9.js");
+const index = require("./index-SuWmJtOE.js");
 const getTranslation = (id) => `${index.PLUGIN_ID}.${id}`;
 const HomePage = () => {
   const { formatMessage } = reactIntl.useIntl();
   const { get, post } = admin.useFetchClient();
+  const location = reactRouterDom.useLocation();
   const [status, setStatus] = react.useState(null);
   const [loading, setLoading] = react.useState(true);
   const [deployingTargetId, setDeployingTargetId] = react.useState(null);
   const [notification, setNotification] = react.useState(null);
   react.useEffect(() => {
     fetchStatus();
+    if (location.state?.notification) {
+      setNotification(location.state.notification);
+      window.history.replaceState({}, document.title);
+    }
   }, []);
   const fetchStatus = async () => {
     try {
@@ -228,6 +233,7 @@ const validateWorkflow = (value) => {
   return null;
 };
 const SettingsPage = () => {
+  const navigate = reactRouterDom.useNavigate();
   const { get, put, post, del } = admin.useFetchClient();
   const [settings, setSettings] = react.useState({
     githubToken: "",
@@ -288,17 +294,14 @@ const SettingsPage = () => {
         dataToSave.githubToken = settings.githubToken;
       }
       const { data } = await put(`/${index.PLUGIN_ID}/settings`, { data: dataToSave });
-      if (settings.githubToken) {
-        setHasExistingToken(true);
-        setMaskedToken(data.data?.maskedToken);
-      }
-      setSettings((prev) => ({ ...prev, githubToken: "" }));
-      setNotification({ type: "success", message: "Settings saved successfully" });
+      navigate(`/plugins/${index.PLUGIN_ID}`, {
+        state: { notification: { type: "success", message: "Settings saved successfully" } }
+      });
     } catch (error) {
       console.error("Error saving settings:", error);
       setNotification({ type: "danger", message: "Failed to save settings" });
+      setSaving(false);
     }
-    setSaving(false);
   };
   const handleChange = (field) => (e) => {
     const value = e.target.value;

package/dist/_chunks/{App-vakyp6FE.mjs → App-DRqMK_8x.mjs}

@@ -1,21 +1,26 @@
 import { jsxs, jsx } from "react/jsx-runtime";
 import { useFetchClient, Layouts, BackButton, Page } from "@strapi/strapi/admin";
-import { Link, Routes, Route } from "react-router-dom";
+import { useLocation, Link, useNavigate, Routes, Route } from "react-router-dom";
 import { useState, useEffect } from "react";
 import { useIntl } from "react-intl";
 import { Flex, Loader, Button, Box, Alert, Typography, Table, Thead, Tr, Th, Tbody, Td, Field, Grid, IconButton, Dialog } from "@strapi/design-system";
 import { Cog, Rocket, Check, Plus, Pencil, Trash } from "@strapi/icons";
-import { P as PLUGIN_ID } from "./index-CZWWYGR3.mjs";
+import { P as PLUGIN_ID } from "./index-vQ0KWcpU.mjs";
 const getTranslation = (id) => `${PLUGIN_ID}.${id}`;
 const HomePage = () => {
   const { formatMessage } = useIntl();
   const { get, post } = useFetchClient();
+  const location = useLocation();
   const [status, setStatus] = useState(null);
   const [loading, setLoading] = useState(true);
   const [deployingTargetId, setDeployingTargetId] = useState(null);
   const [notification, setNotification] = useState(null);
   useEffect(() => {
     fetchStatus();
+    if (location.state?.notification) {
+      setNotification(location.state.notification);
+      window.history.replaceState({}, document.title);
+    }
   }, []);
   const fetchStatus = async () => {
     try {
@@ -226,6 +231,7 @@ const validateWorkflow = (value) => {
   return null;
 };
 const SettingsPage = () => {
+  const navigate = useNavigate();
   const { get, put, post, del } = useFetchClient();
   const [settings, setSettings] = useState({
     githubToken: "",
@@ -286,17 +292,14 @@ const SettingsPage = () => {
         dataToSave.githubToken = settings.githubToken;
       }
       const { data } = await put(`/${PLUGIN_ID}/settings`, { data: dataToSave });
-      if (settings.githubToken) {
-        setHasExistingToken(true);
-        setMaskedToken(data.data?.maskedToken);
-      }
-      setSettings((prev) => ({ ...prev, githubToken: "" }));
-      setNotification({ type: "success", message: "Settings saved successfully" });
+      navigate(`/plugins/${PLUGIN_ID}`, {
+        state: { notification: { type: "success", message: "Settings saved successfully" } }
+      });
     } catch (error) {
       console.error("Error saving settings:", error);
       setNotification({ type: "danger", message: "Failed to save settings" });
+      setSaving(false);
     }
-    setSaving(false);
   };
   const handleChange = (field) => (e) => {
     const value = e.target.value;

package/dist/_chunks/{index-DGatQB-9.js → index-SuWmJtOE.js}

@@ -37,7 +37,7 @@ const index = {
         defaultMessage: PLUGIN_ID
       },
       Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("./App-CuSCtdH7.js"));
+        const { App } = await Promise.resolve().then(() => require("./App-CCbQMMHR.js"));
         return App;
       }
     });

package/dist/_chunks/{index-CZWWYGR3.mjs → index-vQ0KWcpU.mjs}

@@ -36,7 +36,7 @@ const index = {
         defaultMessage: PLUGIN_ID
       },
       Component: async () => {
-        const { App } = await import("./App-vakyp6FE.mjs");
+        const { App } = await import("./App-DRqMK_8x.mjs");
         return App;
       }
     });

package/dist/admin/index.js

@@ -1,3 +1,3 @@
 "use strict";
-const index = require("../_chunks/index-DGatQB-9.js");
+const index = require("../_chunks/index-SuWmJtOE.js");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-CZWWYGR3.mjs";
+import { i } from "../_chunks/index-vQ0KWcpU.mjs";
 export {
   i as default
 };

package/dist/server/index.js

@@ -268,7 +268,11 @@ const service = ({ strapi }) => ({
   async getSettings() {
     const store = strapi.store({ type: "plugin", name: PLUGIN_ID });
     let dbSettings = await store.get({ key: STORE_KEY });
+    const needsMigration = dbSettings && !Array.isArray(dbSettings.targets) && (dbSettings.workflow || dbSettings.branch);
     dbSettings = this.migrateSettings(dbSettings);
+    if (needsMigration && dbSettings) {
+      await store.set({ key: STORE_KEY, value: dbSettings });
+    }
     if (!dbSettings) {
       return {
         ...DEFAULT_SETTINGS,

package/dist/server/index.mjs

@@ -267,7 +267,11 @@ const service = ({ strapi }) => ({
   async getSettings() {
     const store = strapi.store({ type: "plugin", name: PLUGIN_ID });
     let dbSettings = await store.get({ key: STORE_KEY });
+    const needsMigration = dbSettings && !Array.isArray(dbSettings.targets) && (dbSettings.workflow || dbSettings.branch);
     dbSettings = this.migrateSettings(dbSettings);
+    if (needsMigration && dbSettings) {
+      await store.set({ key: STORE_KEY, value: dbSettings });
+    }
     if (!dbSettings) {
       return {
         ...DEFAULT_SETTINGS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orange-soft/strapi-deployment-trigger",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Strapi v5 plugin to trigger GitHub Actions workflow deployments from the admin panel",
   "license": "MIT",
   "author": "Justin Moh <moh@os.my>",

package/server/src/services/service.js

@@ -65,9 +65,17 @@ const service = ({ strapi }) => ({
     const store = strapi.store({ type: 'plugin', name: PLUGIN_ID });
     let dbSettings = await store.get({ key: STORE_KEY });
 
+    // Check if migration is needed (old format has workflow/branch but no targets array)
+    const needsMigration = dbSettings && !Array.isArray(dbSettings.targets) && (dbSettings.workflow || dbSettings.branch);
+
     // Migrate if needed
     dbSettings = this.migrateSettings(dbSettings);
 
+    // Persist the migration so IDs remain stable
+    if (needsMigration && dbSettings) {
+      await store.set({ key: STORE_KEY, value: dbSettings });
+    }
+
     if (!dbSettings) {
       return {
         ...DEFAULT_SETTINGS,