Skip to content
This repository has been archived by the owner on Apr 27, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release-v1.3.4' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
rhelmer committed Jul 20, 2021
2 parents f4fb979 + 8c9e759 commit b1bee30
Show file tree
Hide file tree
Showing 10 changed files with 4,174 additions and 1,410 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Unreleased changes

[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.3...master)
[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.4...master)

# v1.3.4 (2021-07-20)

[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.3...v1.3.4)
* [#682](https://github.com/mozilla-rally/rally-core-addon/pull/682): Add latest Stanford IRB changes.

# v1.3.3 (2021-06-14)

Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Mozilla",
"manifest_version": 2,
"name": "Mozilla Rally",
"version": "1.3.3",
"version": "1.3.4",
"homepage_url": "https://github.com/mozilla-rally/rally-core-addon",
"icons": {
"48": "public/img/rally-favicon.svg",
Expand Down
5,303 changes: 3,912 additions & 1,391 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rally_core",
"version": "1.3.3",
"version": "1.3.4",
"type": "module",
"scripts": {
"prebuild": "node scripts/setupTaskcluster.js",
Expand Down Expand Up @@ -29,31 +29,31 @@
"watch-webext": "web-ext --config=web-ext-config.cjs run --watch-file public/build/build.js --watch-file public/addon-build/background.js --watch-file public/addon-build/content-script.js"
},
"devDependencies": {
"@babel/core": "^7.14.3",
"@babel/core": "^7.14.6",
"@mozilla-protocol/core": "^12.1.0",
"@mozilla/glean": "^0.15.0",
"@rollup/plugin-commonjs": "^19.0.0",
"@rollup/plugin-commonjs": "^19.0.1",
"@rollup/plugin-node-resolve": "^13.0.0",
"@rollup/plugin-replace": "^2.4.2",
"@storybook/addon-actions": "^6.2.9",
"@storybook/addon-essentials": "^6.2.9",
"@storybook/addon-links": "^6.2.9",
"@storybook/svelte": "^6.2.9",
"@storybook/svelte": "^6.3.4",
"archiver": "^5.3.0",
"babel-loader": "^8.2.2",
"core-js": "^3.12.1",
"eslint": "^7.26.0",
"eslint-plugin-import": "^2.23.2",
"eslint-plugin-mocha": "^8.1.0",
"core-js": "^3.15.1",
"eslint": "^7.29.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-mocha": "^9.0.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-notice": "^0.9.10",
"eslint-plugin-svelte3": "^3.2.0",
"geckodriver": "^2.0.0",
"micromodal": "^0.4.6",
"mocha": "^8.4.0",
"mocha": "^9.0.2",
"npm-run-all": "^4.1.5",
"react-is": "^17.0.2",
"rollup": "^2.48.0",
"rollup": "^2.53.2",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-css-only": "^3.1.0",
"rollup-plugin-postcss": "^3.1.8",
Expand All @@ -63,14 +63,14 @@
"sinon-chrome": "^3.0.1",
"stylelint": "^13.13.1",
"stylelint-config-standard": "^22.0.0",
"svelte": "^3.38.2",
"svelte": "^3.38.3",
"svelte-accessible-dialog": "^2.1.3",
"svelte-loader": "^3.1.1",
"web-ext": "^6.1.0",
"svelte-loader": "^3.1.2",
"web-ext": "^6.2.0",
"webextension-polyfill": "^0.8.0"
},
"dependencies": {
"sirv-cli": "^1.0.11"
"sirv-cli": "^1.0.12"
},
"engines": {
"node": ">=14.0.0"
Expand Down
8 changes: 8 additions & 0 deletions src/components/study-card/study-categories.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,13 @@ export default {
"product discovery": {
text: "var(--color-marketing-gray-100)",
background: "#FFB4DC"
},
"news": {
text: "var(--color-marketing-gray-100)",
background: "#facfcb"
},
"advertising": {
text: "var(--color-marketing-gray-100)",
background: "#D1FFEE"
}
}
190 changes: 190 additions & 0 deletions src/routes/irbs/StanfordBeyondThePaywallIRB.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

<h1>Rally Study Privacy Consent Notice</h1>

<div class="research-is-voluntary">
<div>You are invited to participate in a <b>research study</b>.</div>
</div>

<dl>
<dt>Academic Institution</dt>
<dd>Stanford GSB</dd>
<dt>Study Name</dt>
<dd>Beyond the Paywall</dd>
<dt>Principal Investigator</dt>
<dd>Gregory John Martin</dd>
</dl>

<h2>Research Question</h2>
<p>
Local newspapers are an essential link in the chain of democratic
accountability, but changes in the economics of news production and
consumption threaten their survival. This project aims to measure both the
accountability impact of, and consumers' willingness to pay for,
investigative journalism by local outlets, enhancing our understanding of
the political consequences of changes in the economics of news media as well
as informing future choices about alternative funding models.
</p>

<h2>Public Interest</h2>
<p>
Journalism, and especially local reporting, is a vital component of a
functioning democracy. However, the traditional model of funding local
journalism has been failing in recent years and local publications have been
shutting down in startling numbers. The aim of our project is to investigate
the feasibility of alternative models of funding and sustaining local
journalism in the internet age.
</p>

<h2>Data Collection</h2>
<p>
Data will be collected through a custom browser plug-in that is developed
collaboratively between the teams at Stanford and Mozilla. The plug-in will
be offered on a voluntary basis to a pool of browser users that have opted
in to the Mozilla Rally experience. If a participant opts in to the study,
they will install the plug-in and data will be collected through browser
telemetry. Mozilla will store the data on Google Cloud where all analysis
will be conducted. This server is restricted to the research team and
Mozilla. The server is encrypted. Data will be transferred between the
participant's browser and the Mozilla analysis database protected by TLS.
</p>

<h2>Time Involvement</h2>

<p>This study will end on December 15, 2022.</p>

<h2>Risks and Benefits</h2>

<p>
<b
>We cannot and do not guarantee or promise that you will receive any
benefits from this study</b
>. There are no individual risks or benefits for participants.
</p>

<h2>Payments</h2>

<p>No payment is provided.</p>

<h2>Participant's Rights</h2>

<p>
If you have read this form and have decided to participate in this project,
please understand your <b>participation is voluntary</b> and you have the
<b
>right to withdraw your consent or discontinue participation at any time
without penalty or loss of benefits to which you are otherwise entitled.
The alternative is not to participate</b
>. You have the right to refuse to answer particular questions. The results
of this research study may be presented at scientific or professional
meetings or published in scientific journals. Your individual privacy will
be maintained in all published and written data resulting from the study.
</p>

<h2>Leaving the Study</h2>
<p>
You can leave the study at any time from the Mozilla Rally options page. To
access the page, click on the Rally button <img
style="padding: 0 4px;"
width="18"
src="img/rally-toolbar-icon.svg"
alt="rally icon"
/> in your browser toolbar. The button is usually near the top right of the browser
window. If you have removed the Rally button from your toolbar, you can also
access the Rally options page from the browser’s Add-ons settings. The Rally
options page will show you a list of studies that you are currently enrolled
in. You can leave this study by clicking the “Leave Study” button on the associated
study card. If you leave the study, the study’s browser extension will be automatically
uninstalled, removing the study code and data from your browser. We will also
automatically delete the data that your browser has submitted for the study,
unless you allow us to retain that data. You may not be able to rejoin the study
if you leave. If you leave Rally, you will also leave the studies that you are
enrolled in, including this study.
</p>

<h2>Confidentiality</h2>
<p>
Your private information collected as part of the research, even if
identifiers are removed, will not be used or distributed for future research
studies.
</p>

<h2>Contact Information</h2>
<p>
<em>Questions</em>: If you have any questions, concerns or complaints about
this research, its procedures, risks and benefits, contact the Protocol
Director, Gregory Martin by phone at 650-498-3321 or by email at
<a href="mailto:[email protected]">[email protected]</a>.
</p>

<p>
<em>Independent Contact</em>: If you are not satisfied with how this study
is being conducted, or if you have any concerns, complaints, or general
questions about the research or your rights as a participant, please contact
the Stanford Institutional Review Board (IRB) to speak to someone
independent of the research team at (650)-723-2480 or toll free at
1-866-680-2906, or email at
<a href="mailto:[email protected]"
>[email protected]</a
>. You can also write to the Stanford IRB, Stanford University, 1705 El
Camino Real, Palo Alto, CA 94306.
</p>

<p><b>Please print a copy of this page for your records</b>.</p>

<p>
If you agree to participate in this research, please click “Accept &
Participate”.
</p>

<style>
.research-is-voluntary,
h1,
h2,
p,
dl {
color: var(--irb-text-color, var(--color-marketing-gray-70));
}
.research-is-voluntary {
font-size: 16px;
margin-bottom: 28px;
}
h1 {
font-size: 24px;
font-family: "Zilla Slab", -apple-system, BlinkMacSystemFont, "Segoe UI",
Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
"Segoe UI Emoji", "Segoe UI Symbol";
margin-bottom: 28px;
}
h2 {
font-size: 16px;
font-weight: 700;
line-height: 24px;
font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI",
Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
"Segoe UI Emoji", "Segoe UI Symbol";
}
p {
font-size: 14px;
line-height: 21px;
margin-bottom: 20px;
}
dl {
margin-bottom: 32px;
}
dt {
font-weight: 900;
text-transform: uppercase;
}
dd {
margin-bottom: 1rem;
}
</style>
6 changes: 4 additions & 2 deletions src/routes/irbs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import PrincetonCovidDisinformationIRB from "./PrincetonCovidDisinformationIRB.svelte";
import RS01Consent from "./RS01Consent.svelte";
import StanfordBeyondThePaywallIRB from "./StanfordBeyondThePaywallIRB.svelte";

export default {
"[email protected]": PrincetonCovidDisinformationIRB,
"[email protected]": RS01Consent
"[email protected]": PrincetonCovidDisinformationIRB,
"[email protected]": RS01Consent,
"[email protected]": StanfordBeyondThePaywallIRB
}
21 changes: 20 additions & 1 deletion stories/flow/MainFlowView.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,29 @@ const mockAcademicPartnerStudy = {
studyDetailsLink: '/'
}
const additionalMockPartnerStudy = {
addonId: '[email protected]',
name: "Another Collaborator Study",
authors: {
name: "Another Collaborator University"
},
icons: {
64: undefined
},
endDate: new Date('2021-07-03'),
tags: ['advertising', 'news'],
privacyPolicy: {spec: 'https://example.com'},
description: `This is another mock study that utilizes the 'Beyond the Paywall' IRB consent.`,
dataCollectionDetails: ['page views', 'time and date of joining study', 'etc.'],
detailsDirectName: "Rally Website",
studyDetailsLink: '/'
}
fetch('locally-available-studies.json')
.then(r => r.json())
.then(s => {
mockStore.set({...get(mockStore), availableStudies: [nicerStudy, mockAcademicPartnerStudy, ...s]});
mockStore.set({...get(mockStore), availableStudies: [nicerStudy, mockAcademicPartnerStudy, additionalMockPartnerStudy, ...s]});
});
setContext("rally:store", mockStore);
Expand Down
14 changes: 14 additions & 0 deletions stories/irb/StanfordBeyondThePaywallIRB.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<script>
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import IRB from "../../src/routes/irbs/StanfordBeyondThePaywallIRB.svelte";
import IRBWindow from "../../src/routes/irbs/IRBWindow.svelte";
</script>

<div style="--height: 700px;">
<IRBWindow>
<IRB />
</IRBWindow>
</div>
5 changes: 5 additions & 0 deletions stories/irb/irb.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

import PrincetonIRBStory from './PrincetonIRB.svelte';
import StanfordBeyondThePaywallIRBStory from "./StanfordBeyondThePaywallIRB.svelte"
import RS01ConsentStory from './RS01Consent.svelte';
export default {
title: "IRB Components",
Expand All @@ -12,6 +13,10 @@ export const PrincetonIRB = () => ({
Component: PrincetonIRBStory,
});

export const StanfordBeyondThePaywallIRB = () => ({
Component: StanfordBeyondThePaywallIRBStory,
});

export const RS01Consent = () => ({
Component: RS01ConsentStory,
});

1 comment on commit b1bee30

@firefoxci-taskcluster
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh oh! Looks like an error! Details

Taskcluster-GitHub attempted to create a task for this event with the following scopes:

["assume:repo:github.com/mozilla-rally/rally-core-addon:tag:v1.3.4","queue:route:checks","queue:scheduler-id:taskcluster-github"]

The expansion of these scopes is not sufficient to create the task, leading to the following:

Client ID static/taskcluster/github does not have sufficient scopes and is missing the following scopes:

assume:repo:github.com/mozilla-rally/rally-core-addon:branch:v1.3.4

This request requires the client to satisfy the following scope expression:

{
  "AllOf": [
    "assume:repo:github.com/mozilla-rally/rally-core-addon:branch:v1.3.4",
    "queue:route:checks",
    "queue:route:index.xpi.v2.rally-core-addon.revision.b1bee30e0282c1b3cf90ae128008ef5f90f7203c.taskgraph.decision",
    "queue:create-task:project:none",
    "queue:scheduler-id:xpi-level-1",
    {
      "AnyOf": [
        "queue:create-task:highest:xpi-1/decision",
        "queue:create-task:very-high:xpi-1/decision",
        "queue:create-task:high:xpi-1/decision",
        "queue:create-task:medium:xpi-1/decision",
        "queue:create-task:low:xpi-1/decision",
        "queue:create-task:very-low:xpi-1/decision",
        "queue:create-task:lowest:xpi-1/decision"
      ]
    }
  ]
}

  • method: createTask
  • errorCode: InsufficientScopes
  • statusCode: 403
  • time: 2021-07-20T15:38:11.936Z

Please sign in to comment.