avada-components-seoon 1.0.5 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":"AAGA,OAAO,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":"AAGA,OAAO,cAAc,CAAC;AAYtB,OAAO,EAKL,uBAAuB,EAExB,MAAM,SAAS,CAAC;AAGjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,eAAO,MAAM,cAAc,EAAE,uBA0L5B,CAAC;AACF,eAAe,cAAc,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { AppProvider, Button, LegacyCard, Text, Thumbnail } from '@shopify/polaris';
|
|
3
|
-
import { useEffect, useState
|
|
3
|
+
import { useEffect, useState } from 'react';
|
|
4
4
|
import './index.scss';
|
|
5
5
|
import { listCrossApps } from '../../config/constants';
|
|
6
6
|
import { getAppIdByOrigin, getCheckInstalledProxyUrl, getProxyAccessToken, } from '../../helpers/getProxyEndPoint';
|
|
7
|
+
import useFetchApi from '../../hooks/api/useFetchApi';
|
|
7
8
|
import { XIcon } from '@shopify/polaris-icons';
|
|
8
9
|
import { APP_IDS, } from './types';
|
|
9
10
|
import { isEmpty } from '../../helpers/isEmpty';
|
|
@@ -56,9 +57,6 @@ export const CrossAppBanner = ({ shopDomain, clickInstallCallback, appIds = ['av
|
|
|
56
57
|
plaza: false,
|
|
57
58
|
});
|
|
58
59
|
const [foundNonInstalledApp, setFoundNonInstalledApp] = useState(false);
|
|
59
|
-
const [loading, setLoading] = useState(false);
|
|
60
|
-
const [data, setData] = useState(null);
|
|
61
|
-
const [error, setError] = useState(null);
|
|
62
60
|
const getCurrentPagePath = () => {
|
|
63
61
|
const url = window.location.href;
|
|
64
62
|
const pathMatch = url.match(/https?:\/\/[^/]+(\/[^?]+)/);
|
|
@@ -91,76 +89,39 @@ export const CrossAppBanner = ({ shopDomain, clickInstallCallback, appIds = ['av
|
|
|
91
89
|
// Get current app to check based on priority
|
|
92
90
|
const currentAppId = appIds[currentPriorityIndex];
|
|
93
91
|
const shouldCheckCurrentApp = currentAppId && !foundNonInstalledApp;
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
: false;
|
|
92
|
+
// Only check installation for current priority app
|
|
93
|
+
const { fetchApi, data, loading } = useFetchApi({
|
|
94
|
+
url: getCheckInstalledProxyUrl(currentAppId),
|
|
95
|
+
headers: {
|
|
96
|
+
'X-SEO-Access-Token': getProxyAccessToken(currentAppId),
|
|
97
|
+
'X-SEO-Shop-Domain': shopDomain,
|
|
98
|
+
},
|
|
99
|
+
initLoad: false,
|
|
100
|
+
initLoading: false,
|
|
101
|
+
keepPreviousData: false,
|
|
102
|
+
onSuccess: data => {
|
|
103
|
+
return {
|
|
104
|
+
...data,
|
|
105
|
+
appId: currentAppId,
|
|
106
|
+
};
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
// Effect to check app installation
|
|
113
110
|
useEffect(() => {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
if (
|
|
117
|
-
|
|
118
|
-
setError(null);
|
|
119
|
-
try {
|
|
120
|
-
const result = await fetchAppInstallationStatus(currentAppId);
|
|
121
|
-
if (!ignore)
|
|
122
|
-
setData(result);
|
|
123
|
-
}
|
|
124
|
-
catch (err) {
|
|
125
|
-
if (!ignore)
|
|
126
|
-
setError(err);
|
|
127
|
-
}
|
|
128
|
-
finally {
|
|
129
|
-
if (!ignore)
|
|
130
|
-
setLoading(false);
|
|
131
|
-
}
|
|
111
|
+
if (shouldCheckCurrentApp) {
|
|
112
|
+
const isDismissed = localStorage.getItem(getStorageKey(currentAppId)) === 'true';
|
|
113
|
+
if (!isDismissed) {
|
|
114
|
+
fetchApi();
|
|
132
115
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
return () => {
|
|
136
|
-
ignore = true;
|
|
137
|
-
};
|
|
138
|
-
}, [
|
|
139
|
-
currentAppId,
|
|
140
|
-
shouldCheckCurrentApp,
|
|
141
|
-
foundNonInstalledApp,
|
|
142
|
-
isCurrentAppDismissed,
|
|
143
|
-
fetchAppInstallationStatus,
|
|
144
|
-
]);
|
|
145
|
-
useEffect(() => {
|
|
146
|
-
if (shouldCheckCurrentApp && !foundNonInstalledApp && isCurrentAppDismissed) {
|
|
147
|
-
if (currentPriorityIndex < appIds.length - 1) {
|
|
116
|
+
else {
|
|
117
|
+
// If app is dismissed, move to next app
|
|
148
118
|
setCurrentPriorityIndex(prev => prev + 1);
|
|
149
119
|
}
|
|
150
120
|
}
|
|
151
|
-
}, [
|
|
152
|
-
shouldCheckCurrentApp,
|
|
153
|
-
foundNonInstalledApp,
|
|
154
|
-
isCurrentAppDismissed,
|
|
155
|
-
currentPriorityIndex,
|
|
156
|
-
appIds.length,
|
|
157
|
-
]);
|
|
121
|
+
}, [currentAppId, shouldCheckCurrentApp]);
|
|
158
122
|
// Effect to handle installation check result
|
|
159
123
|
useEffect(() => {
|
|
160
|
-
if (!isEmpty(data) &&
|
|
161
|
-
data.appId === currentAppId &&
|
|
162
|
-
shouldCheckCurrentApp &&
|
|
163
|
-
!foundNonInstalledApp) {
|
|
124
|
+
if (!isEmpty(data) && data.appId === currentAppId && shouldCheckCurrentApp) {
|
|
164
125
|
const newInstalledApps = { ...installedApps };
|
|
165
126
|
const isInstalled = currentAppId === 'avada-seo-suite' || currentAppId === 'seoon-blog'
|
|
166
127
|
? data.userType === 'user'
|
|
@@ -168,15 +129,13 @@ export const CrossAppBanner = ({ shopDomain, clickInstallCallback, appIds = ['av
|
|
|
168
129
|
newInstalledApps[APP_IDS[currentAppId]] = isInstalled;
|
|
169
130
|
setInstalledApps(newInstalledApps);
|
|
170
131
|
if (isInstalled) {
|
|
171
|
-
|
|
172
|
-
setCurrentPriorityIndex(prev => prev + 1);
|
|
173
|
-
}
|
|
132
|
+
setCurrentPriorityIndex(prev => prev + 1);
|
|
174
133
|
}
|
|
175
134
|
else {
|
|
176
135
|
setFoundNonInstalledApp(true);
|
|
177
136
|
}
|
|
178
137
|
}
|
|
179
|
-
}, [data]);
|
|
138
|
+
}, [data, currentAppId, shouldCheckCurrentApp]);
|
|
180
139
|
const handleDismiss = (appId) => {
|
|
181
140
|
localStorage.setItem(getStorageKey(appId), 'true');
|
|
182
141
|
setIsBannerDismissed(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":"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"}
|