Merge pull request #809 from complexdatacollective/fix/skiplogic-filt…

…er-validate Fix/Skip logic Rule validation
complexdatacollective · Jun 26, 2023 · 9075ef6 · 9075ef6
2 parents 1288b0c + dcfb467
commit 9075ef6
Show file tree

Hide file tree

Showing 8 changed files with 67,866 additions and 66,578 deletions.
diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
@@ -2,7 +2,7 @@ name: Dist
 on:
   push:
     branches:
-      - 'release/**'
+      - "release/**"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -14,25 +14,24 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-        # Set python version to 2.x due to node-gyp and sass
       - uses: actions/setup-python@v4
         with:
-          python-version: '2.7.18'
+          python-version: "3.10.12"
       # update apt cache
       - name: Update apt cache
         run: sudo apt-get update -y
       # Set node version
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.21.3'
+          node-version: "14.21.3"
       - name: Set NPM 7
-        run: npm install -g npm@8.3.2
+        run: npm install -g npm@8.19.4
       # Cache node_modules
       - uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
-          path: '**/node_modules'
+          path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
 
       - name: Install MDNS build dependencies

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: CI
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
 
   # Allows you to run this workflow manually from the Actions tab
@@ -14,25 +14,24 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      # Set python version to 2.x due to node-gyp and sass
       - uses: actions/setup-python@v4
         with:
-          python-version: '2.7.18'
+          python-version: "3.10.12"
       # update apt cache
       - name: Update apt cache
         run: sudo apt-get update -y
       # Set node version
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.21.3'
+          node-version: "14.21.3"
       - name: Set NPM 7
-        run: npm install -g npm@8.3.2
+        run: npm install -g npm@8.19.4
       # Cache node_modules
       - uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
-          path: '**/node_modules'
+          path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
 
       - name: Install MDNS build dependencies
@@ -54,25 +53,24 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      # Set python version to 2.x due to node-gyp and sass
       - uses: actions/setup-python@v4
         with:
-          python-version: '2.7.18'
+          python-version: "3.10.12"
       # update apt cache
       - name: Update apt cache
         run: sudo apt-get update -y
       # Set node version
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.21.3'
+          node-version: "14.21.3"
       - name: Set NPM 7
-        run: npm install -g npm@8.3.2
+        run: npm install -g npm@8.19.4
       # Cache node_modules
       - uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
         with:
-          path: '**/node_modules'
+          path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
 
       - name: Install MDNS build dependencies

diff --git a/README.md b/README.md
@@ -1,38 +1,52 @@
 # Architect [![Build Status](https://travis-ci.org/complexdatacollective/Architect.svg?branch=master)](https://travis-ci.org/complexdatacollective/Architect)
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fcomplexdatacollective%2FArchitect.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fcomplexdatacollective%2FArchitect?ref=badge_shield)
-
-Technologies used:
-ES6 (via Babel)
-React
-Redux
-Electron
-Cordova
-SCSS
-Jest (Testing suite)
-React Scripts
 
-# Operation
+Network Canvas Architect is a survey design tool for the [Network Canvas](https://networkcanvas.com) suite of applications. It is built on [Electron](https://electronjs.org/) and [React](https://reactjs.org/).
+
+**This tool is in maintainance mode.** We are not actively developing new features, but will continue to fix bugs and accept pull requests. Community contributions are very welcome!
+
+See the [Network Canvas](https://networkcanvas.com) website for more information.
+
+For questions and support, please visit the [Network Canvas User Community](https://community.networkcanvas.com/).
+
+## Setting up a development environment
+
+### Prerequisites
+
+- [Node.js](https://nodejs.org/en/) (v14.21.3)
+- [npm](https://www.npmjs.com/) (v8.19.4)
+- [Git](https://git-scm.com/)
+- [Python](https://www.python.org/) (v3.10.12)
+
+### Installation
+
+1. Clone the repository
+
+```sh
+git clone https://github.com/complexdatacollective/Architect.git
+```
+
+2. Fetch submodules
 
-## Node/NPM Version
+```sh
+git submodule update --init --recursive -f
+```
 
-This project currently requires version `14.21.3` of node, and version `8.3.2` of npm. These are the only supported versions for this project.
+3. Install NPM packages
 
-As a convenience, the repository contains a `.node-version` file that enables convinient use of a node environment manager.
+  ```sh
+  npm install
+  ```
 
-## Installation
-This repository assumes that `npm` is installed. If you don't have it installed, here are [installation instructions](https://docs.npmjs.com/getting-started/installing-node).
+Note: for Apple Silicon users, you need to install the `electron` package manually:
 
-0. Install the correct node and npm versions
-1. Clone this repository.
-2. Fetch submodules by typing `git submodule update --init --recursive -f`.
-3. Enter the directory where the repository is cloned, and install the project dependencies by typing `npm install`.
-4. Refer to the development tasks section below to learn how to test and build the app.
+```sh
+  npm install electron --arch=x86
+```
 
-### Available commands:
+# Operation
 
 |`npm run <script>`|Description|
 |------------------|-----------|
-|`start`|Serves your app at `localhost:3000`.|
 |`start:architect:electron`|Serves your app for consumption by electron.|
 |`start:network-canvas:electron`|Serves network canvas for consumption by previewer.|
 |`electron:dev`|Runs electron window with contents of `start:architect:electron`  and `start:network-canvas:electron`(must be run concurrently)|
@@ -68,24 +82,6 @@ There are two additional tasks to enable development within an electron app nati
   1. Copies the electron source to `./electron-dev`
   2. Runs the electron app from there
 
-#### Dev tools
-
-Electron supports [extensions to Chrome devtools](https://electronjs.org/docs/tutorial/devtools-extension) such as Redux DevTools.
-
-In the development environment, these will be loaded if you provide one or more paths to your extensions (semicolon-separated) in the `NC_DEVTOOLS_EXTENSION_PATH` environment variable. The electron docs describe how to find the filepath for an extension once installed.
-
-Example: enabling Redux Devtools on macOS:
-```bash
-NC_DEVTOOLS_EXTENSION_PATH=~/Library/Application\ Support/Google/Chrome/Default/Extensions/lmhkpmbekcpmknklioeibfkpmmfibljd/2.15.2_0 npm run electron:dev
-```
-
-#### Environment options
-
-```bash
-AUTO_OPEN_BROWSER=false  # Set to false to disable browser auto open on `npm run start`, Default: true
-WEBPACK_DEV_SERVER_PORT=3003  # Configure port for dev server. Default: 3003
-CSC_IDENTITY_AUTO_DISCOVERY=false  # Set to false to disable signing builds (speeds up build process)
-```
 
 ## Application Structure
 
@@ -104,7 +100,3 @@ CSC_IDENTITY_AUTO_DISCOVERY=false  # Set to false to disable signing builds (spe
 │   ├── ducks                # Middleware, modules (ducks-style with actions, reducers, and action creators), and store
 │   └── utils                # Helpers and utils
 ```
-
-
-## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fcodaco%2FArchitect.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fcodaco%2FArchitect?ref=badge_large)
diff --git a/build-resources/scripts/afterSignHook.js b/build-resources/scripts/afterSignHook.js
@@ -9,7 +9,6 @@ async function note(params) {
   if (process.platform !== 'darwin') {
     return;
   }
-  console.log('afterSign hook triggered', params);
 
   const appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`);
   if (!fs.existsSync(appPath)) {

diff --git a/network-canvas b/network-canvas