Skip to content

Commit

Permalink
Merge pull request #1673 from Vizzuality/develop
Browse files Browse the repository at this point in the history
production deployment
  • Loading branch information
andresgnlez authored Apr 4, 2024
2 parents d111979 + ffd639d commit 836bc57
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 27 deletions.
2 changes: 1 addition & 1 deletion app/components/features/raw-item/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const Item: React.FC<ItemProps> = ({
size="xs"
onClick={onToggleSelected}
>
{selected ? 'Remove' : 'Add'}
{selected ? 'Remove' : 'Add to scenario'}
</Button>
</div>
</header>
Expand Down
36 changes: 22 additions & 14 deletions app/layout/project/sidebar/project/scenarios-list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { useToasts } from 'hooks/toast';
import Button from 'components/button';
import ConfirmationPrompt from 'components/confirmation-prompt';
import Icon from 'components/icon';
import InfoButton from 'components/info-button';
import Loading from 'components/loading';
import Modal from 'components/modal';
import { ScrollArea } from 'components/scroll-area';
Expand Down Expand Up @@ -367,20 +368,27 @@ export const ScenariosList: React.FC = () => {
{(hasScenarios || search || hasFilters) && (
<Section className="flex w-full flex-col items-center justify-center space-y-5">
{hasScenarios && (
<Button
theme="primary-alt"
size="base"
className="flex w-full overflow-hidden uppercase"
disabled={solutionsReportLoader || !atLeastOneScenarioIsRun}
onClick={onDownloadSolutionsSummary}
>
<Loading
visible={solutionsReportLoader}
className="absolute bottom-0 left-0 right-0 top-0 z-40 flex h-full w-full items-center justify-center bg-gray-900 bg-opacity-90"
iconClassName="w-10 h-10 text-primary-500"
/>
{`Export scenario${scenariosData.length > 1 ? 's' : ''} data`}
</Button>
<div className="flex w-full items-center space-x-5">
<Button
theme="primary-alt"
size="base"
className="flex w-full flex-1 overflow-hidden uppercase"
disabled={solutionsReportLoader || !atLeastOneScenarioIsRun}
onClick={onDownloadSolutionsSummary}
>
<Loading
visible={solutionsReportLoader}
className="absolute bottom-0 left-0 right-0 top-0 z-40 flex h-full w-full items-center justify-center bg-gray-900 bg-opacity-90"
iconClassName="w-10 h-10 text-primary-500"
/>
{`Export scenario${scenariosData.length > 1 ? 's' : ''} results`}
</Button>
<InfoButton>
<span>
Export Mapp Scenario codes, best solutions and selection frequency results.
</span>
</InfoButton>
</div>
)}
<Button
theme="primary"
Expand Down
24 changes: 12 additions & 12 deletions app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4604,9 +4604,9 @@ __metadata:
linkType: hard

"caniuse-lite@npm:^1.0.30001157, caniuse-lite@npm:^1.0.30001406":
version: 1.0.30001546
resolution: "caniuse-lite@npm:1.0.30001546"
checksum: d3ef82f5ee94743002c5b2dd61c84342debcc94b2d5907b64ade3514ecfc4f20bbe86a6bc453fd6436d5fbcf6582e07405d7c2077565675a71c83adc238a11fa
version: 1.0.30001605
resolution: "caniuse-lite@npm:1.0.30001605"
checksum: 8af1ae364c4f4c0796e7fd1aa195dfae2d9c3011c61f0907030201e4fc31a12e81407a13cca621a3b7f6a1eb0217ee9c681fb15670074c204a54edfab798d5c9
languageName: node
linkType: hard

Expand Down Expand Up @@ -6604,12 +6604,12 @@ __metadata:
linkType: hard

"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.0":
version: 1.15.4
resolution: "follow-redirects@npm:1.15.4"
version: 1.15.6
resolution: "follow-redirects@npm:1.15.6"
peerDependenciesMeta:
debug:
optional: true
checksum: e178d1deff8b23d5d24ec3f7a94cde6e47d74d0dc649c35fc9857041267c12ec5d44650a0c5597ef83056ada9ea6ca0c30e7c4f97dbf07d035086be9e6a5b7b6
checksum: a62c378dfc8c00f60b9c80cab158ba54e99ba0239a5dd7c81245e5a5b39d10f0c35e249c3379eae719ff0285fff88c365dd446fab19dee771f1d76252df1bbf5
languageName: node
linkType: hard

Expand Down Expand Up @@ -7511,9 +7511,9 @@ __metadata:
linkType: hard

"ip@npm:^2.0.0":
version: 2.0.0
resolution: "ip@npm:2.0.0"
checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
version: 2.0.1
resolution: "ip@npm:2.0.1"
checksum: d765c9fd212b8a99023a4cde6a558a054c298d640fec1020567494d257afd78ca77e37126b1a3ef0e053646ced79a816bf50621d38d5e768cdde0431fa3b0d35
languageName: node
linkType: hard

Expand Down Expand Up @@ -8029,9 +8029,9 @@ __metadata:
linkType: hard

"jose@npm:^4.10.0, jose@npm:^4.11.4":
version: 4.13.1
resolution: "jose@npm:4.13.1"
checksum: 89be959573beee69bd443493887d78799fd42340b45afa2c6681beda30314bcdfa5575f6977203c199e4c3e0ec2fc18d3c94745e7f0d59db51dedfae0efee63d
version: 4.15.5
resolution: "jose@npm:4.15.5"
checksum: 7dde76447c7707bd4b448f914b216f3858e701aa83f00447434252461af5b9e159dcbffb88badea3f9616739526763581267c9560622f0a058df8d68c86d7f79
languageName: node
linkType: hard

Expand Down

0 comments on commit 836bc57

Please sign in to comment.