From e2495dddccbc372eb8e22f6df0a12c8d768e654c Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Fri, 30 Jun 2023 19:04:49 -0700
Subject: [PATCH] feat(window.ipfs): remove code for blocked config.get
window.ipfs is no longer available, so we no longer need this code
see https://github.com/ipfs/ipfs-companion/pull/777
---
public/locales/ar/settings.json | 1 -
public/locales/cs/settings.json | 1 -
public/locales/da/settings.json | 1 -
public/locales/de/settings.json | 1 -
public/locales/en/settings.json | 1 -
public/locales/es/settings.json | 1 -
public/locales/fr/settings.json | 1 -
public/locales/id/settings.json | 1 -
public/locales/it/settings.json | 1 -
public/locales/ja-JP/settings.json | 1 -
public/locales/nl/settings.json | 1 -
public/locales/no/settings.json | 1 -
public/locales/pl/settings.json | 1 -
public/locales/pt/settings.json | 1 -
public/locales/ru/settings.json | 1 -
public/locales/tr/settings.json | 1 -
public/locales/zh-CN/settings.json | 1 -
public/locales/zh-TW/settings.json | 1 -
src/bundles/config.js | 7 -------
src/settings/SettingsPage.js | 17 ++++-------------
20 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/public/locales/ar/settings.json b/public/locales/ar/settings.json
index 3c9842653..9c05dc37a 100644
--- a/public/locales/ar/settings.json
+++ b/public/locales/ar/settings.json
@@ -80,7 +80,6 @@
"false": "إيقاف"
},
"fetchingSettings": "جارٍ جلب الإعدادات ...",
- "configApiNotAvailable": "API تكوين IPFS غير متوفر. الرجاء تعطيل ملحق الويب \"IPFS Companion\" وإعادة المحاولة.",
"ipfsDaemonOffline": "البرنامج الخفي لـ IPFS غير متصل. يرجى تشغيله وإعادة المحاولة.",
"settingsUnavailable": "الإعدادات غير متاحة. يرجى التحقق من تشغيل البرنامج الخفي الخاص بـ IPFS.",
"settingsHaveChanged": "تم تغيير الإعدادات ؛ يرجى النقر فوق <1> إعادة تعيين لتحديث محتويات المحرر.",
diff --git a/public/locales/cs/settings.json b/public/locales/cs/settings.json
index 4add2e316..ef07ca390 100644
--- a/public/locales/cs/settings.json
+++ b/public/locales/cs/settings.json
@@ -80,7 +80,6 @@
"false": "Vypnout"
},
"fetchingSettings": "Získávání nastavení...",
- "configApiNotAvailable": "IPFS API nastavení není dostupný. Prosím vypněte rozšíření \"IFPS Companion\" a zkuste to znovu.",
"ipfsDaemonOffline": "Démon IPFS je offline. Zapněte jej a zkuste to znovu.",
"settingsUnavailable": "Nastavení není dostupný. Prosím zkontrolujte zdali běží IPFS služba.",
"settingsHaveChanged": "Nastavení se změnilo; kliknutím na <1>Obnovit aktualizujte obsah editoru.",
diff --git a/public/locales/da/settings.json b/public/locales/da/settings.json
index 4085a1c67..144fdc64f 100644
--- a/public/locales/da/settings.json
+++ b/public/locales/da/settings.json
@@ -15,7 +15,6 @@
"close": "Luk"
},
"fetchingSettings": "Henter indstillinger...",
- "configApiNotAvailable": "API'et til konfiguration af IPFS er utilgængelig. Venligst, fjern \"IPFS Kompagnon\" web-udvidelsen og prøv igen.",
"ipfsDaemonOffline": "IPFS baggrunds-processen er offline. Forsøg at starte den og prøv igen.",
"settingsUnavailable": "Indstillinger er ikke tilgængelige. Venligst, tjek at IPFS baggrunds-processen kører.",
"settingsHaveChanged": "Indstillingerne er opdateret, venligst klik på <1>Nulstil for at opdatere editorens indhold.",
diff --git a/public/locales/de/settings.json b/public/locales/de/settings.json
index edac52e38..bb5609a81 100644
--- a/public/locales/de/settings.json
+++ b/public/locales/de/settings.json
@@ -80,7 +80,6 @@
"false": "Aus"
},
"fetchingSettings": "Einstellungen werden geladen...",
- "configApiNotAvailable": "Die API zur IPFS-Konfigurations ist nicht verfügbar. Bitte deaktiviere die Browser-Erweiterung \"IPFS Companion\" und versuche es erneut.",
"ipfsDaemonOffline": "Der IPFS Daemon ist offline. Bitte starten Sie ihn und versuchen es erneut.",
"settingsUnavailable": "Einstellungen nicht verfügbar. Bitte überprüfe, ob Dein IPFS-Daemon läuft.",
"settingsHaveChanged": "Die Einstellungen haben sich geändert. Bitte klicke auf <1>Zurücksetzen, um den Inhalt des Editors zu aktualisieren.",
diff --git a/public/locales/en/settings.json b/public/locales/en/settings.json
index 41f1245e9..b879cb417 100644
--- a/public/locales/en/settings.json
+++ b/public/locales/en/settings.json
@@ -80,7 +80,6 @@
"false": "Off"
},
"fetchingSettings": "Fetching settings...",
- "configApiNotAvailable": "The IPFS config API is not available. Please disable the \"IPFS Companion\" Web Extension and try again.",
"ipfsDaemonOffline": "The IPFS daemon is offline. Please turn it on and try again.",
"settingsUnavailable": "Settings not available. Please check your IPFS daemon is running.",
"settingsHaveChanged": "The settings have changed; please click <1>Reset to update the editor contents.",
diff --git a/public/locales/es/settings.json b/public/locales/es/settings.json
index fd2112370..03bcd99b3 100644
--- a/public/locales/es/settings.json
+++ b/public/locales/es/settings.json
@@ -13,7 +13,6 @@
"apiDescription": "<0>If your node is configured with a <1>custom API address, including a port other than the default 5001, enter it here.",
"cliDescription": "<0>Enable this option to display a \"view code\" <1> icon next to common IPFS commands. Clicking it opens a modal with that command's CLI code, so you can paste it into the IPFS command-line interface in your terminal.",
"fetchingSettings": "Recuperando ajustes...",
- "configApiNotAvailable": "La API de configuración de IPFS no está disponible. Desactive la Extensión Web \"IPFS Companion\" e inténtelo de nuevo.",
"ipfsDaemonOffline": "El demonio IPFS está fuera de línea. Enciéndalo e intente nuevamente.",
"settingsUnavailable": "Configuración no disponible. Por favor, compruebe que su servicio IPFS se está ejecutando.",
"settingsHaveChanged": "La configuración ha cambiado; haga clic en <1>Restablecer para actualizar el contenido del editor. ",
diff --git a/public/locales/fr/settings.json b/public/locales/fr/settings.json
index cbc405b39..84a3ff4bf 100644
--- a/public/locales/fr/settings.json
+++ b/public/locales/fr/settings.json
@@ -80,7 +80,6 @@
"false": "Éteint"
},
"fetchingSettings": "Récupération des paramètres...",
- "configApiNotAvailable": "L'API de configuration IPFS n'est pas disponible. Merci de désactiver l'extension IPFS Companion et de réessayer.",
"ipfsDaemonOffline": "Le daemon IPFS est hors-ligne. Merci de le relancer.",
"settingsUnavailable": "Paramètres non disponibles. Merci de vérifier que votre daemon IPFS est en cours d'exécution.",
"settingsHaveChanged": "Les paramètres ont changé. Cliquez sur <1>Réinitialiser pour mettre à jour l'éditeur de contenu.",
diff --git a/public/locales/id/settings.json b/public/locales/id/settings.json
index 0843dfaf3..63e771d79 100644
--- a/public/locales/id/settings.json
+++ b/public/locales/id/settings.json
@@ -80,7 +80,6 @@
"false": "Mati"
},
"fetchingSettings": "Mengambil setelan...",
- "configApiNotAvailable": "API konfigurasi IPFS tidak tersedia. Harap nonaktifkan Ekstensi Web \"Sahabat IPFS\" dan coba lagi.",
"ipfsDaemonOffline": "Daemon IPFS sedang offline. Harap aktifkan dan coba lagi.",
"settingsUnavailable": "Pengaturan tidak tersedia. Silakan periksa daemon IPFS Anda sedang berjalan.",
"settingsHaveChanged": "Pengaturan telah berubah; silakan klik <1>Reset untuk memperbarui konten editor.",
diff --git a/public/locales/it/settings.json b/public/locales/it/settings.json
index 00d5b39c8..e022a6945 100644
--- a/public/locales/it/settings.json
+++ b/public/locales/it/settings.json
@@ -80,7 +80,6 @@
"false": "Off"
},
"fetchingSettings": "Recupero delle impostazioni...",
- "configApiNotAvailable": "L'IPFS config API non è disponibile. Per favore, disabilita l'estensione web \"IPFS Companion\" e riprova.",
"ipfsDaemonOffline": "Il demone IPFS è offline. Per favore, avvialo e riprova.",
"settingsUnavailable": "Impostazioni non disponibili. Per favore, controlla che il tuo demone IPFS sia attivo.",
"settingsHaveChanged": "Le impostazioni sono cambiate; per favore, clicca <1>Ripristina per aggiornare il contenuto dell'editor.",
diff --git a/public/locales/ja-JP/settings.json b/public/locales/ja-JP/settings.json
index 303a1d2f4..1fbf838ce 100644
--- a/public/locales/ja-JP/settings.json
+++ b/public/locales/ja-JP/settings.json
@@ -80,7 +80,6 @@
"false": "オフ"
},
"fetchingSettings": "設定を読み込んでいます…",
- "configApiNotAvailable": "IPFS設定APIが利用できません。拡張機能「IPFS Companion」を無効にして再度接続を試してください。",
"ipfsDaemonOffline": "IPFSデーモンが起動していないようです。デーモンを起動して再度接続を試してください。",
"settingsUnavailable": "設定を読み込めません。IPFSデーモンが起動していることを確認してください。",
"settingsHaveChanged": "設定が変更されました。<1>リセットをクリックして編集しているファイルを再読み込みしてください。",
diff --git a/public/locales/nl/settings.json b/public/locales/nl/settings.json
index 3946a42db..41216c1f7 100644
--- a/public/locales/nl/settings.json
+++ b/public/locales/nl/settings.json
@@ -14,7 +14,6 @@
"close": "Sluiten"
},
"fetchingSettings": "Bezig met ophalen van instellingen....",
- "configApiNotAvailable": "De IPFS configuratie API is niet beschikbaar. Schakel de \"IPFS Compantion\" extensie uit en probeer opnieuw.",
"settingsUnavailable": "Instellingen niet beschikbaar. Check of de IPFS daemon draait.",
"settingsHaveChanged": "De instellingen zijn gewijzigd, klik <1>reset om de inhoud te verversen",
"errorOccured": "Er is een fout opgereden tijdens het opslaan van de wijzigingen",
diff --git a/public/locales/no/settings.json b/public/locales/no/settings.json
index d5a0fc603..2ca00bb9f 100644
--- a/public/locales/no/settings.json
+++ b/public/locales/no/settings.json
@@ -15,7 +15,6 @@
"close": "Lukk"
},
"fetchingSettings": "Henter innstillinger...",
- "configApiNotAvailable": "IPFS sitt konfigurasjons API er ikke tilgjengelig. Vennligst deaktiver \"IPFS Companion\" Web extension, og prøv på nytt.",
"ipfsDaemonOffline": "IPFS-daemon er offline. Vennligst skru den på og prøv på nytt.",
"settingsUnavailable": "Innstillinger ikke tilgjengelig. Vennligst sjekk at din IPFS daemon kjører.",
"settingsHaveChanged": "Innstillingene er endret, vennligst klikk <1>Tilbakestill for å oppdatere editor innholdet",
diff --git a/public/locales/pl/settings.json b/public/locales/pl/settings.json
index 4dd3f280d..2833bcd2a 100644
--- a/public/locales/pl/settings.json
+++ b/public/locales/pl/settings.json
@@ -80,7 +80,6 @@
"false": "Wyłączone"
},
"fetchingSettings": "Pobieranie ustawień... \n",
- "configApiNotAvailable": "API konfiguracji IPFS nie jest dostępne. Proszę wyłączyć rozszerzenie \"IPFS Companion\" i spróbować ponownie.",
"ipfsDaemonOffline": "Demon IPFS jest w trybie offline. Proszę włączyć go i spróbować ponownie. ",
"settingsUnavailable": "Ustawienia nie są dostępne. Proszę sprawdzić, czy demon IPFS jest uruchomiony.",
"settingsHaveChanged": "Ustawienia uległy zmianie; proszę kliknąć <1>Resetuj t aby zaktualizować zawartość edytora.",
diff --git a/public/locales/pt/settings.json b/public/locales/pt/settings.json
index 7b08c2ad5..d4bc4fbbd 100644
--- a/public/locales/pt/settings.json
+++ b/public/locales/pt/settings.json
@@ -15,7 +15,6 @@
"close": "Fechar"
},
"fetchingSettings": "A obter as configurações...",
- "configApiNotAvailable": "A API de configuração do IPFS não está disponível. Por favor desative a extensão \"IPFS Companion\" e tente novamente.",
"ipfsDaemonOffline": "O nó IPFS está offline. Por favor ative-o e tente novamente,",
"settingsUnavailable": "As configurações não estão disponíveis. Confira, por favor, se o seu nó IPFS está em execução.",
"settingsHaveChanged": "As configurações foram alteradas, por favor clique em <1>Começar de novo para atualizar os conteúdos do editor.",
diff --git a/public/locales/ru/settings.json b/public/locales/ru/settings.json
index 5126508b1..3d0431662 100644
--- a/public/locales/ru/settings.json
+++ b/public/locales/ru/settings.json
@@ -80,7 +80,6 @@
"false": "Выкл"
},
"fetchingSettings": "Получение настроек...",
- "configApiNotAvailable": "API настройки IPFS недоступно. Пожалуйста, отключите веб-расширение \"IPFS-компаньон\" и попробуйте снова.",
"ipfsDaemonOffline": "Служба IPFS отключена. Пожалуйста, включите ее и попробуйте снова.",
"settingsUnavailable": "Настройки недоступны. Убедитесь, что у вас запущена IPFS - служба.",
"settingsHaveChanged": "Настройки были изменены; пожалуйста, нажмите <1>Сброс, чтобы обновить измененный контент.",
diff --git a/public/locales/tr/settings.json b/public/locales/tr/settings.json
index fda68143e..de90f8536 100644
--- a/public/locales/tr/settings.json
+++ b/public/locales/tr/settings.json
@@ -80,7 +80,6 @@
"false": "Kapalı"
},
"fetchingSettings": "Ayarlar getiriliyor ...",
- "configApiNotAvailable": "IPFS yapılandırma UPA'sı mevcut değildir. Lütfen \"IPFS Companion\" Web Uzantısını devre dışı bırakın ve tekrar deneyin.",
"ipfsDaemonOffline": "IPFS arka plan programı çevrimdışı. Lütfen açın ve tekrar deneyin.",
"settingsUnavailable": "Ayarlar mevcut değil. Lütfen IPFS daemonunuzun çalışıp çalışmadığını kontrol edin.",
"settingsHaveChanged": "Ayarlar değişti; editör içeriğini güncellemek için lütfen <1>Sıfırla'yı tıklayın.",
diff --git a/public/locales/zh-CN/settings.json b/public/locales/zh-CN/settings.json
index 0aa7d9e53..f609b582d 100644
--- a/public/locales/zh-CN/settings.json
+++ b/public/locales/zh-CN/settings.json
@@ -80,7 +80,6 @@
"false": "关"
},
"fetchingSettings": "拉取配置中 ...",
- "configApiNotAvailable": "IPFS 配置 API 不可用。请禁用 \"IPFS 伴侣\" 浏览器插件并重试。",
"ipfsDaemonOffline": "IPFS 守护进程处于离线状态，请使其在线并重试。",
"settingsUnavailable": "配置不可用，请检查你的 IPFS 守护进程是否还在运行。",
"settingsHaveChanged": "配置已经改变，请单击 <1>重置 按钮刷新编辑器中的内容。",
diff --git a/public/locales/zh-TW/settings.json b/public/locales/zh-TW/settings.json
index 055708373..c5896b8e4 100644
--- a/public/locales/zh-TW/settings.json
+++ b/public/locales/zh-TW/settings.json
@@ -80,7 +80,6 @@
"false": "關閉"
},
"fetchingSettings": "正在擷取設定...",
- "configApiNotAvailable": "IPFS 設定 API 無法使用。請停用「IPFS 小幫手」網頁擴充功能並再試一次。",
"ipfsDaemonOffline": "IPFS Daemon 已離線。請開啟並再試一次。",
"settingsUnavailable": "設定無法使用。請檢查你的 IPFS Daemon 是否正在執行。",
"settingsHaveChanged": "設定已經變更，請按<1>重設 更新編輯器內容。",
diff --git a/src/bundles/config.js b/src/bundles/config.js
index 16274940c..ce40cff20 100644
--- a/src/bundles/config.js
+++ b/src/bundles/config.js
@@ -76,13 +76,6 @@ bundle.selectBootstrapPeers = createSelector(
(config) => config && config.Bootstrap
)
-// TODO: this is a work-around for IPFS companion blocking the config API
-// see: https://github.com/ipfs-shipyard/ipfs-companion/issues/454
-bundle.selectIsConfigBlocked = createSelector(
- 'selectConfigRaw',
- ({ errorType }) => errorType === 'Access to config.get API is globally blocked for window.ipfs'
-)
-
// Fetch the config if we don't have it or it's more than `staleAfter` ms old
bundle.reactConfigFetch = createSelector(
'selectConfigShouldUpdate',
diff --git a/src/settings/SettingsPage.js b/src/settings/SettingsPage.js
index 1d13c6a32..b1ccab602 100644
--- a/src/settings/SettingsPage.js
+++ b/src/settings/SettingsPage.js
@@ -30,7 +30,7 @@ const PAUSE_AFTER_SAVE_MS = 3000
export const SettingsPage = ({
t, tReady, isIpfsConnected, ipfsPendingFirstConnection, isIpfsDesktop,
- isConfigBlocked, isLoading, isSaving, arePinningServicesSupported,
+ isLoading, isSaving, arePinningServicesSupported,
hasSaveFailed, hasSaveSucceded, hasErrors, hasLocalChanges, hasExternalChanges,
config, onChange, onReset, onSave, editorKey, analyticsEnabled, doToggleAnalytics,
toursEnabled, handleJoyrideCallback, isCliTutorModeEnabled, doToggleCliTutorMode, command
@@ -128,7 +128,6 @@ export const SettingsPage = ({
tReady={tReady}
config={config}
isIpfsConnected={isIpfsConnected}
- isConfigBlocked={isConfigBlocked}
isLoading={isLoading}
hasExternalChanges={hasExternalChanges}
hasSaveFailed={hasSaveFailed}
@@ -209,14 +208,8 @@ const SaveButton = ({ t, hasErrors, hasSaveFailed, hasSaveSucceded, isSaving, ha
)
}
-const SettingsInfo = ({ t, isIpfsConnected, isConfigBlocked, hasExternalChanges, hasSaveFailed, hasSaveSucceded, isLoading, config }) => {
- if (isConfigBlocked) {
- return (
-
- {t('configApiNotAvailable')}
-
- )
- } else if (!isIpfsConnected) {
+const SettingsInfo = ({ t, isIpfsConnected, hasExternalChanges, hasSaveFailed, hasSaveSucceded, isLoading, config }) => {
+ if (!isIpfsConnected) {
return (
{t('ipfsDaemonOffline')}
@@ -329,7 +322,7 @@ export class SettingsPageContainer extends React.Component {
render () {
const {
- t, tReady, isConfigBlocked, ipfsConnected, configIsLoading, configLastError, configIsSaving, arePinningServicesSupported,
+ t, tReady, ipfsConnected, configIsLoading, configLastError, configIsSaving, arePinningServicesSupported,
configSaveLastSuccess, configSaveLastError, isIpfsDesktop, analyticsEnabled, doToggleAnalytics, toursEnabled,
handleJoyrideCallback, isCliTutorModeEnabled, doToggleCliTutorMode, ipfsPendingFirstConnection
} = this.props
@@ -344,7 +337,6 @@ export class SettingsPageContainer extends React.Component {
tReady={tReady}
isIpfsConnected={ipfsConnected}
ipfsPendingFirstConnection={ipfsPendingFirstConnection}
- isConfigBlocked={isConfigBlocked}
isLoading={isLoading}
isSaving={configIsSaving}
arePinningServicesSupported={arePinningServicesSupported}
@@ -377,7 +369,6 @@ export default connect(
'selectConfig',
'selectIpfsConnected',
'selectIpfsPendingFirstConnection',
- 'selectIsConfigBlocked',
'selectConfigLastError',
'selectConfigIsLoading',
'selectConfigIsSaving',