Merge pull request #380 from Irev-Dev/main

Release 25th June 2021
2021-06-25 19:48:46 +10:00
parent 69a34301e7 0845575680
commit ce210f8805
19 changed files with 1431 additions and 1862 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "Hutten"
+    ]
+}
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Let's help Code-CAD reach its [full potential!](https://cadhub.xyz) We're making
 If you want to be involved in anyway, checkout the [Road Map](https://github.com/Irev-Dev/cadhub/discussions/212) and get in touch via, [twitter](https://twitter.com/IrevDev), [discord](https://discord.gg/SD7zFRNjGH) or [discussions](https://github.com/Irev-Dev/cadhub/discussions).

 <img src="https://raw.githubusercontent.com/Irev-Dev/repo-images/main/images/fullcadhubshot.jpg">
-
+<img src="https://raw.githubusercontent.com/Irev-Dev/cadhub/main/docs/static/img/blog/curated-code-cad/CadHubSS.jpg">

 ## Getting your dev environment setup

--- a/app/api/package.json
+++ b/app/api/package.json
@@ -5,7 +5,6 @@
  "dependencies": {
    "@redwoodjs/api": "^0.34.1",
    "@sentry/node": "^6.5.1",
-    "cloudinary": "^1.23.0",
-    "graphql-tag": "^2.12.4"
+    "cloudinary": "^1.23.0"
  }
-}
+}
--- a/app/api/src/docker/aws-emulator.js
+++ b/app/api/src/docker/aws-emulator.js
@@ -26,7 +26,7 @@ app.post('/cadquery/stl', async (req, res) => {
  console.log('making post request to 5060')
  try {
    const { data } = await axios.post(invocationURL(5060), {
-      body: req.body
+      body: JSON.stringify(req.body),
    })
    res.status(data.statusCode)
    res.send(data.body)
--- a/app/api/src/docker/cadquery/Dockerfile
+++ b/app/api/src/docker/cadquery/Dockerfile
@@ -36,7 +36,10 @@ RUN npm install


 # Get the distribution copy of cq-cli
-RUN wget https://github.com/CadQuery/cq-cli/releases/download/v2.1.0/cq-cli-Linux-x86_64.zip
+RUN apt-get install -y libglew2.1
+RUN wget https://github.com/CadQuery/cq-cli/releases/download/v2.2-beta.1/cq-cli-Linux-x86_64.zip
+# Comment the entry above out and uncomment the one below to revert to the stable release
+# RUN wget https://github.com/CadQuery/cq-cli/releases/download/v2.1.0/cq-cli-Linux-x86_64.zip
 RUN unzip cq-cli-Linux-x86_64.zip

 RUN chmod +x cq-cli/cq-cli
--- a/app/api/src/docker/serverless.yml
+++ b/app/api/src/docker/serverless.yml
@@ -144,3 +144,23 @@ functions:
 #     NewOutput:
 #       Description: "Description for the output"
 #       Value: "Some output value"
+resources:
+  Resources:
+    GatewayResponseDefault4XX:
+      Type: 'AWS::ApiGateway::GatewayResponse'
+      Properties:
+        ResponseParameters:
+          gatewayresponse.header.Access-Control-Allow-Origin: "'*'"
+          gatewayresponse.header.Access-Control-Allow-Headers: "'*'"
+        ResponseType: DEFAULT_4XX
+        RestApiId:
+          Ref: 'ApiGatewayRestApi'
+    GatewayResponseDefault5XX:
+      Type: 'AWS::ApiGateway::GatewayResponse'
+      Properties:
+        ResponseParameters:
+          gatewayresponse.header.Access-Control-Allow-Origin: "'*'"
+          gatewayresponse.header.Access-Control-Allow-Headers: "'*'"
+        ResponseType: DEFAULT_5XX
+        RestApiId:
+          Ref: 'ApiGatewayRestApi'
--- a/app/api/src/functions/graphql.js
+++ b/app/api/src/functions/graphql.js
@@ -17,9 +17,7 @@ export const handler = createGraphQLHandler({
    schemas,
    services: makeServices({ services }),
  }),
-  plugins: [
-    createSentryApolloPlugin(),
-  ],
+  plugins: [createSentryApolloPlugin()],
  onException: () => {
    // Disconnect from your database with an unhandled exception.
    db.$disconnect()
--- a/app/api/src/lib/owner.js
+++ b/app/api/src/lib/owner.js
@@ -12,6 +12,9 @@ export const requireOwnership = async ({ userId, userName, partId } = {}) => {
  }

  if (context.currentUser.roles?.includes('admin')) {
+    if (context.currentUser?.sub === '5cea3906-1e8e-4673-8f0d-89e6a963c096') {
+      throw new ForbiddenError("That's a local admin ONLY.")
+    }
    return
  }

--- a/app/api/src/lib/sentry.ts
+++ b/app/api/src/lib/sentry.ts
@@ -62,45 +62,44 @@ export const createSentryApolloPlugin: Config['plugins'][number] = () => ({
        // If we couldn't parse the operation, don't
        // do anything here
        if (!ctx.operation) {
-          return;
+          return
        }

        for (const err of ctx.errors) {
          // Only report internal server errors,
          // all errors extending ApolloError should be user-facing
          if (err instanceof ApolloError) {
-            continue;
+            continue
          }

          // Add scoped report details and send to Sentry
-          Sentry.withScope(scope => {
+          Sentry.withScope((scope) => {
            // Annotate whether failing operation was query/mutation/subscription
-            scope.setTag("kind", ctx.operation.operation);
+            scope.setTag('kind', ctx.operation.operation)

            // Log query and variables as extras (make sure to strip out sensitive data!)
-            scope.setExtra("query", ctx.request.query);
-            scope.setExtra("variables", ctx.request.variables);
+            scope.setExtra('query', ctx.request.query)
+            scope.setExtra('variables', ctx.request.variables)

            if (err.path) {
              // We can also add the path as breadcrumb
              scope.addBreadcrumb({
-                category: "query-path",
-                message: err.path.join(" > "),
-                level: Sentry.Severity.Debug
-              });
+                category: 'query-path',
+                message: err.path.join(' > '),
+                level: Sentry.Severity.Debug,
+              })
            }

-            const transactionId = ctx.request.http.headers.get(
-              "x-transaction-id"
-            );
+            const transactionId =
+              ctx.request.http.headers.get('x-transaction-id')
            if (transactionId) {
-              scope.setTransaction(transactionId);
+              scope.setTransaction(transactionId)
            }

-            Sentry.captureException(err);
-          });
+            Sentry.captureException(err)
+          })
        }
-      }
+      },
    }
-  }
+  },
 })
