@things-factory/shell 10.1.46 → 10.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "10.1.46",
+  "version": "10.1.47",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -126,5 +126,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "d3467cde550453f3348fed0ed6c79a12a6ba0db4"
+  "gitHead": "185f20d7d9a15715a0ee2757a6a8189ec36cfb9d"
 }

package/tests/domain-middleware-refusal.test.ts

@@ -0,0 +1,44 @@
+/* The domain is given in state, so the URL lookup is never reached - and importing it drags in every entity. */
+jest.mock('../server/utils/get-domain', () => ({ getDomainFromURL: jest.fn() }))
+
+import { domainMiddleware, REFUSAL_HEADER, REFUSED_ADDRESS } from '../server/middlewares/domain-middleware'
+
+/**
+ * A request refused by the domain's IP lists says why (ADR README plan 3, left open there).
+ *
+ * The same 403 also means "no domain chosen", and the client answers that by sending the person to
+ * check-in. For a refused address check-in sends them straight back, so the client has to tell the
+ * two apart - the header is how. Anything that is not an address refusal carries no header.
+ */
+
+function run(iplist: any, ip: string) {
+  const headers: Record<string, string> = {}
+  const context: any = {
+    state: { domain: { id: 'd1', iplist } },
+    req: { headers: { 'x-client-ip': ip }, connection: {}, socket: {} },
+    status: 200,
+    set: (name: string, value: string) => (headers[name.toLowerCase()] = value)
+  }
+  let passed = false
+  return domainMiddleware(context, async () => {
+    passed = true
+  }).then(() => ({ status: context.status, headers, passed }))
+}
+
+describe('domain middleware - an address the domain does not let in', () => {
+  it('★ outside the whitelist: 403, and it says the address was refused', async () => {
+    const result = await run({ whitelist: ['^10\\.'] }, '192.168.0.9')
+    expect(result).toEqual({ status: 403, headers: { [REFUSAL_HEADER]: REFUSED_ADDRESS }, passed: false })
+  })
+
+  it('★ on the blacklist: 403, and it says the address was refused', async () => {
+    const result = await run({ blacklist: ['^192\\.168\\.'] }, '192.168.0.9')
+    expect(result).toEqual({ status: 403, headers: { [REFUSAL_HEADER]: REFUSED_ADDRESS }, passed: false })
+  })
+
+  it('★ an address that is let in passes with no refusal header', async () => {
+    expect(await run({ whitelist: ['^10\\.'] }, '10.0.0.1')).toEqual({ status: 200, headers: {}, passed: true })
+    expect(await run({ blacklist: ['^192\\.168\\.'] }, '10.0.0.1')).toEqual({ status: 200, headers: {}, passed: true })
+    expect(await run(undefined, '10.0.0.1')).toEqual({ status: 200, headers: {}, passed: true })
+  })
+})

package/tests/undefined-custom-properties.test.ts

