Skip to content

Commit 1875624

Browse files
LianaHusAniket-Engg
LianaHus
authored and
Aniket-Engg
committed
fixes for sr and matomo update
1 parent 902c999 commit 1875624

File tree

6 files changed

+66
-69
lines changed

6 files changed

+66
-69
lines changed

‎apps/remix-ide/src/app/plugins/script-runner-bridge.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Engine, Plugin } from '@remixproject/engine'
77
import axios from 'axios'
88
import { AppModal } from '@remix-ui/app'
99
import { isArray } from 'lodash'
10-
import { PluginViewWrapper } from '@remix-ui/helper'
1110
import { CustomRemixApi } from '@remix-api'
1211
import { ScriptRunnerUIPlugin } from '../tabs/script-runner-ui'
1312

‎libs/remix-ui/scriptrunner/src/lib/components/config-section.tsx‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ export default function ConfigSection(props: ConfigSectionProps) {
2323
}
2424

2525
const SectionHeader = () => {
26-
2726
return (
28-
<section className="mr-1">
27+
<section className="text-nowrap mr-1">
2928
<div className="custom-control custom-radio">
3029
<input
3130
className="custom-control-input"
@@ -34,13 +33,15 @@ export default function ConfigSection(props: ConfigSectionProps) {
3433
value={props.config.name}
3534
id={props.config.title || props.config.name}
3635
onChange={() => {
37-
props.setActiveKey(props.config.name)
3836
props.loadScriptRunner(props.config)
37+
if (!props.config.errorStatus) {
38+
props.setActiveKey(props.config.name)
39+
}
3940
props._paq.push(['trackEvent', 'scriptRunnerPlugin', 'loadScriptRunnerConfig', props.config.name])
4041
}}
41-
checked={props.activeKey === props.config.name}
42+
checked={(props.activeConfig && props.activeConfig.name === props.config.name)}
4243
/>
43-
<label className="form-check-label custom-control-label" htmlFor={`${props.config.title || props.config.name}`}
44+
<label className="pointer form-check-label custom-control-label" htmlFor={`${props.config.title || props.config.name}`}
4445
data-id={`sr-load-${props.config.name}`}>
4546
<div data-id={`sr-loaded-${props.config.name}`} className="pl-2">{props.config.title || props.config.name}</div>
4647
</label>
@@ -84,50 +85,49 @@ export default function ConfigSection(props: ConfigSectionProps) {
8485
<section className="mb-2">
8586
<section className="d-flex flex-row ">
8687
<SectionHeader />
87-
<div>
88-
{!props.config.isLoading && !props.config.errorStatus && !props.config.error &&
89-
<div onClick={() => props.loadScriptRunner(props.config)} className="pointer px-2 pb-1">
90-
{ props.activeConfig && props.activeConfig.name === props.config.name &&
91-
<div className={`${!isVisible ? 'd-flex flex-row align-items-center justify-content-center pt-1' : 'd-flex flex-row pb-1 align-items-center justify-content-center'}`}>
92-
<FontAwesomeIcon data-id={`sr-loaded-${props.config.name}`} className="text-success ml-3" icon={faCheck}></FontAwesomeIcon>
93-
{isVisible && <span onAnimationEnd={handleAnimationEnd} className="text-success px-3" style={{ animation: 'fadeOut 5s forwards', animationFillMode: 'forwards' }}>Config loaded</span>}
94-
</div>
88+
<label htmlFor={`${props.config.title || props.config.name}`} className="pointer w-100 d-flex flex-row mb-0">
89+
<div>
90+
{!props.config.isLoading && !props.config.errorStatus && !props.config.error &&
91+
<div onClick={() => props.loadScriptRunner(props.config)} className="pointer px-2 pb-1 mb-0 pb-0">
92+
{ props.activeConfig && props.activeConfig.name === props.config.name &&
93+
<div className="d-flex flex-row mt-1">
94+
<FontAwesomeIcon data-id={`sr-loaded-${props.config.name}`} className="text-success ml-3" icon={faCheck}></FontAwesomeIcon>
95+
{isVisible && <span onAnimationEnd={handleAnimationEnd} className="text-success px-3 mb-0 pb-0" style={{ animation: 'fadeOut 5s forwards', animationFillMode: 'forwards' }}>Config loaded</span>}
96+
</div>
97+
}
98+
</div>
9599
}
96100
</div>
97-
}
98-
</div>
99-
{props.config.isLoading && <div className="d-flex flex-row mx-4">
100-
<div className="d-flex flex-row pb-1 align-items-center justify-content-center">
101-
<i className="fas fa-spinner fa-spin"></i><span className='pl-3'>Loading config</span>
102-
</div>
103-
</div>}
104-
<div className="ml-4 d-flex" id="errorSection">
105-
{props.config.errorStatus && props.config.error && <div className="text-danger">
106-
<CustomTooltip tooltipText={props.config.error}>
107-
<FontAwesomeIcon data-id={`sr-error-${props.config.name}`} icon={faTimes}></FontAwesomeIcon>
108-
</CustomTooltip>
109-
110-
</div>}
111-
{!props.config.isLoading && props.config.errorStatus && props.config.error &&
112-
<div
113-
onClick={() => {
114-
props.loadScriptRunner(props.config)
115-
props._paq.push(['trackEvent', 'scriptRunnerPlugin', 'error_reloadScriptRunnerConfig', props.config.name])
116-
}}
117-
className="pointer px-2 text-danger d-flex flex-row"
118-
>
119-
<span className="pr-1 text-danger font-weight-bold">Loading error</span>
120-
<span className="text-danger">We are not able to load your requested configuration for now, please try again later.</span>
101+
{props.config.isLoading && <div className="d-flex flex-row mx-4">
102+
<div className="d-flex flex-row pb-1 align-items-center justify-content-center">
103+
<i className="fas fa-spinner fa-spin"></i><span className='pl-3'>Loading config</span>
121104
</div>
122-
}
123-
</div>
105+
</div>}
106+
<div className="ml-4 d-flex" id="errorSection">
107+
{!props.config.isLoading && props.config.errorStatus && props.config.error &&
108+
<div
109+
onClick={() => {
110+
props.loadScriptRunner(props.config)
111+
props._paq.push(['trackEvent', 'scriptRunnerPlugin', 'error_reloadScriptRunnerConfig', props.config.name])
112+
}}
113+
className="pointer text-danger d-flex flex-row"
114+
>
115+
<CustomTooltip tooltipText={props.config.error}>
116+
<FontAwesomeIcon className="mt-1 pr-4" data-id={`sr-error-${props.config.name}`} icon={faTimes}></FontAwesomeIcon>
117+
</CustomTooltip>
118+
<span className="pr-2 mt-1 text-nowrap text-danger font-weight-bold">Loading error.</span>
119+
<span className="text-danger mt-1 ">We are not able to load your requested configuration for now, please try again later.</span>
120+
</div>
121+
}
122+
</div>
123+
</label>
124124
</section>
125125

126126
<section className="d-flex flex-column w-100">
127127
<div className="mt-2 mb-4 bg-dark p-3 ">
128128
<p className="text-dark text-monospace">{props.config.description}</p>
129129
<p className="text-dark">Dependencies</p>
130-
<ul className="list-unstyled ">
130+
<ul className="list-unstyled m-0">
131131
<Dependencies />
132132
</ul>
133133
</div>

‎libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import React, { useEffect, useState } from "react";
2-
import { Accordion, Button } from "react-bootstrap";
32
import { customScriptRunnerConfig, ProjectConfiguration } from "../types";
4-
import { faCaretDown, faCaretRight, faCheck, faExclamationCircle, faRedoAlt, faToggleOn } from "@fortawesome/free-solid-svg-icons";
5-
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
63
import { CustomScriptRunner } from "./custom-script-runner";
7-
import { CustomTooltip } from "@remix-ui/helper";
84
import ConfigSection from "./components/config-section";
95
const _paq = (window._paq = window._paq || []) // eslint-disable-line
106

@@ -24,13 +20,13 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => {
2420
const [activeKey, setActiveKey] = useState('default');
2521

2622
useEffect(() => {
27-
if (activeConfig) {
23+
if (activeConfig && !activeConfig.errorStatus) {
2824
setActiveKey(activeConfig.name)
2925
}
3026
},[activeConfig])
3127

3228
if (!configurations) {
33-
return <div>Loading...</div>;
29+
return <div>Loading...</div>
3430
}
3531

3632
return (
@@ -59,7 +55,8 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => {
5955
saveCustomConfig={props.saveCustomConfig}
6056
openCustomConfig={props.openCustomConfig}
6157
publishedConfigurations={configurations.filter((config) => config.publish)}
62-
/>}
58+
/>
59+
}
6360
</div>
6461
)
6562
}

‎libs/remix-ui/scriptrunner/src/types/index.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
import { defaultConfig } from "@web3modal/ethers5/react";
22

33
export interface Dependency {
4-
version: string;
5-
name: string;
6-
alias?: string;
7-
import?: boolean;
8-
require: boolean;
9-
windowImport?: boolean;
4+
version: string
5+
name: string
6+
alias?: string
7+
import?: boolean
8+
require: boolean
9+
windowImport?: boolean
1010
}
1111

1212
export interface Replacements {
13-
[key: string]: string;
13+
[key: string]: string
1414
}
1515

1616
export interface ProjectConfiguration {
17-
name: string;
18-
publish: boolean;
19-
description: string;
20-
dependencies: Dependency[];
21-
replacements: Replacements;
22-
title: string;
23-
errorStatus: boolean;
24-
error: string;
25-
isLoading: boolean;
17+
name: string
18+
publish: boolean
19+
description: string
20+
dependencies: Dependency[]
21+
replacements: Replacements
22+
title: string
23+
errorStatus: boolean
24+
error: string
25+
isLoading: boolean
2626
}
2727

2828
export interface customScriptRunnerConfig {
29-
baseConfiguration: string;
30-
dependencies: Dependency[];
29+
baseConfiguration: string
30+
dependencies: Dependency[]
3131
}
3232

3333
export interface ScriptRunnerConfig {

‎libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
193193
optimize: optimize,
194194
runs: runs,
195195
evmVersion: evmVersion !== null && evmVersion !== 'null' && evmVersion !== undefined && evmVersion !== 'undefined' ? evmVersion : 'default',
196-
language: language !== null ? language : 'Solidity'
196+
language: language !== null ? language : 'Solidity',
197+
matomoAutocompileOnce: true
197198
}
198199
})
199200
}
@@ -205,7 +206,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
205206

206207
setDisableCompileButton(isDisabled)
207208
setState((prevState) => {
208-
return { ...prevState, compiledFileName }
209+
return { ...prevState, matomoAutocompileOnce: true, compiledFileName }
209210
})
210211
}, [compiledFileName])
211212

‎libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const TabsUI = (props: TabsUIProps) => {
125125
data-id={index === currentIndexRef.current ? 'tab-active' : ''}
126126
data-path={tab.name}
127127
>
128-
{tab.icon ? <img className="my-1 mr-1 iconImage" style={{ filter: invert }} src={tab.icon} /> : <i className={classNameImg}></i>}
128+
{tab.icon ? <img className="my-1 mr-1 iconImage" src={tab.icon} /> : <i className={classNameImg}></i>}
129129
<span className={`title-tabs ${getFileDecorationClasses(tab)}`}>{tab.title}</span>
130130
{getFileDecorationIcons(tab)}
131131
<span

0 commit comments

Comments
 (0)