--- a/app/api/src/services/parts/parts.js
+++ b/app/api/src/services/parts/parts.js
@@ -77,13 +77,13 @@ export const updatePart = async ({ id, input }) => {
  }
  const originalPart = await db.part.findUnique({ where: { id } })
  const imageToDestroy =
-    originalPart.mainImage !== input.mainImage && originalPart.mainImage
+    originalPart.mainImage !== input.mainImage && input.mainImage && originalPart.mainImage
  const update = await db.part.update({
    data: foreignKeyReplacement(input),
    where: { id },
  })
  if (imageToDestroy) {
-    console.log(`image destroyed, publicId: ${imageToDestroy}, partId: ${id}`)
+    console.log(`image destroyed, publicId: ${imageToDestroy}, partId: ${id}, replacing image is ${input.mainImage}`)
    // destroy after the db has been updated
    destroyImage({ publicId: imageToDestroy })
  }
--- a/app/web/src/components/IdeContainer/IdeContainer.js
+++ b/app/web/src/components/IdeContainer/IdeContainer.js
@@ -22,7 +22,7 @@ const SmallLoadingPing = (
 )

 const BigLoadingPing = () => (
-  <div className="inset-0 absolute flex items-center justify-center">
+  <div className="inset-0 absolute flex items-center justify-center bg-ch-gray-800">
    <div className="h-16 w-16 bg-pink-600 rounded-full animate-ping"></div>
  </div>
 )
--- a/app/web/src/components/LandingSection/LandingSection.js
+++ b/app/web/src/components/LandingSection/LandingSection.js
@@ -89,7 +89,7 @@ const LandingSection = () => {
              <li>Build your own helper functions and abstractions</li>
              <li>
                Trigger{' '}
-                <QuickLink to="https://en.wikipedia.org/wiki/Finite_element_method">
+                <QuickLink to="https://learn.cadhub.xyz/blog/testing-code-cad">
                  FEM
                </QuickLink>{' '}
                or regenerate tool paths with a{' '}
@@ -100,7 +100,7 @@ const LandingSection = () => {
              </li>
              <li>
                Auto-generate a{' '}
-                <QuickLink to="https://en.wikipedia.org/wiki/Bill_of_materials">
+                <QuickLink to="https://learn.cadhub.xyz/blog/codecad-artifacts">
                  BOM
                </QuickLink>
              </li>
@@ -111,6 +111,11 @@ const LandingSection = () => {
                </QuickLink>{' '}
                tools
              </li>
+              <li>
+                <QuickLink to="https://learn.cadhub.xyz/blog/3d-diffs">
+                  3d-diffs
+                </QuickLink>
+              </li>
            </ul>
          </div>
        </div>
--- a/app/web/src/components/OutBound/OutBound.js
+++ b/app/web/src/components/OutBound/OutBound.js
@@ -13,6 +13,7 @@ const OutBound = ({ className, children, to }) => {
        })
        return true
      }}
+      rel="noreferrer"
    >
      {children}
    </a>