@@ -91,8 +91,9 @@ const HOOKS = [
 ]
 
 /*
- * The installed operato components, as of @operato 10.19-10.22 (process is not installed here). The fixed typos leave this list when the
- * next @operato release is installed - the test goes red then, and the line is deleted with it.
+ * The installed operato components, as of @operato 10.24-10.25 (process is not installed here). The ten
+ * typos fixed in 10.23 left this list with that install. What remains is read in operato and defined by
+ * no product we checked; a name leaves when something defines it or the read goes.
  */
 const OPERATO_KNOWN = [
   '--button-radius',
@@ -100,19 +101,9 @@ const OPERATO_KNOWN = [
   '--component-detail-border-color',
   '--form-input-width',
   '--grid-record-focused-color',
-  '--legend-background-color',
-  '--legend-border',
-  '--legend-border-radius',
-  '--legend-margin',
-  '--md-sys-color-on-primary-container-rgb',
-  '--md-sys-on-color-secondary',
-  '--md-sys-shape-corner-tiny',
-  '--md-sys-typescale-label-medium-weight',
   '--opacity-light-dark-color',
-  '--pading-default',
   '--record-view-edit-border',
-  '--record-view-grid-field-border',
-  '--spacing-smail'
+  '--record-view-grid-field-border'
 ]
 
 describe('custom properties read with no fallback are defined', () => {

package/translations/en.json

@@ -132,6 +132,9 @@
   "text.data_uploaded_successfully": "data uploaded successfully",
   "text.draft": "draft",
   "text.entity360-not-yet": "there is no 360 for this kind yet.",
+  "text.entity360-none": "none",
+  "text.entity360-forbidden": "you may not see this",
+  "text.entity360-failed": "could not be read",
   "text.error": "error",
   "text.existing_item_found": "existing item found",
   "text.failed": "failed",
@@ -166,5 +169,13 @@
   "term.domain": "site",
   "field.roles": "roles",
   "label.released": "released",
-  "label.import": "import"
+  "label.import": "import",
+  "error.address-not-allowed": "this site does not accept connections from where you are. ask its administrator.",
+  "button.undo": "undo",
+  "button.redo": "redo",
+  "button.fit-view": "fit to view",
+  "button.hide-start-pane": "hide the left pane",
+  "button.show-start-pane": "show the left pane",
+  "button.hide-end-pane": "hide the right pane",
+  "button.show-end-pane": "show the right pane"
 }

package/translations/ja.json

@@ -132,6 +132,9 @@
   "text.data_uploaded_successfully": "資料が正常に作成されました.",
   "text.draft": "ドラフト保存",
   "text.entity360-not-yet": "この種類の 360 はまだありません。",
+  "text.entity360-none": "なし",
+  "text.entity360-forbidden": "閲覧できません",
+  "text.entity360-failed": "読み込めませんでした",
   "text.error": "エラー",
   "text.existing_item_found": "既にある項目です",
   "text.failed": "失敗",
@@ -166,5 +169,13 @@
   "term.domain": "事業場",
   "field.roles": "ロール",
   "label.released": "公開済み",
-  "label.import": "インポート"
+  "label.import": "インポート",
+  "error.address-not-allowed": "この事業所は現在の場所からの接続を受け付けていません。事業所の管理者にお問い合わせください。",
+  "button.undo": "元に戻す",
+  "button.redo": "やり直す",
+  "button.fit-view": "画面に合わせる",
+  "button.hide-start-pane": "左のパネルを閉じる",
+  "button.show-start-pane": "左のパネルを開く",
+  "button.hide-end-pane": "右のパネルを閉じる",
+  "button.show-end-pane": "右のパネルを開く"
 }

package/translations/ko.json

@@ -6,7 +6,7 @@
   "button.collapse": "줄이기",
   "button.confirm": "확인",
   "button.copy": "복사",
-  "button.copy to draft": "드래프트로 복사",
+  "button.copy to draft": "초안으로 복사",
   "button.create": "생성",
   "button.delete": "삭제",
   "button.detail": "상세",
@@ -132,6 +132,9 @@
   "text.data_uploaded_successfully": "성공적으로 자료를 업로드하였습니다.",
   "text.draft": "초안저장",
   "text.entity360-not-yet": "이 종류의 360 은 아직 없습니다.",
+  "text.entity360-none": "없음",
+  "text.entity360-forbidden": "볼 수 없음",
+  "text.entity360-failed": "읽지 못함",
   "text.error": "오류",
   "text.existing_item_found": "이미 있는 항목입니다",
   "text.failed": "실패",
@@ -140,12 +143,12 @@
   "text.initial version all new": "최초 버전 — 전체 신규",
   "text.loading": "읽는 중…",
   "text.no difference from previous": "앞 버전과 차이가 없습니다",
-  "text.no released version information available": "배포된 버전이 없습니다",
+  "text.no released version information available": "발행된 버전이 없습니다",
   "text.nothing_changed": "변경사항 없음",
   "text.nothing_selected": "선택되지 않음",
   "text.offline": "오프라인",
   "text.online": "온라인",
-  "text.release comment optional": "릴리즈 코멘트(선택) — 비우면 자동 입력",
+  "text.release comment optional": "발행 메모(선택) — 비우면 자동으로 채웁니다",
   "text.saved": "저장되었습니다",
   "text.sure_to_x": "{x}하시겠습니까?",
   "text.technical detail": "기술 정보",
@@ -166,5 +169,13 @@
   "term.domain": "사업장",
   "field.roles": "역할",
   "label.released": "발행됨",
-  "label.import": "가져오기"
+  "label.import": "가져오기",
+  "error.address-not-allowed": "이 사업장은 지금 계신 곳에서의 접속을 받지 않습니다. 사업장 관리자에게 문의하십시오.",
+  "button.undo": "되돌리기",
+  "button.redo": "다시 실행",
+  "button.fit-view": "화면에 맞추기",
+  "button.hide-start-pane": "왼쪽 판 접기",
+  "button.show-start-pane": "왼쪽 판 펼치기",
+  "button.hide-end-pane": "오른쪽 판 접기",
+  "button.show-end-pane": "오른쪽 판 펼치기"
 }

package/translations/ms.json

@@ -132,6 +132,9 @@
   "text.data_uploaded_successfully": "data uploaded successfully",
   "text.draft": "draf",
   "text.entity360-not-yet": "belum ada 360 untuk jenis ini.",
+  "text.entity360-none": "tiada",
+  "text.entity360-forbidden": "anda tidak boleh melihat ini",
+  "text.entity360-failed": "tidak dapat dibaca",
   "text.error": "Ralat",
   "text.existing_item_found": "item ini sudah ada",
   "text.failed": "gagal",
@@ -166,5 +169,13 @@
   "term.domain": "tapak",
   "field.roles": "peranan",
   "label.released": "diterbitkan",
-  "label.import": "import"
+  "label.import": "import",
+  "error.address-not-allowed": "tapak ini tidak menerima sambungan dari lokasi anda. sila hubungi pentadbirnya.",
+  "button.undo": "buat asal",
+  "button.redo": "buat semula",
+  "button.fit-view": "muat ke paparan",
+  "button.hide-start-pane": "sembunyikan panel kiri",
+  "button.show-start-pane": "tunjukkan panel kiri",
+  "button.hide-end-pane": "sembunyikan panel kanan",
+  "button.show-end-pane": "tunjukkan panel kanan"
 }

package/translations/zh.json

@@ -132,6 +132,9 @@
   "text.data_uploaded_successfully": "数据上传成功。",
   "text.draft": "草稿",
   "text.entity360-not-yet": "此类暂无 360 视图。",
+  "text.entity360-none": "无",
+  "text.entity360-forbidden": "无权查看",
+  "text.entity360-failed": "无法读取",
   "text.error": "错误",
   "text.existing_item_found": "该项目已存在",
   "text.failed": "失败",
@@ -166,5 +169,13 @@
   "field.roles": "角色",
   "term.domain": "站点",
   "label.released": "已发布",
-  "label.import": "导入"
+  "label.import": "导入",
+  "error.address-not-allowed": "此站点不接受来自您当前位置的连接。请联系站点管理员。",
+  "button.undo": "撤销",
+  "button.redo": "重做",
+  "button.fit-view": "适应视图",
+  "button.hide-start-pane": "收起左侧面板",
+  "button.show-start-pane": "展开左侧面板",
+  "button.hide-end-pane": "收起右侧面板",
+  "button.show-end-pane": "展开右侧面板"
 }