--- a/app/web/src/components/PartProfile/PartProfile.js
+++ b/app/web/src/components/PartProfile/PartProfile.js
@@ -27,7 +27,7 @@ const PartProfile = ({
  const [isInvalid, setIsInvalid] = useState(false)
  const { currentUser } = useAuth()
  const editorRef = useRef(null)
-  const canEdit = currentUser?.sub === userPart.id
+  const canEdit = currentUser?.sub === userPart.id || currentUser?.roles.includes('admin')
  const isImageEditable = !isEditable && canEdit // image is editable when not in profile edit mode in order to separate them as it's too hard too to upload an image to cloudinary temporarily until the use saves (and maybe have to clean up) for the time being
  const part = userPart?.Part
  const emotes = countEmotes(part?.Reaction)
--- a/app/web/src/helpers/cadPackages/cadQueryController.js
+++ b/app/web/src/helpers/cadPackages/cadQueryController.js
@@ -3,6 +3,7 @@ import {
  stlToGeometry,
  createHealthyResponse,
  createUnhealthyResponse,
+  timeoutErrorMessage,
 } from './common'

 export const render = async ({ code }) => {
@@ -29,6 +30,9 @@ export const render = async ({ code }) => {
        },
      }
    }
+    if (response.status === 502) {
+      return createUnhealthyResponse(new Date(), timeoutErrorMessage)
+    }
    const data = await response.json()
    const geometry = await stlToGeometry(data.url)
    return createHealthyResponse({
--- a/app/web/src/helpers/cadPackages/common.js
+++ b/app/web/src/helpers/cadPackages/common.js
@@ -2,7 +2,7 @@ import { STLLoader } from 'three/examples/jsm/loaders/STLLoader'

 export const lambdaBaseURL =
  process.env.CAD_LAMBDA_BASE_URL ||
-  'https://oxt2p7ddgj.execute-api.us-east-1.amazonaws.com/prod'
+  'https://2inlbple1b.execute-api.us-east-1.amazonaws.com/prod2'

 export const stlToGeometry = (url) =>
  new Promise((resolve, reject) => {
@@ -38,3 +38,5 @@ export function createUnhealthyResponse(date, message = 'network issue') {
    },
  }
 }
+
+export const timeoutErrorMessage = `timeout: We're currently limited a 30s execution time. You can try again, sometimes it works the second time`
--- a/app/web/src/helpers/cadPackages/openScadController.js
+++ b/app/web/src/helpers/cadPackages/openScadController.js
@@ -3,6 +3,7 @@ import {
  stlToGeometry,
  createHealthyResponse,
  createUnhealthyResponse,
+  timeoutErrorMessage,
 } from './common'

 export const render = async ({ code, settings }) => {
@@ -49,6 +50,9 @@ export const render = async ({ code, settings }) => {
      const cleanedErrorMessage = cleanError(error)
      return createUnhealthyResponse(new Date(), cleanedErrorMessage)
    }
+    if (response.status === 502) {
+      return createUnhealthyResponse(new Date(), timeoutErrorMessage)
+    }
    const data = await response.json()
    const type = data.type !== 'stl' ? 'png' : 'geometry'
    const newData = data.type !== 'stl' ? data.url : stlToGeometry(data.url)
@@ -81,6 +85,9 @@ export const stl = async ({ code, settings }) => {
      const cleanedErrorMessage = cleanError(error)
      return createUnhealthyResponse(new Date(), cleanedErrorMessage)
    }
+    if (response.status === 502) {
+      return createUnhealthyResponse(new Date(), timeoutErrorMessage)
+    }
    const data = await response.json()
    const geometry = await stlToGeometry(data.url)
    return createHealthyResponse({
--- a/app/yarn.lock
+++ b/app/yarn.lock
--- a/docs/src/pages/index.js
+++ b/docs/src/pages/index.js
@@ -83,18 +83,14 @@ export default function Home() {
                <li>Build your own helper functions and abstractions</li>
                <li>
                  Trigger{' '}
-                  <a href="https://en.wikipedia.org/wiki/Finite_element_method">
+                  <a href="/blog/testing-code-cad">
                    FEM
                  </a>{' '}
-                  or regenerate tool paths with a{' '}
-                  <a href="https://www.redhat.com/en/topics/devops/what-is-ci-cd">
-                    CI/CD
-                  </a>{' '}
-                  process
+                  or regenerate tool paths with a CI/CD process
                </li>
                <li>
                  Auto-generate a{' '}
-                  <a href="https://en.wikipedia.org/wiki/Bill_of_materials">
+                  <a href="/blog/codecad-artifacts">
                    BOM
                  </a>
                </li>
@@ -103,6 +99,11 @@ export default function Home() {
                  <a href="https://www.ptc.com/en/technologies/plm">PLM</a>{' '}
                  tools
                </li>
+                <li>
+                  <a href="/blog/3d-diffs">
+                    3d-diffs
+                  </a>
+                </li>
              </ul>
            </div>
          </div>